mirror of
https://github.com/Lime3DS/Lime3DS.git
synced 2024-11-10 20:25:06 +01:00
Merge pull request #2 from RyzenDew/revert-1-master
Revert "Update icons and strings"
This commit is contained in:
RyzenDew
GitHub
commit
1ca2a4cbbe
13
README.md
13
README.md
@ -6,20 +6,21 @@
|
||||
<br>
|
||||
</h1>
|
||||
|
||||
Emulation never dies! It changes and moves forward!
|
||||
Emulation never dies! it changes and moves forward!
|
||||
|
||||
<h4 align="left"><b>Lime</b> is a successor to the world's most popular, open-source, Nintendo 3DS emulator.
|
||||
<h4 align="left"><b>Lime</b> is the world's most popular, open-source, Nintendo 3DS emulator.
|
||||
<br>
|
||||
It is written in C++ with portability in mind and builds are actively maintained for Windows, Linux, Android and macOS.
|
||||
</h4>
|
||||
|
||||
## 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.
|
||||
|
||||
4
dist/lime-qt.desktop → dist/citra-qt.desktop
vendored
Executable file → Normal file
4
dist/lime-qt.desktop → dist/citra-qt.desktop
vendored
Executable file → Normal file
@ -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;
|
||||
@ -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;
|
||||
6
dist/lime.desktop → dist/citra.desktop
vendored
6
dist/lime.desktop → dist/citra.desktop
vendored
@ -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
|
||||
BIN
dist/citra.ico
vendored
Normal file
BIN
dist/citra.ico
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 361 KiB |
2
dist/citra.svg
vendored
Normal file
2
dist/citra.svg
vendored
Normal file
File diff suppressed because one or more lines are too long
|
After Width: | Height: | Size: 17 KiB |
BIN
dist/doc-icon.png
vendored
BIN
dist/doc-icon.png
vendored
Binary file not shown.
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 7.6 KiB |
BIN
dist/icon.png
vendored
BIN
dist/icon.png
vendored
Binary file not shown.
|
Before Width: | Height: | Size: 159 KiB After Width: | Height: | Size: 18 KiB |
BIN
dist/lime.ico
vendored
BIN
dist/lime.ico
vendored
Binary file not shown.
|
Before Width: | Height: | Size: 157 KiB |
9329
dist/lime.svg
vendored
9329
dist/lime.svg
vendored
File diff suppressed because it is too large
Load Diff
|
Before Width: | Height: | Size: 702 KiB |
2
dist/qt_themes/default/default.qrc
vendored
2
dist/qt_themes/default/default.qrc
vendored
@ -13,7 +13,7 @@
|
||||
<file alias="48x48/no_avatar.png">icons/48x48/no_avatar.png</file>
|
||||
<file alias="48x48/plus.png">icons/48x48/plus.png</file>
|
||||
<file alias="48x48/sd_card.png">icons/48x48/sd_card.png</file>
|
||||
<file alias="256x256/citra.png">icons/256x256/lime.png</file>
|
||||
<file alias="256x256/citra.png">icons/256x256/citra.png</file>
|
||||
<file alias="256x256/plus_folder.png">icons/256x256/plus_folder.png</file>
|
||||
</qresource>
|
||||
<qresource prefix="default">
|
||||
|
||||
BIN
dist/qt_themes/default/icons/256x256/citra.png
vendored
Normal file
BIN
dist/qt_themes/default/icons/256x256/citra.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 26 KiB |
BIN
dist/qt_themes/default/icons/256x256/lime.png
vendored
BIN
dist/qt_themes/default/icons/256x256/lime.png
vendored
Binary file not shown.
|
Before Width: | Height: | Size: 72 KiB |
93
externals/libusb/config.h
vendored
93
externals/libusb/config.h
vendored
@ -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 <asm/types.h> 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 <linux/filter.h> header file. */
|
||||
#define HAVE_LINUX_FILTER_H 1
|
||||
|
||||
/* Define to 1 if you have the <linux/netlink.h> 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 <signal.h> header file. */
|
||||
#define HAVE_SIGNAL_H 1
|
||||
|
||||
/* Define to 1 if you have the <strings.h> 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 <syslog.h> header file. */
|
||||
#define HAVE_SYSLOG_H 1
|
||||
|
||||
/* Define to 1 if you have the <sys/socket.h> header file. */
|
||||
#define HAVE_SYS_SOCKET_H 1
|
||||
|
||||
/* Define to 1 if you have the <sys/time.h> header file. */
|
||||
#define HAVE_SYS_TIME_H 1
|
||||
|
||||
/* Define to 1 if you have the <sys/types.h> 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
|
||||
@ -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.
|
||||
|
||||
|
||||
@ -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"
|
||||
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
@ -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.
|
||||
|
||||
|
||||
@ -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.
|
||||
|
||||
|
||||
@ -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.
|
||||
|
||||
|
||||
@ -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.
|
||||
|
||||
|
||||
@ -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.
|
||||
|
||||
|
||||
@ -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::AboutDialog>()) {
|
||||
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)));
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>About Lime</string>
|
||||
<string>About Citra</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_3">
|
||||
<item>
|
||||
@ -27,7 +27,7 @@
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string><html><head/><body><p><img src=":/icons/lime.png"/></p></body></html></string>
|
||||
<string><html><head/><body><p><img src=":/icons/citra.png"/></p></body></html></string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
@ -57,7 +57,7 @@
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string><html><head/><body><p><span style=" font-size:28pt;">Lime</span></p></body></html></string>
|
||||
<string><html><head/><body><p><span style=" font-size:28pt;">Citra</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;">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></string>
|
||||
</property>
|
||||
@ -115,7 +115,7 @@ p, li { white-space: pre-wrap; }
|
||||
<item>
|
||||
<widget class="QLabel" name="labelLinks">
|
||||
<property name="text">
|
||||
<string><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></string>
|
||||
<string><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></string>
|
||||
</property>
|
||||
<property name="openExternalLinks">
|
||||
<bool>true</bool>
|
||||
@ -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. Lime 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. Citra is not affiliated with Nintendo in any way.</span></p></body></html></string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
||||
@ -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.
|
||||
|
||||
|
||||
@ -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"
|
||||
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
@ -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 @@
|
||||
<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;">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></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;">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>
|
||||
</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 Lime?</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 Citra?</p></body></html></string>
|
||||
</property>
|
||||
<property name="wordWrap">
|
||||
<bool>true</bool>
|
||||
|
||||
@ -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<UISettings::Shortcut, 35> 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}},
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
<class>ConfigureDialog</class>
|
||||
<widget class="QDialog" name="ConfigureDialog">
|
||||
<property name="windowTitle">
|
||||
<string>Lime Configuration</string>
|
||||
<string>Citra Configuration</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout">
|
||||
<item>
|
||||
|
||||
@ -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.
|
||||
|
||||
|
||||
@ -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.
|
||||
|
||||
|
||||
@ -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.
|
||||
|
||||
|
||||
@ -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.
|
||||
|
||||
|
||||
@ -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.
|
||||
|
||||
|
||||
@ -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.
|
||||
|
||||
|
||||
@ -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 <b>reset your settings</b> and close Lime?"),
|
||||
this, tr("Citra"),
|
||||
tr("Are you sure you want to <b>reset your settings</b> and close Citra?"),
|
||||
QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
|
||||
|
||||
if (answer == QMessageBox::No) {
|
||||
|
||||
@ -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.
|
||||
|
||||
|
||||
@ -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.
|
||||
|
||||
|
||||
@ -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.
|
||||
|
||||
|
||||
@ -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.<br>Please "
|
||||
"wait for them to finish."));
|
||||
return false;
|
||||
|
||||
@ -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 <b>reset your settings for this game</b>?"),
|
||||
this, tr("Citra"), tr("Are you sure you want to <b>reset your settings for this game</b>?"),
|
||||
QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
|
||||
|
||||
if (answer == QMessageBox::No) {
|
||||
|
||||
@ -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.
|
||||
|
||||
|
||||
@ -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. <br><a "
|
||||
tr("Citra 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("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);
|
||||
|
||||
@ -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.
|
||||
|
||||
|
||||
@ -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.
|
||||
|
||||
|
||||
@ -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.
|
||||
|
||||
|
||||
@ -19,13 +19,13 @@
|
||||
<item>
|
||||
<widget class="QGroupBox" name="groupBoxWebConfig">
|
||||
<property name="title">
|
||||
<string>Lime Web Service</string>
|
||||
<string>Citra 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 Lime to collect additional usage data, which may include user identifying information.</string>
|
||||
<string>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 Lime team</string>
|
||||
<string>Share anonymous usage data with the Citra team</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
||||
@ -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";
|
||||
|
||||
@ -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<std::tuple<Service::FS::MediaType, u64, QString>> 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<std::tuple<Service::FS::MediaType, u64, QString>> titles;
|
||||
|
||||
@ -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.
|
||||
|
||||
|
||||
@ -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.
|
||||
|
||||
|
||||
@ -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<QDBusObjectPath> 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<QDBusObjectPath> 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."
|
||||
"<br/>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.<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("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);
|
||||
|
||||
@ -11,11 +11,11 @@
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>Lime</string>
|
||||
<string>Citra</string>
|
||||
</property>
|
||||
<property name="windowIcon">
|
||||
<iconset>
|
||||
<normaloff>dist/lime.png</normaloff>dist/lime.png</iconset>
|
||||
<normaloff>dist/citra.png</normaloff>dist/citra.png</iconset>
|
||||
</property>
|
||||
<property name="tabShape">
|
||||
<enum>QTabWidget::Rounded</enum>
|
||||
@ -301,7 +301,7 @@
|
||||
</action>
|
||||
<action name="action_About">
|
||||
<property name="text">
|
||||
<string>About Lime</string>
|
||||
<string>About Citra</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 Lime Install</string>
|
||||
<string>Modify Citra Install</string>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Opens the maintenance tool to modify your Lime installation</string>
|
||||
<string>Opens the maintenance tool to modify your Citra 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 Lime Folder</string>
|
||||
<string>Open Citra Folder</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="action_Configure_Current_Game">
|
||||
|
||||
@ -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;
|
||||
}
|
||||
|
||||
@ -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;
|
||||
}
|
||||
|
||||
@ -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());
|
||||
|
||||
@ -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),
|
||||
|
||||
@ -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));
|
||||
}
|
||||
|
||||
|
||||
@ -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(
|
||||
|
||||
@ -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.
|
||||
|
||||
|
||||
@ -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.
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user