diff --git a/README.md b/README.md index bbf464929..3472d800c 100644 --- a/README.md +++ b/README.md @@ -6,20 +6,21 @@
-Emulation never dies! It changes and moves forward! +Emulation never dies! it changes and moves forward! -

Lime is a successor to the world's most popular, open-source, Nintendo 3DS emulator. +

Lime is the world's most popular, open-source, Nintendo 3DS emulator.
It is written in C++ with portability in mind and builds are actively maintained for Windows, Linux, Android and macOS.

## Release Builds -You can find new releases [here](https://github.com/RyzenDew/Lime-3DS-Emulator/releases). -## Support and contribution +https://github.com/RyzenDew/Lime-3DS-Emulator/releases -If you want to support me you can subcribe to [this](https://www.youtube.com/c/MattsCreative) YouTube channel. -Any contribution to the project is welcomed. +## support me + +Just subcribe to my Youtube https://www.youtube.com/c/MattsCreative ## License + Lime is licensed under the GPLv2 (or any later version). Refer to the [LICENSE.txt](https://github.com/citra-emu/citra/blob/master/license.txt) file. diff --git a/dist/lime-qt.desktop b/dist/citra-qt.desktop old mode 100755 new mode 100644 similarity index 94% rename from dist/lime-qt.desktop rename to dist/citra-qt.desktop index 56c4f15c2..cc4ec41a2 --- a/dist/lime-qt.desktop +++ b/dist/citra-qt.desktop @@ -1,12 +1,12 @@ [Desktop Entry] Version=1.0 Type=Application -Name=Lime +Name=Citra GenericName=3DS Emulator GenericName[fr]=Émulateur 3DS Comment=Nintendo 3DS video game console emulator Comment[fr]=Émulateur de console de jeu Nintendo 3DS -Icon=lime +Icon=citra TryExec=citra-qt Exec=citra-qt %f Categories=Game;Emulator;Qt; diff --git a/dist/lime-room.desktop b/dist/citra-room.desktop similarity index 66% rename from dist/lime-room.desktop rename to dist/citra-room.desktop index ccf845091..89df53bbd 100644 --- a/dist/lime-room.desktop +++ b/dist/citra-room.desktop @@ -1,9 +1,9 @@ [Desktop Entry] Version=1.0 Type=Application -Name=Lime Room -Comment=Multiplayer room host for Lime -Icon=lime +Name=Citra Room +Comment=Multiplayer room host for Citra +Icon=citra TryExec=citra-room Exec=citra-room %f Categories=Game;Emulator; diff --git a/dist/lime.desktop b/dist/citra.desktop similarity index 71% rename from dist/lime.desktop rename to dist/citra.desktop index 6e55b8878..24468cd13 100644 --- a/dist/lime.desktop +++ b/dist/citra.desktop @@ -1,15 +1,15 @@ [Desktop Entry] Version=1.0 Type=Application -Name=Lime +Name=Citra GenericName=3DS Emulator GenericName[fr]=Émulateur 3DS Comment=Nintendo 3DS video game console emulator Comment[fr]=Émulateur de console de jeu Nintendo 3DS -Icon=lime +Icon=citra TryExec=citra Exec=citra %f Categories=Game;Emulator; -MimeType=application/x-lme-3dsx;application/x-lme-cci;application/x-lme-cia;application/x-lme-cxi; +MimeType=application/x-ctr-3dsx;application/x-ctr-cci;application/x-ctr-cia;application/x-ctr-cxi; Keywords=3DS;Nintendo; PrefersNonDefaultGPU=true diff --git a/dist/citra.ico b/dist/citra.ico new file mode 100644 index 000000000..2c408b935 Binary files /dev/null and b/dist/citra.ico differ diff --git a/dist/citra.svg b/dist/citra.svg new file mode 100644 index 000000000..b6abc1ccf --- /dev/null +++ b/dist/citra.svg @@ -0,0 +1,2 @@ + +image/svg+xml diff --git a/dist/compatibility_list/compatibility_list.json b/dist/compatibility_list/compatibility_list.json deleted file mode 100644 index e69de29bb..000000000 diff --git a/dist/doc-icon.png b/dist/doc-icon.png index fd8747da2..9b5773214 100644 Binary files a/dist/doc-icon.png and b/dist/doc-icon.png differ diff --git a/dist/icon.png b/dist/icon.png index 94099ff1c..fd102724c 100644 Binary files a/dist/icon.png and b/dist/icon.png differ diff --git a/dist/lime.ico b/dist/lime.ico deleted file mode 100644 index 3f67f3a21..000000000 Binary files a/dist/lime.ico and /dev/null differ diff --git a/dist/lime.svg b/dist/lime.svg deleted file mode 100644 index b340e9ae7..000000000 --- a/dist/lime.svg +++ /dev/null @@ -1,9329 +0,0 @@ - - - - diff --git a/dist/qt_themes/default/default.qrc b/dist/qt_themes/default/default.qrc index 9b6376ba4..6da475316 100644 --- a/dist/qt_themes/default/default.qrc +++ b/dist/qt_themes/default/default.qrc @@ -13,7 +13,7 @@ icons/48x48/no_avatar.png icons/48x48/plus.png icons/48x48/sd_card.png - icons/256x256/lime.png + icons/256x256/citra.png icons/256x256/plus_folder.png diff --git a/dist/qt_themes/default/icons/256x256/citra.png b/dist/qt_themes/default/icons/256x256/citra.png new file mode 100644 index 000000000..dbbfa7473 Binary files /dev/null and b/dist/qt_themes/default/icons/256x256/citra.png differ diff --git a/dist/qt_themes/default/icons/256x256/lime.png b/dist/qt_themes/default/icons/256x256/lime.png deleted file mode 100644 index bddfc339d..000000000 Binary files a/dist/qt_themes/default/icons/256x256/lime.png and /dev/null differ diff --git a/externals/libusb/config.h b/externals/libusb/config.h deleted file mode 100644 index f8c8df8f1..000000000 --- a/externals/libusb/config.h +++ /dev/null @@ -1,93 +0,0 @@ -/* Default visibility */ -#if defined(__GNUC__) || defined(__clang__) - #define DEFAULT_VISIBILITY __attribute__((visibility("default"))) -#elif defined(_MSC_VER) - #define DEFAULT_VISIBILITY __declspec(dllexport) -#endif - -/* Start with debug message logging enabled */ -#undef ENABLE_DEBUG_LOGGING - -/* Message logging */ -#undef ENABLE_LOGGING - -/* Define to 1 if you have the header file. */ -#define HAVE_ASM_TYPES_H 1 - -/* Define to 1 if you have the `gettimeofday' function. */ -#define HAVE_GETTIMEOFDAY 1 - -/* Define to 1 if you have the `udev' library (-ludev). */ -/* #undef HAVE_LIBUDEV */ - -/* Define to 1 if you have the header file. */ -#define HAVE_LINUX_FILTER_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_LINUX_NETLINK_H 1 - -/* Define to 1 if you have eventfd support. */ -#define HAVE_EVENTFD 1 - -/* Define to 1 if you have timerfd support. */ -#define HAVE_TIMERFD 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SIGNAL_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STRINGS_H 1 - -/* Define to 1 if the system has the type `struct timespec'. */ -#define HAVE_STRUCT_TIMESPEC 1 - -/* syslog() function available */ -#define HAVE_SYSLOG_FUNC 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYSLOG_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_SOCKET_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_TIME_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Define to 1 if you have the 'clock_gettime' function. */ -#define HAVE_CLOCK_GETTIME 1 - -/* Darwin backend */ -/* #undef OS_DARWIN */ - -/* Linux backend */ -#define OS_LINUX 1 - -/* NetBSD backend */ -/* #undef OS_NETBSD */ - -/* OpenBSD backend */ -/* #undef OS_OPENBSD */ - -/* Windows backend */ -/* #undef OS_WINDOWS */ - -/* Use POSIX Platform */ -#define PLATFORM_POSIX - -/* Use Windows Platform */ -/* #undef PLATFORM_WINDOWS */ - -/* Enable output to system log */ -#define USE_SYSTEM_LOGGING_FACILITY 1 - -/* Use udev for device enumeration/hotplug */ -/* #undef USE_UDEV */ - -/* Use GNU extensions */ -#define _GNU_SOURCE - -/* Oldest Windows version supported */ -#define WINVER 0x0501 diff --git a/src/citra/citra.cpp b/src/citra/citra.cpp index 35e794a7f..99fb285f0 100644 --- a/src/citra/citra.cpp +++ b/src/citra/citra.cpp @@ -1,4 +1,4 @@ -// Copyright 2024 Lime Emulator Project +// Copyright 2014 Citra Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. diff --git a/src/citra/citra.rc b/src/citra/citra.rc index 2f9473e9d..2c6bcd589 100644 --- a/src/citra/citra.rc +++ b/src/citra/citra.rc @@ -6,7 +6,7 @@ // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -CITRA_ICON ICON "../../dist/lime.ico" +CITRA_ICON ICON "../../dist/citra.ico" ///////////////////////////////////////////////////////////////////////////// diff --git a/src/citra/config.cpp b/src/citra/config.cpp index 9b1929937..baf5bbded 100644 --- a/src/citra/config.cpp +++ b/src/citra/config.cpp @@ -1,4 +1,4 @@ -// Copyright 2024 Citra Emulator Project +// Copyright 2014 Citra Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. diff --git a/src/citra/emu_window/emu_window_sdl2.cpp b/src/citra/emu_window/emu_window_sdl2.cpp index 731ad7537..36c2f7fc7 100644 --- a/src/citra/emu_window/emu_window_sdl2.cpp +++ b/src/citra/emu_window/emu_window_sdl2.cpp @@ -1,4 +1,4 @@ -// Copyright 2024 Lime Emulator Project +// Copyright 2016 Citra Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. diff --git a/src/citra/emu_window/emu_window_sdl2_gl.cpp b/src/citra/emu_window/emu_window_sdl2_gl.cpp index da147dbaa..c72c16bf6 100644 --- a/src/citra/emu_window/emu_window_sdl2_gl.cpp +++ b/src/citra/emu_window/emu_window_sdl2_gl.cpp @@ -1,4 +1,4 @@ -// Copyright 2024 Lime Emulator Project +// Copyright 2023 Citra Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. diff --git a/src/citra/emu_window/emu_window_sdl2_sw.cpp b/src/citra/emu_window/emu_window_sdl2_sw.cpp index 4f4d82784..cdf60da79 100644 --- a/src/citra/emu_window/emu_window_sdl2_sw.cpp +++ b/src/citra/emu_window/emu_window_sdl2_sw.cpp @@ -1,4 +1,4 @@ -// Copyright 2024 Lime Emulator Project +// Copyright 2023 Citra Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. diff --git a/src/citra/emu_window/emu_window_sdl2_vk.cpp b/src/citra/emu_window/emu_window_sdl2_vk.cpp index 7bcacf777..47e10dc38 100644 --- a/src/citra/emu_window/emu_window_sdl2_vk.cpp +++ b/src/citra/emu_window/emu_window_sdl2_vk.cpp @@ -1,4 +1,4 @@ -// Copyright 2024 Lime Emulator Project +// Copyright 2023 Citra Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. diff --git a/src/citra_qt/aboutdialog.cpp b/src/citra_qt/aboutdialog.cpp index c2b865a0d..51143c87f 100644 --- a/src/citra_qt/aboutdialog.cpp +++ b/src/citra_qt/aboutdialog.cpp @@ -1,4 +1,4 @@ -// Copyright 2024 Lime Emulator Project +// Copyright 2017 Citra Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. @@ -11,7 +11,7 @@ AboutDialog::AboutDialog(QWidget* parent) : QDialog(parent, Qt::WindowTitleHint | Qt::WindowCloseButtonHint | Qt::WindowSystemMenuHint), ui(std::make_unique()) { ui->setupUi(this); - ui->labelLogo->setPixmap(QIcon::fromTheme(QStringLiteral("lime")).pixmap(200)); + ui->labelLogo->setPixmap(QIcon::fromTheme(QStringLiteral("citra")).pixmap(200)); ui->labelBuildInfo->setText(ui->labelBuildInfo->text().arg( QString::fromUtf8(Common::g_build_fullname), QString::fromUtf8(Common::g_scm_branch), QString::fromUtf8(Common::g_scm_desc), QString::fromUtf8(Common::g_build_date).left(10))); diff --git a/src/citra_qt/aboutdialog.ui b/src/citra_qt/aboutdialog.ui index c3fa0f95f..10bc377d4 100644 --- a/src/citra_qt/aboutdialog.ui +++ b/src/citra_qt/aboutdialog.ui @@ -11,7 +11,7 @@ - About Lime + About Citra @@ -27,7 +27,7 @@ - <html><head/><body><p><img src=":/icons/lime.png"/></p></body></html> + <html><head/><body><p><img src=":/icons/citra.png"/></p></body></html> @@ -57,7 +57,7 @@ - <html><head/><body><p><span style=" font-size:28pt;">Lime</span></p></body></html> + <html><head/><body><p><span style=" font-size:28pt;">Citra</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;">Lime 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;">Citra 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> @@ -115,7 +115,7 @@ p, li { white-space: pre-wrap; } - <html><head/><body><p><a href="https://citra-emu.org/"><span style=" text-decoration: underline; color:#039be5;">Website</span></a> | <a href="https://community.citra-emu.org/"><span style=" text-decoration: underline; color:#039be5;">Forum</span></a> | <a href="https://github.com/RyzenDew/Lime-3DS-Emulator"><span style=" text-decoration: underline; color:#039be5;">Source Code</span></a> | <a href="https://github.com/RyzenDew/Lime-3DS-Emulator/graphs/contributors"><span style=" text-decoration: underline; color:#039be5;">Contributors</span></a> | <a href="https://github.com/RyzenDew/Lime-3DS-Emulator/blob/master/license.txt"><span style=" text-decoration: underline; color:#039be5;">License</span></a></p></body></html> + <html><head/><body><p><a href="https://citra-emu.org/"><span style=" text-decoration: underline; color:#039be5;">Website</span></a> | <a href="https://community.citra-emu.org/"><span style=" text-decoration: underline; color:#039be5;">Forum</span></a> | <a href="https://github.com/citra-emu"><span style=" text-decoration: underline; color:#039be5;">Source Code</span></a> | <a href="https://github.com/citra-emu/citra/graphs/contributors"><span style=" text-decoration: underline; color:#039be5;">Contributors</span></a> | <a href="https://github.com/citra-emu/citra/blob/master/license.txt"><span style=" text-decoration: underline; color:#039be5;">License</span></a></p></body></html> true @@ -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. Lime 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. Citra is not affiliated with Nintendo in any way.</span></p></body></html> diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp index 9936c3524..8f63f6713 100644 --- a/src/citra_qt/bootmanager.cpp +++ b/src/citra_qt/bootmanager.cpp @@ -1,4 +1,4 @@ -// Copyright 2024 Lime Emulator Project +// Copyright 2014 Citra Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. diff --git a/src/citra_qt/citra-qt.rc b/src/citra_qt/citra-qt.rc index 8fa6ce9ef..7b10f5409 100644 --- a/src/citra_qt/citra-qt.rc +++ b/src/citra_qt/citra-qt.rc @@ -8,7 +8,7 @@ // remains consistent on all systems. // QT requires that the default application icon is named IDI_ICON1 -IDI_ICON1 ICON "../../dist/lime.ico" +IDI_ICON1 ICON "../../dist/citra.ico" ///////////////////////////////////////////////////////////////////////////// diff --git a/src/citra_qt/compatdb.cpp b/src/citra_qt/compatdb.cpp index 6bd5e3a7b..ca8f5870a 100644 --- a/src/citra_qt/compatdb.cpp +++ b/src/citra_qt/compatdb.cpp @@ -1,4 +1,4 @@ -// Copyright 2024 Lime Emulator Project +// Copyright 2017 Citra Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. diff --git a/src/citra_qt/compatdb.ui b/src/citra_qt/compatdb.ui index 2a671d404..33519814c 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;">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 Lime 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;">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> 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 Lime?</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 Citra?</p></body></html> true diff --git a/src/citra_qt/configuration/config.cpp b/src/citra_qt/configuration/config.cpp index 7fa9981fb..54c8c4f4b 100644 --- a/src/citra_qt/configuration/config.cpp +++ b/src/citra_qt/configuration/config.cpp @@ -1,4 +1,4 @@ -// Copyright 2024 Lime Emulator Project +// Copyright 2014 Citra Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. @@ -63,7 +63,7 @@ const std::array Config::default_hotkeys {{ {QStringLiteral("Continue/Pause Emulation"), QStringLiteral("Main Window"), {QStringLiteral("F4"), Qt::WindowShortcut}}, {QStringLiteral("Decrease 3D Factor"), QStringLiteral("Main Window"), {QStringLiteral("Ctrl+-"), Qt::ApplicationShortcut}}, {QStringLiteral("Decrease Speed Limit"), QStringLiteral("Main Window"), {QStringLiteral("-"), Qt::ApplicationShortcut}}, - {QStringLiteral("Exit Lime"), QStringLiteral("Main Window"), {QStringLiteral("Ctrl+Q"), Qt::WindowShortcut}}, + {QStringLiteral("Exit Citra"), QStringLiteral("Main Window"), {QStringLiteral("Ctrl+Q"), Qt::WindowShortcut}}, {QStringLiteral("Exit Fullscreen"), QStringLiteral("Main Window"), {QStringLiteral("Esc"), Qt::WindowShortcut}}, {QStringLiteral("Fullscreen"), QStringLiteral("Main Window"), {QStringLiteral("F11"), Qt::WindowShortcut}}, {QStringLiteral("Increase 3D Factor"), QStringLiteral("Main Window"), {QStringLiteral("Ctrl++"), Qt::ApplicationShortcut}}, diff --git a/src/citra_qt/configuration/configure.ui b/src/citra_qt/configuration/configure.ui index 18e6202ce..f6f5a517a 100644 --- a/src/citra_qt/configuration/configure.ui +++ b/src/citra_qt/configuration/configure.ui @@ -3,7 +3,7 @@ ConfigureDialog - Lime Configuration + Citra Configuration diff --git a/src/citra_qt/configuration/configure_audio.cpp b/src/citra_qt/configuration/configure_audio.cpp index 0e0f7a9f7..bf301d41e 100644 --- a/src/citra_qt/configuration/configure_audio.cpp +++ b/src/citra_qt/configuration/configure_audio.cpp @@ -1,4 +1,4 @@ -// Copyright 2024 Lime Emulator Project +// Copyright 2016 Citra Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. diff --git a/src/citra_qt/configuration/configure_camera.cpp b/src/citra_qt/configuration/configure_camera.cpp index 68796bcab..08368fe5c 100644 --- a/src/citra_qt/configuration/configure_camera.cpp +++ b/src/citra_qt/configuration/configure_camera.cpp @@ -1,4 +1,4 @@ -// Copyright 2024 Lime Emulator Project +// Copyright 2018 Citra Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. diff --git a/src/citra_qt/configuration/configure_cheats.cpp b/src/citra_qt/configuration/configure_cheats.cpp index 035a21690..aa67f7440 100644 --- a/src/citra_qt/configuration/configure_cheats.cpp +++ b/src/citra_qt/configuration/configure_cheats.cpp @@ -1,4 +1,4 @@ -// Copyright 2024 Lime Emulator Project +// Copyright 2018 Citra Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. diff --git a/src/citra_qt/configuration/configure_debug.cpp b/src/citra_qt/configuration/configure_debug.cpp index a749da93a..2386e2049 100644 --- a/src/citra_qt/configuration/configure_debug.cpp +++ b/src/citra_qt/configuration/configure_debug.cpp @@ -1,4 +1,4 @@ -// Copyright 2024 Lime Emulator Project +// Copyright 2016 Citra Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. diff --git a/src/citra_qt/configuration/configure_dialog.cpp b/src/citra_qt/configuration/configure_dialog.cpp index c6c1819ad..1644b657a 100644 --- a/src/citra_qt/configuration/configure_dialog.cpp +++ b/src/citra_qt/configuration/configure_dialog.cpp @@ -1,4 +1,4 @@ -// Copyright 2024 Lime Emulator Project +// Copyright 2016 Citra Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. diff --git a/src/citra_qt/configuration/configure_enhancements.cpp b/src/citra_qt/configuration/configure_enhancements.cpp index d20ed48ba..e1a831eee 100644 --- a/src/citra_qt/configuration/configure_enhancements.cpp +++ b/src/citra_qt/configuration/configure_enhancements.cpp @@ -1,4 +1,4 @@ -// Copyright 2024 Lime Emulator Project +// Copyright 2019 Citra Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. diff --git a/src/citra_qt/configuration/configure_general.cpp b/src/citra_qt/configuration/configure_general.cpp index 447ea5928..a402523bf 100644 --- a/src/citra_qt/configuration/configure_general.cpp +++ b/src/citra_qt/configuration/configure_general.cpp @@ -1,4 +1,4 @@ -// Copyright 2024 Lime Emulator Project +// Copyright 2016 Citra Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. @@ -146,8 +146,8 @@ void ConfigureGeneral::SetConfiguration() { void ConfigureGeneral::ResetDefaults() { QMessageBox::StandardButton answer = QMessageBox::question( - this, tr("Lime"), - tr("Are you sure you want to reset your settings and close Lime?"), + this, tr("Citra"), + tr("Are you sure you want to reset your settings and close Citra?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::No); if (answer == QMessageBox::No) { diff --git a/src/citra_qt/configuration/configure_graphics.cpp b/src/citra_qt/configuration/configure_graphics.cpp index 95d6ffe32..80c2d138d 100644 --- a/src/citra_qt/configuration/configure_graphics.cpp +++ b/src/citra_qt/configuration/configure_graphics.cpp @@ -1,4 +1,4 @@ -// Copyright 2024 Lime Emulator Project +// Copyright 2016 Citra Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. diff --git a/src/citra_qt/configuration/configure_hotkeys.cpp b/src/citra_qt/configuration/configure_hotkeys.cpp index 9f0332e02..b07370528 100644 --- a/src/citra_qt/configuration/configure_hotkeys.cpp +++ b/src/citra_qt/configuration/configure_hotkeys.cpp @@ -1,4 +1,4 @@ -// Copyright 2024 Lime Emulator Project +// Copyright 2017 Citra Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. diff --git a/src/citra_qt/configuration/configure_input.cpp b/src/citra_qt/configuration/configure_input.cpp index 4fa6bc3d6..da98da0d0 100644 --- a/src/citra_qt/configuration/configure_input.cpp +++ b/src/citra_qt/configuration/configure_input.cpp @@ -1,4 +1,4 @@ -// Copyright 2024 Lime Emulator Project +// Copyright 2016 Citra Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. diff --git a/src/citra_qt/configuration/configure_motion_touch.cpp b/src/citra_qt/configuration/configure_motion_touch.cpp index d927b921d..3bfbba71d 100644 --- a/src/citra_qt/configuration/configure_motion_touch.cpp +++ b/src/citra_qt/configuration/configure_motion_touch.cpp @@ -1,4 +1,4 @@ -// Copyright 2024 Lime Emulator Project +// Copyright 2018 Citra Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. @@ -340,7 +340,7 @@ void ConfigureMotionTouch::OnConfigureTouchFromButton() { bool ConfigureMotionTouch::CanCloseDialog() { if (udp_test_in_progress) { - QMessageBox::warning(this, tr("Lime"), + QMessageBox::warning(this, tr("Citra"), tr("UDP Test or calibration configuration is in progress.
Please " "wait for them to finish.")); return false; diff --git a/src/citra_qt/configuration/configure_per_game.cpp b/src/citra_qt/configuration/configure_per_game.cpp index 0849cbba2..c11847a0d 100644 --- a/src/citra_qt/configuration/configure_per_game.cpp +++ b/src/citra_qt/configuration/configure_per_game.cpp @@ -78,7 +78,7 @@ ConfigurePerGame::~ConfigurePerGame() = default; void ConfigurePerGame::ResetDefaults() { const auto config_file_name = title_id == 0 ? filename : fmt::format("{:016X}", title_id); QMessageBox::StandardButton answer = QMessageBox::question( - this, tr("Lime"), tr("Are you sure you want to reset your settings for this game?"), + this, tr("Citra"), tr("Are you sure you want to reset your settings for this game?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::No); if (answer == QMessageBox::No) { diff --git a/src/citra_qt/configuration/configure_storage.cpp b/src/citra_qt/configuration/configure_storage.cpp index 836331382..d46cb0614 100644 --- a/src/citra_qt/configuration/configure_storage.cpp +++ b/src/citra_qt/configuration/configure_storage.cpp @@ -1,4 +1,4 @@ -// Copyright 2024 Lime Emulator Project +// Copyright 2021 Citra Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. diff --git a/src/citra_qt/configuration/configure_system.cpp b/src/citra_qt/configuration/configure_system.cpp index 0be937472..653957ca7 100644 --- a/src/citra_qt/configuration/configure_system.cpp +++ b/src/citra_qt/configuration/configure_system.cpp @@ -1,4 +1,4 @@ -// Copyright 2024 Lime Emulator Project +// Copyright 2016 Citra Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. @@ -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("Lime 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("Lime"), tr("Downloading system files failed.")); + QMessageBox::critical(this, tr("Citra"), tr("Downloading system files failed.")); } else if (!future_watcher.isCanceled()) { - QMessageBox::information(this, tr("Lime"), tr("Successfully downloaded system files.")); + QMessageBox::information(this, tr("Citra"), tr("Successfully downloaded system files.")); } ui->button_start_download->setEnabled(true); diff --git a/src/citra_qt/configuration/configure_touch_from_button.cpp b/src/citra_qt/configuration/configure_touch_from_button.cpp index 7235763b8..76f2a77bc 100644 --- a/src/citra_qt/configuration/configure_touch_from_button.cpp +++ b/src/citra_qt/configuration/configure_touch_from_button.cpp @@ -1,4 +1,4 @@ -// Copyright 2024 Lime Emulator Project +// Copyright 2020 Citra Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. diff --git a/src/citra_qt/configuration/configure_ui.cpp b/src/citra_qt/configuration/configure_ui.cpp index 125fcd70d..f13fc41b8 100644 --- a/src/citra_qt/configuration/configure_ui.cpp +++ b/src/citra_qt/configuration/configure_ui.cpp @@ -1,4 +1,4 @@ -// Copyright 2024 Lime Emulator Project +// Copyright 2018 Citra Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. diff --git a/src/citra_qt/configuration/configure_web.cpp b/src/citra_qt/configuration/configure_web.cpp index e7dfa56d6..b9a15b6ec 100644 --- a/src/citra_qt/configuration/configure_web.cpp +++ b/src/citra_qt/configuration/configure_web.cpp @@ -1,4 +1,4 @@ -// Copyright 2024 Lime Emulator Project +// Copyright 2017 Citra Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. diff --git a/src/citra_qt/configuration/configure_web.ui b/src/citra_qt/configuration/configure_web.ui index c6978a374..c87cf48e6 100644 --- a/src/citra_qt/configuration/configure_web.ui +++ b/src/citra_qt/configuration/configure_web.ui @@ -19,13 +19,13 @@ - Lime Web Service + Citra Web Service - By providing your username and token, you agree to allow Lime to collect additional usage data, which may include user identifying information. + 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 Lime team + Share anonymous usage data with the Citra team diff --git a/src/citra_qt/discord_impl.cpp b/src/citra_qt/discord_impl.cpp index e5138c0c6..076c15fa8 100644 --- a/src/citra_qt/discord_impl.cpp +++ b/src/citra_qt/discord_impl.cpp @@ -1,4 +1,4 @@ -// Copyright 2024 Lime Emulator Project +// Copyright 2018 Citra Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. @@ -16,7 +16,7 @@ namespace DiscordRPC { DiscordImpl::DiscordImpl(const Core::System& system_) : system{system_} { DiscordEventHandlers handlers{}; - // The number is the client ID for Lime, it's used for images and the + // The number is the client ID for Citra, it's used for images and the // application name Discord_Initialize("719647875465871400", &handlers, 1, nullptr); } @@ -41,8 +41,8 @@ void DiscordImpl::Update() { } DiscordRichPresence presence{}; - presence.largeImageKey = "lime"; - presence.largeImageText = "Lime is an emulator for the Nintendo 3DS"; + presence.largeImageKey = "citra"; + presence.largeImageText = "Citra is an emulator for the Nintendo 3DS"; if (is_powered_on) { presence.state = title.c_str(); presence.details = "Currently in game"; diff --git a/src/citra_qt/game_list.cpp b/src/citra_qt/game_list.cpp index 63e7cc6d9..43fcbcee6 100644 --- a/src/citra_qt/game_list.cpp +++ b/src/citra_qt/game_list.cpp @@ -1,4 +1,4 @@ -// Copyright 2024 Lime Emulator Project +// Copyright 2015 Citra Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. @@ -684,7 +684,7 @@ void GameList::AddGamePopup(QMenu& context_menu, const QString& path, const QStr #endif connect(uninstall_all, &QAction::triggered, this, [=, this] { QMessageBox::StandardButton answer = QMessageBox::question( - this, tr("Lime"), + this, tr("Citra"), tr("Are you sure you want to completely uninstall '%1'?\n\nThis will " "delete the game if installed, as well as any installed updates or DLC.") .arg(name), @@ -707,7 +707,7 @@ void GameList::AddGamePopup(QMenu& context_menu, const QString& path, const QStr }); connect(uninstall_game, &QAction::triggered, this, [this, name, media_type, program_id] { QMessageBox::StandardButton answer = QMessageBox::question( - this, tr("Lime"), tr("Are you sure you want to uninstall '%1'?").arg(name), + this, tr("Citra"), tr("Are you sure you want to uninstall '%1'?").arg(name), QMessageBox::Yes | QMessageBox::No, QMessageBox::No); if (answer == QMessageBox::Yes) { std::vector> titles; @@ -717,7 +717,7 @@ void GameList::AddGamePopup(QMenu& context_menu, const QString& path, const QStr }); connect(uninstall_update, &QAction::triggered, this, [this, name, update_program_id] { QMessageBox::StandardButton answer = QMessageBox::question( - this, tr("Lime"), + this, tr("Citra"), tr("Are you sure you want to uninstall the update for '%1'?").arg(name), QMessageBox::Yes | QMessageBox::No, QMessageBox::No); if (answer == QMessageBox::Yes) { @@ -729,7 +729,7 @@ void GameList::AddGamePopup(QMenu& context_menu, const QString& path, const QStr }); connect(uninstall_dlc, &QAction::triggered, this, [this, name, dlc_program_id] { QMessageBox::StandardButton answer = QMessageBox::question( - this, tr("Lime"), tr("Are you sure you want to uninstall all DLC for '%1'?").arg(name), + this, tr("Citra"), tr("Are you sure you want to uninstall all DLC for '%1'?").arg(name), QMessageBox::Yes | QMessageBox::No, QMessageBox::No); if (answer == QMessageBox::Yes) { std::vector> titles; diff --git a/src/citra_qt/hotkeys.cpp b/src/citra_qt/hotkeys.cpp index eaae667b9..8997b4567 100644 --- a/src/citra_qt/hotkeys.cpp +++ b/src/citra_qt/hotkeys.cpp @@ -1,4 +1,4 @@ -// Copyright 2024 Lime Emulator Project +// Copyright 2014 Citra Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. diff --git a/src/citra_qt/loading_screen.cpp b/src/citra_qt/loading_screen.cpp index f992bf94e..23d15b9d4 100644 --- a/src/citra_qt/loading_screen.cpp +++ b/src/citra_qt/loading_screen.cpp @@ -1,4 +1,4 @@ -// Copyright 2024 Lime Emulator Project +// Copyright 2020 Citra Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp index 6b146d764..5d8b4204b 100644 --- a/src/citra_qt/main.cpp +++ b/src/citra_qt/main.cpp @@ -1,4 +1,4 @@ -// Copyright 2024 Lime Emulator Project +// Copyright 2014 Citra Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. @@ -233,7 +233,7 @@ GMainWindow::GMainWindow(Core::System& system_) ConnectMenuEvents(); ConnectWidgetEvents(); - LOG_INFO(Frontend, "Lime Version: {} | {}-{}", Common::g_build_fullname, Common::g_scm_branch, + LOG_INFO(Frontend, "Citra Version: {} | {}-{}", Common::g_build_fullname, Common::g_scm_branch, Common::g_scm_desc); #if CITRA_ARCH(x86_64) const auto& caps = Common::GetCPUCaps(); @@ -275,7 +275,7 @@ GMainWindow::GMainWindow(Core::System& system_) #if defined(_WIN32) if (gl_renderer.startsWith(QStringLiteral("D3D12"))) { // OpenGLOn12 supports but does not yet advertise OpenGL 4.0+ - // We can override the version here to allow Lime to work. + // We can override the version here to allow Citra to work. // TODO: Remove this when OpenGL 4.0+ is advertised. qputenv("MESA_GL_VERSION_OVERRIDE", "4.6"); } @@ -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 Lime")); + link_action_shortcut(ui->action_Exit, QStringLiteral("Exit Citra")); 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")); @@ -1109,10 +1109,10 @@ static std::optional HoldWakeLockLinux(u32 window_id = 0) { return {}; } QVariantMap options = {}; - //: TRANSLATORS: This string is shown to the user to explain why Lime needs to prevent the + //: TRANSLATORS: This string is shown to the user to explain why Citra needs to prevent the //: computer from sleeping options.insert(QString::fromLatin1("reason"), - QCoreApplication::translate("GMainWindow", "Lime is running a game")); + QCoreApplication::translate("GMainWindow", "Citra is running a game")); // 0x4: Suspend lock; 0x8: Idle lock QDBusReply reply = xdp.call(QString::fromLatin1("Inhibit"), @@ -1225,7 +1225,7 @@ bool GMainWindow::LoadROM(const QString& filename) { case Core::System::ResultStatus::ErrorLoader_ErrorGbaTitle: QMessageBox::critical(this, tr("Unsupported ROM"), - tr("GBA Virtual Console ROMs are not supported by Lime.")); + tr("GBA Virtual Console ROMs are not supported by Citra.")); break; default: @@ -1261,7 +1261,7 @@ void GMainWindow::BootGame(const QString& filename) { return; } - LOG_INFO(Frontend, "Lime starting..."); + LOG_INFO(Frontend, "Citra 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("Lime"), + this, tr("Citra"), 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 Lime. A real 3DS is required.") + "before being used with Citra. 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("Lime"), tr("Failed to uninstall '%1'.").arg(failed_name)); + QMessageBox::critical(this, tr("Citra"), tr("Failed to uninstall '%1'.").arg(failed_name)); } else if (!future_watcher.isCanceled()) { - QMessageBox::information(this, tr("Lime"), + QMessageBox::information(this, tr("Citra"), tr("Successfully uninstalled '%1'.").arg(first_name)); } } @@ -1991,8 +1991,8 @@ void GMainWindow::OnMenuReportCompatibility() { CompatDB compatdb{system.TelemetrySession(), this}; compatdb.exec(); } else { - QMessageBox::critical(this, tr("Missing Lime Account"), - tr("You must link your Lime account to submit test cases." + QMessageBox::critical(this, tr("Missing Citra Account"), + tr("You must link your Citra account to submit test cases." "
Go to Emulation > Configure... > Web to do so.")); } } @@ -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 Lime, press Open and select your FFmpeg directory." + "\n\nTo install FFmpeg to Citra, 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("Lime"), + QMessageBox::critical(this, tr("Citra"), 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("Lime"), tr("FFmpeg has been sucessfully installed.")); + QMessageBox::information(this, tr("Citra"), tr("FFmpeg has been sucessfully installed.")); } else { - QMessageBox::critical(this, tr("Lime"), + QMessageBox::critical(this, tr("Citra"), 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("Lime"), + this, tr("Citra"), 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("Lime"), tr("Would you like to exit now?"), + QMessageBox::question(this, tr("Citra"), 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("Lime"), tr("The game is still running. Would you like to stop emulation?"), + this, tr("Citra"), 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("Lime %1").arg(full_name)); + setWindowTitle(QStringLiteral("Citra %1").arg(full_name)); } else { - setWindowTitle(QStringLiteral("Lime %1 | %2").arg(full_name, game_title)); + setWindowTitle(QStringLiteral("Citra %1 | %2").arg(full_name, game_title)); render_window->setWindowTitle( - QStringLiteral("Lime %1 | %2 | %3").arg(full_name, game_title, tr("Primary Window"))); - secondary_window->setWindowTitle(QStringLiteral("Lime %1 | %2 | %3") + QStringLiteral("Citra %1 | %2 | %3").arg(full_name, game_title, tr("Primary Window"))); + secondary_window->setWindowTitle(QStringLiteral("Citra %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("Lime team")); - QCoreApplication::setApplicationName(QStringLiteral("Lime")); + QCoreApplication::setOrganizationName(QStringLiteral("Citra team")); + QCoreApplication::setApplicationName(QStringLiteral("Citra")); auto rounding_policy = GetHighDpiRoundingPolicy(); QApplication::setHighDpiScaleFactorRoundingPolicy(rounding_policy); diff --git a/src/citra_qt/main.ui b/src/citra_qt/main.ui index d99a9a814..557322750 100644 --- a/src/citra_qt/main.ui +++ b/src/citra_qt/main.ui @@ -11,11 +11,11 @@
- Lime + Citra - dist/lime.pngdist/lime.png + dist/citra.pngdist/citra.png QTabWidget::Rounded @@ -301,7 +301,7 @@ - About Lime + About Citra QAction::AboutRole @@ -475,10 +475,10 @@ - Modify Lime Install + Modify Citra Install - Opens the maintenance tool to modify your Lime installation + Opens the maintenance tool to modify your Citra installation @@ -587,7 +587,7 @@ - Open Lime Folder + Open Citra Folder diff --git a/src/citra_qt/movie/movie_play_dialog.cpp b/src/citra_qt/movie/movie_play_dialog.cpp index 2ec038c70..6df973af5 100644 --- a/src/citra_qt/movie/movie_play_dialog.cpp +++ b/src/citra_qt/movie/movie_play_dialog.cpp @@ -1,4 +1,4 @@ -// Copyright 2024 Lime Emulator Project +// Copyright 2020 Citra Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. @@ -51,7 +51,7 @@ QString MoviePlayDialog::GetGamePath() const { void MoviePlayDialog::OnToolButtonClicked() { const QString path = QFileDialog::getOpenFileName(this, tr("Play Movie"), UISettings::values.movie_playback_path, - tr("Lime TAS Movie (*.ctm)")); + tr("Citra TAS Movie (*.ctm)")); if (path.isEmpty()) { return; } diff --git a/src/citra_qt/movie/movie_record_dialog.cpp b/src/citra_qt/movie/movie_record_dialog.cpp index 49f17fbc5..b68914535 100644 --- a/src/citra_qt/movie/movie_record_dialog.cpp +++ b/src/citra_qt/movie/movie_record_dialog.cpp @@ -1,4 +1,4 @@ -// Copyright 2024 Lime Emulator Project +// Copyright 2020 Citra Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. @@ -47,7 +47,7 @@ QString MovieRecordDialog::GetAuthor() const { void MovieRecordDialog::OnToolButtonClicked() { const QString path = QFileDialog::getSaveFileName(this, tr("Record Movie"), UISettings::values.movie_record_path, - tr("Lime TAS Movie (*.ctm)")); + tr("Citra TAS Movie (*.ctm)")); if (path.isEmpty()) { return; } diff --git a/src/citra_qt/multiplayer/direct_connect.cpp b/src/citra_qt/multiplayer/direct_connect.cpp index 7874db239..bdc866a75 100644 --- a/src/citra_qt/multiplayer/direct_connect.cpp +++ b/src/citra_qt/multiplayer/direct_connect.cpp @@ -1,4 +1,4 @@ -// Copyright 2024 Lime Emulator Project +// Copyright 2017 Citra Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. @@ -33,7 +33,7 @@ DirectConnectWindow::DirectConnectWindow(Core::System& system_, QWidget* parent) ui->nickname->setValidator(validation.GetNickname()); ui->nickname->setText(UISettings::values.nickname); if (ui->nickname->text().isEmpty() && !NetSettings::values.citra_username.empty()) { - // Use Lime Web Service user name as nickname by default + // Use Citra Web Service user name as nickname by default ui->nickname->setText(QString::fromStdString(NetSettings::values.citra_username)); } ui->ip->setValidator(validation.GetIP()); diff --git a/src/citra_qt/multiplayer/host_room.cpp b/src/citra_qt/multiplayer/host_room.cpp index 7a748f072..8a1ca02e2 100644 --- a/src/citra_qt/multiplayer/host_room.cpp +++ b/src/citra_qt/multiplayer/host_room.cpp @@ -1,4 +1,4 @@ -// Copyright 2024 Lime Emulator Project +// Copyright 2017 Citra Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. @@ -53,7 +53,7 @@ HostRoomWindow::HostRoomWindow(Core::System& system_, QWidget* parent, QStandard // Restore the settings: ui->username->setText(UISettings::values.room_nickname); if (ui->username->text().isEmpty() && !NetSettings::values.citra_username.empty()) { - // Use Lime Web Service user name as nickname by default + // Use Citra Web Service user name as nickname by default ui->username->setText(QString::fromStdString(NetSettings::values.citra_username)); } ui->room_name->setText(UISettings::values.room_name); @@ -163,7 +163,7 @@ void HostRoomWindow::Host() { QMessageBox::warning( this, tr("Error"), tr("Failed to announce the room to the public lobby. In order to host a " - "room publicly, you must have a valid Lime account configured in " + "room publicly, you must have a valid Citra account configured in " "Emulation -> Configure -> Web. If you do not want to publish a room in " "the public lobby, then select Unlisted instead.\nDebug Message: ") + QString::fromStdString(result.result_string), diff --git a/src/citra_qt/multiplayer/lobby.cpp b/src/citra_qt/multiplayer/lobby.cpp index 5a29f27f4..00671b842 100644 --- a/src/citra_qt/multiplayer/lobby.cpp +++ b/src/citra_qt/multiplayer/lobby.cpp @@ -1,4 +1,4 @@ -// Copyright 2024 Lime Emulator Project +// Copyright 2017 Citra Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. @@ -57,7 +57,7 @@ Lobby::Lobby(Core::System& system_, QWidget* parent, QStandardItemModel* list, ui->nickname->setValidator(validation.GetNickname()); ui->nickname->setText(UISettings::values.nickname); if (ui->nickname->text().isEmpty() && !NetSettings::values.citra_username.empty()) { - // Use Lime Web Service user name as nickname by default + // Use Citra Web Service user name as nickname by default ui->nickname->setText(QString::fromStdString(NetSettings::values.citra_username)); } diff --git a/src/citra_qt/multiplayer/message.cpp b/src/citra_qt/multiplayer/message.cpp index ac3ef1507..beb45bbe0 100644 --- a/src/citra_qt/multiplayer/message.cpp +++ b/src/citra_qt/multiplayer/message.cpp @@ -1,4 +1,4 @@ -// Copyright 2024 Lime Emulator Project +// Copyright 2017 Citra Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. @@ -30,12 +30,12 @@ const ConnectionError ErrorManager::UNABLE_TO_CONNECT( const ConnectionError ErrorManager::ROOM_IS_FULL( QT_TR_NOOP("Unable to connect to the room because it is already full.")); const ConnectionError ErrorManager::COULD_NOT_CREATE_ROOM( - QT_TR_NOOP("Creating a room failed. Please retry. Restarting Lime might be necessary.")); + QT_TR_NOOP("Creating a room failed. Please retry. Restarting Citra might be necessary.")); const ConnectionError ErrorManager::HOST_BANNED( QT_TR_NOOP("The host of the room has banned you. Speak with the host to unban you " "or try a different room.")); const ConnectionError ErrorManager::WRONG_VERSION( - QT_TR_NOOP("Version mismatch! Please update to the latest version of Lime. If the problem " + QT_TR_NOOP("Version mismatch! Please update to the latest version of Citra. If the problem " "persists, contact the room host and ask them to update the server.")); const ConnectionError ErrorManager::WRONG_PASSWORD(QT_TR_NOOP("Incorrect password.")); const ConnectionError ErrorManager::GENERIC_ERROR(QT_TR_NOOP( diff --git a/src/citra_qt/qt_image_interface.cpp b/src/citra_qt/qt_image_interface.cpp index 45812d6a9..7124f023f 100644 --- a/src/citra_qt/qt_image_interface.cpp +++ b/src/citra_qt/qt_image_interface.cpp @@ -1,4 +1,4 @@ -// Copyright 2024 Lime Emulator Project +// Copyright 2019 Citra Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. diff --git a/src/citra_qt/uisettings.cpp b/src/citra_qt/uisettings.cpp index a40851d43..44ea165cd 100644 --- a/src/citra_qt/uisettings.cpp +++ b/src/citra_qt/uisettings.cpp @@ -1,4 +1,4 @@ -// Copyright 2024 Lime Emulator Project +// Copyright 2016 Citra Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included.