mirror of
https://github.com/Lime3DS/Lime3DS
synced 2024-12-26 09:02:44 -06:00
Merge pull request #15 from BlurrySquire/master
Updated most of the UI elements!
This commit is contained in:
Riley Hawksworth
GitHub
commit
7e84b3b235
11 changed files with 421 additions and 40 deletions
385
dist/citra.svg
vendored
385
dist/citra.svg
vendored
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 216 KiB |
BIN
dist/citra_old.ico
vendored
BIN
dist/citra_old.ico
vendored
Binary file not shown.
|
Before Width: | Height: | Size: 361 KiB |
BIN
dist/doc-icon_old.png
vendored
BIN
dist/doc-icon_old.png
vendored
Binary file not shown.
|
Before Width: | Height: | Size: 7.6 KiB |
BIN
dist/icon_old.png
vendored
BIN
dist/icon_old.png
vendored
Binary file not shown.
|
Before Width: | Height: | Size: 18 KiB |
|
|
@ -11,7 +11,7 @@
|
|||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>About Citra</string>
|
||||
<string>About Lime</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_3">
|
||||
<item>
|
||||
|
|
@ -57,7 +57,7 @@
|
|||
</sizepolicy>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string><html><head/><body><p><span style=" font-size:28pt;">Citra</span></p></body></html></string>
|
||||
<string><html><head/><body><p><span style=" font-size:28pt;">Lime</span></p></body></html></string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
|
@ -87,7 +87,7 @@
|
|||
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
|
||||
p, li { white-space: pre-wrap; }
|
||||
</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;">
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt;">Citra is a free and open source 3DS emulator licensed under GPLv2.0 or any later version.</span></p>
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt;">Lime is a free and open source 3DS emulator licensed under GPLv2.0 or any later version.</span></p>
|
||||
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"><br /></p>
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt;">This software should not be used to play games you have not legally obtained.</span></p></body></html></string>
|
||||
</property>
|
||||
|
|
@ -131,7 +131,7 @@ p, li { white-space: pre-wrap; }
|
|||
</sizepolicy>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string><html><head/><body><p><span style=" font-size:7pt;">&quot;3DS&quot; is a trademark of Nintendo. Citra is not affiliated with Nintendo in any way.</span></p></body></html></string>
|
||||
<string><html><head/><body><p><span style=" font-size:7pt;">&quot;3DS&quot; is a trademark of Nintendo. Lime is not affiliated with Nintendo in any way.</span></p></body></html></string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
<item>
|
||||
<widget class="QLabel" name="lbl_Spiel">
|
||||
<property name="text">
|
||||
<string><html><head/><body><p><span style=" font-size:10pt;">Should you choose to submit a test case to the </span><a href="https://citra-emu.org/game/"><span style=" font-size:10pt; text-decoration: underline; color:#0000ff;">Citra Compatibility List</span></a><span style=" font-size:10pt;">, The following information will be collected and displayed on the site:</span></p><ul style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Hardware Information (CPU / GPU / Operating System)</li><li style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Which version of Citra you are running</li><li style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">The connected Citra account</li></ul></body></html></string>
|
||||
<string><html><head/><body><p><span style=" font-size:10pt;">Should you choose to submit a test case to the </span><a href="https://citra-emu.org/game/"><span style=" font-size:10pt; text-decoration: underline; color:#0000ff;">Lime Compatibility List</span></a><span style=" font-size:10pt;">, The following information will be collected and displayed on the site:</span></p><ul style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Hardware Information (CPU / GPU / Operating System)</li><li style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Which version of Lime you are running</li><li style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">The connected Citra account</li></ul></body></html></string>
|
||||
</property>
|
||||
<property name="wordWrap">
|
||||
<bool>true</bool>
|
||||
|
|
@ -179,7 +179,7 @@
|
|||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string><html><head/><body><p>Independent of speed or performance, how well does this game play from start to finish on this version of Citra?</p></body></html></string>
|
||||
<string><html><head/><body><p>Independent of speed or performance, how well does this game play from start to finish on this version of Lime?</p></body></html></string>
|
||||
</property>
|
||||
<property name="wordWrap">
|
||||
<bool>true</bool>
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
<class>ConfigureDialog</class>
|
||||
<widget class="QDialog" name="ConfigureDialog">
|
||||
<property name="windowTitle">
|
||||
<string>Citra Configuration</string>
|
||||
<string>Lime Configuration</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout">
|
||||
<item>
|
||||
|
|
|
|||
|
|
@ -269,7 +269,7 @@ ConfigureSystem::ConfigureSystem(Core::System& system_, QWidget* parent)
|
|||
ui->label_nus_download->setTextInteractionFlags(Qt::TextBrowserInteraction);
|
||||
ui->label_nus_download->setOpenExternalLinks(true);
|
||||
ui->label_nus_download->setText(
|
||||
tr("Citra is missing keys to download system files. <br><a "
|
||||
tr("Lime is missing keys to download system files. <br><a "
|
||||
"href='https://citra-emu.org/wiki/aes-keys/'><span style=\"text-decoration: "
|
||||
"underline; color:#039be5;\">How to get keys?</span></a>"));
|
||||
}
|
||||
|
|
@ -611,9 +611,9 @@ void ConfigureSystem::DownloadFromNUS() {
|
|||
future_watcher.waitForFinished();
|
||||
|
||||
if (failed) {
|
||||
QMessageBox::critical(this, tr("Citra"), tr("Downloading system files failed."));
|
||||
QMessageBox::critical(this, tr("Lime"), tr("Downloading system files failed."));
|
||||
} else if (!future_watcher.isCanceled()) {
|
||||
QMessageBox::information(this, tr("Citra"), tr("Successfully downloaded system files."));
|
||||
QMessageBox::information(this, tr("Lime"), tr("Successfully downloaded system files."));
|
||||
}
|
||||
|
||||
ui->button_start_download->setEnabled(true);
|
||||
|
|
|
|||
|
|
@ -19,13 +19,13 @@
|
|||
<item>
|
||||
<widget class="QGroupBox" name="groupBoxWebConfig">
|
||||
<property name="title">
|
||||
<string>Citra Web Service</string>
|
||||
<string>Lime Web Service</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayoutCitraWebService">
|
||||
<item>
|
||||
<widget class="QLabel" name="web_credentials_disclaimer">
|
||||
<property name="text">
|
||||
<string>By providing your username and token, you agree to allow Citra to collect additional usage data, which may include user identifying information.</string>
|
||||
<string>Currently not supported by Lime. By providing your username and token, you agree to allow Citra to collect additional usage data, which may include user identifying information.</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
|
@ -128,7 +128,7 @@
|
|||
<item>
|
||||
<widget class="QCheckBox" name="toggle_telemetry">
|
||||
<property name="text">
|
||||
<string>Share anonymous usage data with the Citra team</string>
|
||||
<string>Share anonymous usage data with the Lime team</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
|
|
|||
|
|
@ -233,7 +233,7 @@ GMainWindow::GMainWindow(Core::System& system_)
|
|||
ConnectMenuEvents();
|
||||
ConnectWidgetEvents();
|
||||
|
||||
LOG_INFO(Frontend, "Citra Version: {} | {}-{}", Common::g_build_fullname, Common::g_scm_branch,
|
||||
LOG_INFO(Frontend, "Lime Version: {} | {}-{}", Common::g_build_fullname, Common::g_scm_branch,
|
||||
Common::g_scm_desc);
|
||||
#if CITRA_ARCH(x86_64)
|
||||
const auto& caps = Common::GetCPUCaps();
|
||||
|
|
@ -632,7 +632,7 @@ void GMainWindow::InitializeHotkeys() {
|
|||
link_action_shortcut(ui->action_Load_File, QStringLiteral("Load File"));
|
||||
link_action_shortcut(ui->action_Load_Amiibo, QStringLiteral("Load Amiibo"));
|
||||
link_action_shortcut(ui->action_Remove_Amiibo, QStringLiteral("Remove Amiibo"));
|
||||
link_action_shortcut(ui->action_Exit, QStringLiteral("Exit Citra"));
|
||||
link_action_shortcut(ui->action_Exit, QStringLiteral("Exit Lime"));
|
||||
link_action_shortcut(ui->action_Restart, QStringLiteral("Restart Emulation"));
|
||||
link_action_shortcut(ui->action_Pause, QStringLiteral("Continue/Pause Emulation"));
|
||||
link_action_shortcut(ui->action_Stop, QStringLiteral("Stop Emulation"));
|
||||
|
|
@ -1261,7 +1261,7 @@ void GMainWindow::BootGame(const QString& filename) {
|
|||
return;
|
||||
}
|
||||
|
||||
LOG_INFO(Frontend, "Citra starting...");
|
||||
LOG_INFO(Frontend, "Lime starting...");
|
||||
StoreRecentFile(filename); // Put the filename on top of the list
|
||||
|
||||
if (movie_record_on_start) {
|
||||
|
|
@ -1684,7 +1684,7 @@ void GMainWindow::OnGameListDumpRomFS(QString game_path, u64 program_id) {
|
|||
const auto& [base, update] = future_watcher->result();
|
||||
if (base != Loader::ResultStatus::Success) {
|
||||
QMessageBox::critical(
|
||||
this, tr("Citra"),
|
||||
this, tr("Lime"),
|
||||
tr("Could not dump base RomFS.\nRefer to the log for details."));
|
||||
return;
|
||||
}
|
||||
|
|
@ -1835,7 +1835,7 @@ void GMainWindow::OnCIAInstallReport(Service::AM::InstallStatus status, QString
|
|||
case Service::AM::InstallStatus::ErrorEncrypted:
|
||||
QMessageBox::critical(this, tr("Encrypted File"),
|
||||
tr("%1 must be decrypted "
|
||||
"before being used with Citra. A real 3DS is required.")
|
||||
"before being used with Lime. A real 3DS is required.")
|
||||
.arg(filename));
|
||||
break;
|
||||
case Service::AM::InstallStatus::ErrorFileNotFound:
|
||||
|
|
@ -1897,9 +1897,9 @@ void GMainWindow::UninstallTitles(
|
|||
future_watcher.waitForFinished();
|
||||
|
||||
if (failed) {
|
||||
QMessageBox::critical(this, tr("Citra"), tr("Failed to uninstall '%1'.").arg(failed_name));
|
||||
QMessageBox::critical(this, tr("Lime"), tr("Failed to uninstall '%1'.").arg(failed_name));
|
||||
} else if (!future_watcher.isCanceled()) {
|
||||
QMessageBox::information(this, tr("Citra"),
|
||||
QMessageBox::information(this, tr("Lime"),
|
||||
tr("Successfully uninstalled '%1'.").arg(first_name));
|
||||
}
|
||||
}
|
||||
|
|
@ -2435,7 +2435,7 @@ void GMainWindow::OnDumpVideo() {
|
|||
message_box.setText(
|
||||
tr("FFmpeg could not be loaded. Make sure you have a compatible version installed."
|
||||
#ifdef _WIN32
|
||||
"\n\nTo install FFmpeg to Citra, press Open and select your FFmpeg directory."
|
||||
"\n\nTo install FFmpeg to Lime, press Open and select your FFmpeg directory."
|
||||
#endif
|
||||
"\n\nTo view a guide on how to install FFmpeg, press Help."));
|
||||
message_box.setStandardButtons(QMessageBox::Ok | QMessageBox::Help
|
||||
|
|
@ -2479,7 +2479,7 @@ void GMainWindow::OnOpenFFmpeg() {
|
|||
|
||||
for (auto& library_name : library_names) {
|
||||
if (!FileUtil::Exists(bin_dir + DIR_SEP + library_name)) {
|
||||
QMessageBox::critical(this, tr("Citra"),
|
||||
QMessageBox::critical(this, tr("Lime"),
|
||||
tr("The provided FFmpeg directory is missing %1. Please make "
|
||||
"sure the correct directory was selected.")
|
||||
.arg(QString::fromStdString(library_name)));
|
||||
|
|
@ -2503,9 +2503,9 @@ void GMainWindow::OnOpenFFmpeg() {
|
|||
FileUtil::ForeachDirectoryEntry(nullptr, bin_dir, process_file);
|
||||
|
||||
if (success.load()) {
|
||||
QMessageBox::information(this, tr("Citra"), tr("FFmpeg has been sucessfully installed."));
|
||||
QMessageBox::information(this, tr("Lime"), tr("FFmpeg has been sucessfully installed."));
|
||||
} else {
|
||||
QMessageBox::critical(this, tr("Citra"),
|
||||
QMessageBox::critical(this, tr("Lime"),
|
||||
tr("Installation of FFmpeg failed. Check the log file for details."));
|
||||
}
|
||||
}
|
||||
|
|
@ -2535,7 +2535,7 @@ void GMainWindow::StartVideoDumping(const QString& path) {
|
|||
system.RegisterVideoDumper(dumper);
|
||||
} else {
|
||||
QMessageBox::critical(
|
||||
this, tr("Citra"),
|
||||
this, tr("Lime"),
|
||||
tr("Could not start video dumping.<br>Refer to the log for details."));
|
||||
ui->action_Dump_Video->setChecked(false);
|
||||
}
|
||||
|
|
@ -2836,7 +2836,7 @@ bool GMainWindow::ConfirmClose() {
|
|||
}
|
||||
|
||||
QMessageBox::StandardButton answer =
|
||||
QMessageBox::question(this, tr("Citra"), tr("Would you like to exit now?"),
|
||||
QMessageBox::question(this, tr("Lime"), tr("Would you like to exit now?"),
|
||||
QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
|
||||
return answer != QMessageBox::No;
|
||||
}
|
||||
|
|
@ -2929,7 +2929,7 @@ bool GMainWindow::ConfirmChangeGame() {
|
|||
}
|
||||
|
||||
auto answer = QMessageBox::question(
|
||||
this, tr("Citra"), tr("The game is still running. Would you like to stop emulation?"),
|
||||
this, tr("Lime"), tr("The game is still running. Would you like to stop emulation?"),
|
||||
QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
|
||||
return answer != QMessageBox::No;
|
||||
}
|
||||
|
|
@ -3055,12 +3055,12 @@ void GMainWindow::UpdateWindowTitle() {
|
|||
const QString full_name = QString::fromUtf8(Common::g_build_fullname);
|
||||
|
||||
if (game_title.isEmpty()) {
|
||||
setWindowTitle(QStringLiteral("Citra %1").arg(full_name));
|
||||
setWindowTitle(QStringLiteral("Lime %1").arg(full_name));
|
||||
} else {
|
||||
setWindowTitle(QStringLiteral("Citra %1 | %2").arg(full_name, game_title));
|
||||
setWindowTitle(QStringLiteral("Lime %1 | %2").arg(full_name, game_title));
|
||||
render_window->setWindowTitle(
|
||||
QStringLiteral("Citra %1 | %2 | %3").arg(full_name, game_title, tr("Primary Window")));
|
||||
secondary_window->setWindowTitle(QStringLiteral("Citra %1 | %2 | %3")
|
||||
QStringLiteral("Lime %1 | %2 | %3").arg(full_name, game_title, tr("Primary Window")));
|
||||
secondary_window->setWindowTitle(QStringLiteral("Lime %1 | %2 | %3")
|
||||
.arg(full_name, game_title, tr("Secondary Window")));
|
||||
}
|
||||
}
|
||||
|
|
@ -3190,8 +3190,8 @@ int main(int argc, char* argv[]) {
|
|||
SCOPE_EXIT({ MicroProfileShutdown(); });
|
||||
|
||||
// Init settings params
|
||||
QCoreApplication::setOrganizationName(QStringLiteral("Citra team"));
|
||||
QCoreApplication::setApplicationName(QStringLiteral("Citra"));
|
||||
QCoreApplication::setOrganizationName(QStringLiteral("Lime team"));
|
||||
QCoreApplication::setApplicationName(QStringLiteral("Lime"));
|
||||
|
||||
auto rounding_policy = GetHighDpiRoundingPolicy();
|
||||
QApplication::setHighDpiScaleFactorRoundingPolicy(rounding_policy);
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>Citra</string>
|
||||
<string>Lime</string>
|
||||
</property>
|
||||
<property name="windowIcon">
|
||||
<iconset>
|
||||
|
|
@ -301,7 +301,7 @@
|
|||
</action>
|
||||
<action name="action_About">
|
||||
<property name="text">
|
||||
<string>About Citra</string>
|
||||
<string>About Lime</string>
|
||||
</property>
|
||||
<property name="menuRole">
|
||||
<enum>QAction::AboutRole</enum>
|
||||
|
|
@ -475,10 +475,10 @@
|
|||
</action>
|
||||
<action name="action_Open_Maintenance_Tool">
|
||||
<property name="text">
|
||||
<string>Modify Citra Install</string>
|
||||
<string>Modify Lime Install</string>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Opens the maintenance tool to modify your Citra installation</string>
|
||||
<string>Opens the maintenance tool to modify your Lime installation</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="action_Screen_Layout_Default">
|
||||
|
|
@ -587,7 +587,7 @@
|
|||
</action>
|
||||
<action name="action_Open_Citra_Folder">
|
||||
<property name="text">
|
||||
<string>Open Citra Folder</string>
|
||||
<string>Open Lime Folder</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="action_Configure_Current_Game">
|
||||
|
|
|
|||
Loading…
Reference in a new issue