diff --git a/dist/citra.svg b/dist/citra.svg index b6abc1ccf..75803b3f3 100644 --- a/dist/citra.svg +++ b/dist/citra.svg @@ -1,2 +1,383 @@ - -image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/dist/citra_old.ico b/dist/citra_old.ico deleted file mode 100644 index 2c408b935..000000000 Binary files a/dist/citra_old.ico and /dev/null differ diff --git a/dist/doc-icon_old.png b/dist/doc-icon_old.png deleted file mode 100644 index 9b5773214..000000000 Binary files a/dist/doc-icon_old.png and /dev/null differ diff --git a/dist/icon_old.png b/dist/icon_old.png deleted file mode 100644 index fd102724c..000000000 Binary files a/dist/icon_old.png and /dev/null differ diff --git a/src/citra_qt/aboutdialog.ui b/src/citra_qt/aboutdialog.ui index 10bc377d4..491fe8801 100644 --- a/src/citra_qt/aboutdialog.ui +++ b/src/citra_qt/aboutdialog.ui @@ -11,7 +11,7 @@ - About Citra + About Lime @@ -57,7 +57,7 @@ - <html><head/><body><p><span style=" font-size:28pt;">Citra</span></p></body></html> + <html><head/><body><p><span style=" font-size:28pt;">Lime</span></p></body></html> @@ -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> @@ -131,7 +131,7 @@ p, li { white-space: pre-wrap; } - <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> + <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> diff --git a/src/citra_qt/compatdb.ui b/src/citra_qt/compatdb.ui index 33519814c..dc0420a0f 100644 --- a/src/citra_qt/compatdb.ui +++ b/src/citra_qt/compatdb.ui @@ -33,7 +33,7 @@ - <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> + <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> true @@ -179,7 +179,7 @@ - <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> + <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> true diff --git a/src/citra_qt/configuration/configure.ui b/src/citra_qt/configuration/configure.ui index f6f5a517a..18e6202ce 100644 --- a/src/citra_qt/configuration/configure.ui +++ b/src/citra_qt/configuration/configure.ui @@ -3,7 +3,7 @@ ConfigureDialog - Citra Configuration + Lime Configuration diff --git a/src/citra_qt/configuration/configure_system.cpp b/src/citra_qt/configuration/configure_system.cpp index 653957ca7..849a86004 100644 --- a/src/citra_qt/configuration/configure_system.cpp +++ b/src/citra_qt/configuration/configure_system.cpp @@ -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.
How to get keys?")); } @@ -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); diff --git a/src/citra_qt/configuration/configure_web.ui b/src/citra_qt/configuration/configure_web.ui index c87cf48e6..219a6b6c7 100644 --- a/src/citra_qt/configuration/configure_web.ui +++ b/src/citra_qt/configuration/configure_web.ui @@ -19,13 +19,13 @@ - Citra Web Service + Lime Web Service - By providing your username and token, you agree to allow Citra to collect additional usage data, which may include user identifying information. + 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. @@ -128,7 +128,7 @@ - Share anonymous usage data with the Citra team + Share anonymous usage data with the Lime team diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp index 5d8b4204b..d2fddf38d 100644 --- a/src/citra_qt/main.cpp +++ b/src/citra_qt/main.cpp @@ -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.
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); diff --git a/src/citra_qt/main.ui b/src/citra_qt/main.ui index 557322750..f54b6d267 100644 --- a/src/citra_qt/main.ui +++ b/src/citra_qt/main.ui @@ -11,7 +11,7 @@
- Citra + Lime @@ -301,7 +301,7 @@ - About Citra + About Lime QAction::AboutRole @@ -475,10 +475,10 @@ - Modify Citra Install + Modify Lime Install - Opens the maintenance tool to modify your Citra installation + Opens the maintenance tool to modify your Lime installation @@ -587,7 +587,7 @@ - Open Citra Folder + Open Lime Folder