sneedmca/Lime3DS
1
0
Fork 0
mirror of https://github.com/Lime3DS/Lime3DS synced 2024-12-25 08:32:48 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update about and configuration

Browse source
This commit is contained in:
Angelo Trotta 2024-03-07 12:11:44 +01:00
parent ecb87468a9
commit db7533ef26
33 changed files with 52 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/citra/citra.cpp
View file

@ -1,4 +1,4 @@
// Copyright 2014 Citra Emulator Project
// Copyright 2024 Lime Emulator Project
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.

2
src/citra/config.cpp
View file

@ -1,4 +1,4 @@
// Copyright 2014 Citra Emulator Project
// Copyright 2024 Citra Emulator Project
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.

2
src/citra/emu_window/emu_window_sdl2.cpp
View file

@ -1,4 +1,4 @@
// Copyright 2016 Citra Emulator Project
// Copyright 2024 Lime Emulator Project
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.

2
src/citra/emu_window/emu_window_sdl2_gl.cpp
View file

@ -1,4 +1,4 @@
// Copyright 2023 Citra Emulator Project
// Copyright 2024 Lime Emulator Project
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.

2
src/citra/emu_window/emu_window_sdl2_sw.cpp
View file

@ -1,4 +1,4 @@
// Copyright 2023 Citra Emulator Project
// Copyright 2024 Lime Emulator Project
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.

2
src/citra/emu_window/emu_window_sdl2_vk.cpp
View file

@ -1,4 +1,4 @@
// Copyright 2023 Citra Emulator Project
// Copyright 2024 Lime Emulator Project
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.

6
src/citra_qt/aboutdialog.ui
View file

@ -57,7 +57,7 @@
</sizepolicy>
</property>
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:28pt;&quot;&gt;Citra&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:28pt;&quot;&gt;Lime&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
@ -87,7 +87,7 @@
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:12pt;&quot;&gt;Citra is a free and open source 3DS emulator licensed under GPLv2.0 or any later version.&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:12pt;&quot;&gt;Lime is a free and open source 3DS emulator licensed under GPLv2.0 or any later version.&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot;-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;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:12pt;&quot;&gt;This software should not be used to play games you have not legally obtained.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
@ -115,7 +115,7 @@ p, li { white-space: pre-wrap; }
<item>
<widget class="QLabel" name="labelLinks">
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;https://citra-emu.org/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#039be5;&quot;&gt;Website&lt;/span&gt;&lt;/a&gt; | &lt;a href=&quot;https://community.citra-emu.org/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#039be5;&quot;&gt;Forum&lt;/span&gt;&lt;/a&gt; | &lt;a href=&quot;https://github.com/citra-emu&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#039be5;&quot;&gt;Source Code&lt;/span&gt;&lt;/a&gt; | &lt;a href=&quot;https://github.com/citra-emu/citra/graphs/contributors&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#039be5;&quot;&gt;Contributors&lt;/span&gt;&lt;/a&gt; | &lt;a href=&quot;https://github.com/citra-emu/citra/blob/master/license.txt&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#039be5;&quot;&gt;License&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;https://citra-emu.org/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#039be5;&quot;&gt;Website&lt;/span&gt;&lt;/a&gt; | &lt;a href=&quot;https://community.citra-emu.org/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#039be5;&quot;&gt;Forum&lt;/span&gt;&lt;/a&gt; | &lt;a href=&quot;https://github.com/RyzenDew/Lime-3DS-Emulator&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#039be5;&quot;&gt;Source Code&lt;/span&gt;&lt;/a&gt; | &lt;a href=&quot;https://github.com/RyzenDew/Lime-3DS-Emulator/graphs/contributors&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#039be5;&quot;&gt;Contributors&lt;/span&gt;&lt;/a&gt; | &lt;a href=&quot;https://github.com/RyzenDew/Lime-3DS-Emulator/blob/master/license.txt&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#039be5;&quot;&gt;License&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="openExternalLinks">
<bool>true</bool>

4
src/citra_qt/configuration/config.cpp
View file

@ -1,4 +1,4 @@
// Copyright 2014 Citra Emulator Project
// Copyright 2024 Lime 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 Citra"), QStringLiteral("Main Window"), {QStringLiteral("Ctrl+Q"), Qt::WindowShortcut}},
{QStringLiteral("Exit Lime"), 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}},

2
src/citra_qt/configuration/configure_audio.cpp
View file

@ -1,4 +1,4 @@
// Copyright 2016 Citra Emulator Project
// Copyright 2024 Lime Emulator Project
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.

2
src/citra_qt/configuration/configure_camera.cpp
View file

@ -1,4 +1,4 @@
// Copyright 2018 Citra Emulator Project
// Copyright 2024 Lime Emulator Project
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.

2
src/citra_qt/configuration/configure_cheats.cpp
View file

@ -1,4 +1,4 @@
// Copyright 2018 Citra Emulator Project
// Copyright 2024 Lime Emulator Project
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.

2
src/citra_qt/configuration/configure_debug.cpp
View file

@ -1,4 +1,4 @@
// Copyright 2016 Citra Emulator Project
// Copyright 2024 Lime Emulator Project
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.

2
src/citra_qt/configuration/configure_dialog.cpp
View file

@ -1,4 +1,4 @@
// Copyright 2016 Citra Emulator Project
// Copyright 2024 Lime Emulator Project
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.

2
src/citra_qt/configuration/configure_enhancements.cpp
View file

@ -1,4 +1,4 @@
// Copyright 2019 Citra Emulator Project
// Copyright 2024 Lime Emulator Project
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.

6
src/citra_qt/configuration/configure_general.cpp
View file

@ -1,4 +1,4 @@
// Copyright 2016 Citra Emulator Project
// Copyright 2024 Lime 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("Citra"),
tr("Are you sure you want to <b>reset your settings</b> and close Citra?"),
this, tr("Lime"),
tr("Are you sure you want to <b>reset your settings</b> and close Lime?"),
QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
if (answer == QMessageBox::No) {

2
src/citra_qt/configuration/configure_graphics.cpp
View file

@ -1,4 +1,4 @@
// Copyright 2016 Citra Emulator Project
// Copyright 2024 Lime Emulator Project
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.

2
src/citra_qt/configuration/configure_hotkeys.cpp
View file

@ -1,4 +1,4 @@
// Copyright 2017 Citra Emulator Project
// Copyright 2024 Lime Emulator Project
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.

2
src/citra_qt/configuration/configure_input.cpp
View file

@ -1,4 +1,4 @@
// Copyright 2016 Citra Emulator Project
// Copyright 2024 Lime Emulator Project
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.

4
src/citra_qt/configuration/configure_motion_touch.cpp
View file

@ -1,4 +1,4 @@
// Copyright 2018 Citra Emulator Project
// Copyright 2024 Lime 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("Citra"),
QMessageBox::warning(this, tr("Lime"),
tr("UDP Test or calibration configuration is in progress.<br>Please "
"wait for them to finish."));
return false;

2
src/citra_qt/configuration/configure_per_game.cpp
View file

@ -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("Citra"), tr("Are you sure you want to <b>reset your settings for this game</b>?"),
this, tr("Lime"), 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) {

2
src/citra_qt/configuration/configure_storage.cpp
View file

@ -1,4 +1,4 @@
// Copyright 2021 Citra Emulator Project
// Copyright 2024 Lime Emulator Project
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.

8
src/citra_qt/configuration/configure_system.cpp
View file

@ -1,4 +1,4 @@
// Copyright 2016 Citra Emulator Project
// Copyright 2024 Lime 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("Citra is missing keys to download system files. <br><a "
tr("Lime is missing keys to download system files. <br><a "
"href='https://citra-emu.org/wiki/aes-keys/'><span style=\"text-decoration: "
"underline; color:#039be5;\">How to get keys?</span></a>"));
}
@ -611,9 +611,9 @@ void ConfigureSystem::DownloadFromNUS() {
future_watcher.waitForFinished();
if (failed) {
QMessageBox::critical(this, tr("Citra"), tr("Downloading system files failed."));
QMessageBox::critical(this, tr("Lime"), tr("Downloading system files failed."));
} else if (!future_watcher.isCanceled()) {
QMessageBox::information(this, tr("Citra"), tr("Successfully downloaded system files."));
QMessageBox::information(this, tr("Lime"), tr("Successfully downloaded system files."));
}
ui->button_start_download->setEnabled(true);

2
src/citra_qt/configuration/configure_touch_from_button.cpp
View file

@ -1,4 +1,4 @@
// Copyright 2020 Citra Emulator Project
// Copyright 2024 Lime Emulator Project
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.

2
src/citra_qt/configuration/configure_ui.cpp
View file

@ -1,4 +1,4 @@
// Copyright 2018 Citra Emulator Project
// Copyright 2024 Lime Emulator Project
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.

2
src/citra_qt/configuration/configure_web.cpp
View file

@ -1,4 +1,4 @@
// Copyright 2017 Citra Emulator Project
// Copyright 2024 Lime Emulator Project
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.

6
src/citra_qt/configuration/configure_web.ui
View file

@ -19,13 +19,13 @@
<item>
<widget class="QGroupBox" name="groupBoxWebConfig">
<property name="title">
<string>Citra Web Service</string>
<string>Lime Web Service</string>
</property>
<layout class="QVBoxLayout" name="verticalLayoutCitraWebService">
<item>
<widget class="QLabel" name="web_credentials_disclaimer">
<property name="text">
<string>By providing your username and token, you agree to allow Citra to collect additional usage data, which may include user identifying information.</string>
<string>By providing your username and token, you agree to allow Lime to collect additional usage data, which may include user identifying information.</string>
</property>
</widget>
</item>
@ -128,7 +128,7 @@
<item>
<widget class="QCheckBox" name="toggle_telemetry">
<property name="text">
<string>Share anonymous usage data with the Citra team</string>
<string>Share anonymous usage data with the Lime team</string>
</property>
</widget>
</item>

2
src/citra_qt/main.cpp
View file

@ -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 Litra. A real 3DS is required.")
"before being used with Lime. A real 3DS is required.")
.arg(filename));
break;
case Service::AM::InstallStatus::ErrorFileNotFound:

4
src/citra_qt/movie/movie_play_dialog.cpp
View file

@ -1,4 +1,4 @@
// Copyright 2020 Citra Emulator Project
// Copyright 2024 Lime 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("Citra TAS Movie (*.ctm)"));
tr("Lime TAS Movie (*.ctm)"));
if (path.isEmpty()) {
return;
}

4
src/citra_qt/movie/movie_record_dialog.cpp
View file

@ -1,4 +1,4 @@
// Copyright 2020 Citra Emulator Project
// Copyright 2024 Lime 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("Citra TAS Movie (*.ctm)"));
tr("Lime TAS Movie (*.ctm)"));
if (path.isEmpty()) {
return;
}

4
src/citra_qt/multiplayer/direct_connect.cpp
View file

@ -1,4 +1,4 @@
// Copyright 2017 Citra Emulator Project
// Copyright 2024 Lime 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 Citra Web Service user name as nickname by default
// Use Lime Web Service user name as nickname by default
ui->nickname->setText(QString::fromStdString(NetSettings::values.citra_username));
}
ui->ip->setValidator(validation.GetIP());

6
src/citra_qt/multiplayer/host_room.cpp
View file

@ -1,4 +1,4 @@
// Copyright 2017 Citra Emulator Project
// Copyright 2024 Lime 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 Citra Web Service user name as nickname by default
// Use Lime 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 Citra account configured in "
"room publicly, you must have a valid Lime 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),

4
src/citra_qt/multiplayer/lobby.cpp
View file

@ -1,4 +1,4 @@
// Copyright 2017 Citra Emulator Project
// Copyright 2024 Lime 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 Citra Web Service user name as nickname by default
// Use Lime Web Service user name as nickname by default
ui->nickname->setText(QString::fromStdString(NetSettings::values.citra_username));
}

6
src/citra_qt/multiplayer/message.cpp
View file

@ -1,4 +1,4 @@
// Copyright 2017 Citra Emulator Project
// Copyright 2024 Lime 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 Citra might be necessary."));
QT_TR_NOOP("Creating a room failed. Please retry. Restarting Lime 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 Citra. If the problem "
QT_TR_NOOP("Version mismatch! Please update to the latest version of Lime. 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(