qt: Updated some user-facing strings to refer to eden
This commit is contained in:
parent
0c4d8a8b08
commit
efb94f76d0
15 changed files with 72 additions and 56 deletions
2
dist/languages/fi.ts
vendored
2
dist/languages/fi.ts
vendored
|
@ -3879,7 +3879,7 @@ Drag points to change position, or double-click table cells to edit values.</sou
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../src/yuzu/main.cpp" line="1225"/>
|
<location filename="../../src/yuzu/main.cpp" line="1225"/>
|
||||||
<source>yuzu is running a game</source>
|
<source>eden is running a game</source>
|
||||||
<extracomment>TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping</extracomment>
|
<extracomment>TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping</extracomment>
|
||||||
<translation type="unfinished"/>
|
<translation type="unfinished"/>
|
||||||
</message>
|
</message>
|
||||||
|
|
|
@ -642,7 +642,7 @@ void Java_org_yuzu_yuzu_1emu_NativeLibrary_run(JNIEnv* env, jobject jobj, jstrin
|
||||||
}
|
}
|
||||||
|
|
||||||
void Java_org_yuzu_yuzu_1emu_NativeLibrary_logDeviceInfo(JNIEnv* env, jclass clazz) {
|
void Java_org_yuzu_yuzu_1emu_NativeLibrary_logDeviceInfo(JNIEnv* env, jclass clazz) {
|
||||||
LOG_INFO(Frontend, "yuzu Version: {}-{}", Common::g_scm_branch, Common::g_scm_desc);
|
LOG_INFO(Frontend, "eden Version: {}-{}", Common::g_scm_branch, Common::g_scm_desc);
|
||||||
LOG_INFO(Frontend, "Host OS: Android API level {}", android_get_device_api_level());
|
LOG_INFO(Frontend, "Host OS: Android API level {}", android_get_device_api_level());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -13,7 +13,7 @@ AboutDialog::AboutDialog(QWidget* parent)
|
||||||
const auto description = std::string(Common::g_scm_desc);
|
const auto description = std::string(Common::g_scm_desc);
|
||||||
const auto build_id = std::string(Common::g_build_id);
|
const auto build_id = std::string(Common::g_build_id);
|
||||||
|
|
||||||
const auto yuzu_build = fmt::format("yuzu Development Build | {}-{}", branch_name, description);
|
const auto yuzu_build = fmt::format("eden Development Build | {}-{}", branch_name, description);
|
||||||
const auto override_build =
|
const auto override_build =
|
||||||
fmt::format(fmt::runtime(std::string(Common::g_title_bar_format_idle)), build_id);
|
fmt::format(fmt::runtime(std::string(Common::g_title_bar_format_idle)), build_id);
|
||||||
const auto yuzu_build_version = override_build.empty() ? yuzu_build : override_build;
|
const auto yuzu_build_version = override_build.empty() ? yuzu_build : override_build;
|
||||||
|
|
|
@ -6,12 +6,12 @@
|
||||||
<rect>
|
<rect>
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>616</width>
|
<width>701</width>
|
||||||
<height>294</height>
|
<height>385</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="windowTitle">
|
<property name="windowTitle">
|
||||||
<string>About yuzu</string>
|
<string>About eden</string>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QVBoxLayout" name="verticalLayout_3">
|
<layout class="QVBoxLayout" name="verticalLayout_3">
|
||||||
<item>
|
<item>
|
||||||
|
@ -46,7 +46,7 @@
|
||||||
<item>
|
<item>
|
||||||
<spacer name="verticalSpacer">
|
<spacer name="verticalSpacer">
|
||||||
<property name="orientation">
|
<property name="orientation">
|
||||||
<enum>Qt::Vertical</enum>
|
<enum>Qt::Orientation::Vertical</enum>
|
||||||
</property>
|
</property>
|
||||||
<property name="sizeHint" stdset="0">
|
<property name="sizeHint" stdset="0">
|
||||||
<size>
|
<size>
|
||||||
|
@ -69,7 +69,7 @@
|
||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string><html><head/><body><p><span style=" font-size:28pt;">yuzu</span></p></body></html></string>
|
<string><html><head/><body><p><span style=" font-size:28pt;">eden</span></p></body></html></string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
@ -96,15 +96,16 @@
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
|
<string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
|
||||||
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
|
<html><head><meta name="qrichtext" content="1" /><meta charset="utf-8" /><style type="text/css">
|
||||||
p, li { white-space: pre-wrap; }
|
p, li { white-space: pre-wrap; }
|
||||||
</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;">
|
hr { height: 1px; border-width: 0; }
|
||||||
<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;">yuzu is an experimental open-source emulator for the Nintendo Switch licensed under GPLv3.0+.</span></p>
|
li.unchecked::marker { content: "\2610"; }
|
||||||
<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>
|
li.checked::marker { content: "\2612"; }
|
||||||
<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>
|
</style></head><body style=" font-family:'Adwaita Sans'; 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;">eden is an experimental open-source emulator for the Nintendo Switch licensed under GPLv3.0+ which is based on the yuzu emulator which ended development back in March 2024. <br /><br />This software should not be used to play games you have not legally obtained.</span></p></body></html></string>
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
|
<set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter</set>
|
||||||
</property>
|
</property>
|
||||||
<property name="wordWrap">
|
<property name="wordWrap">
|
||||||
<bool>true</bool>
|
<bool>true</bool>
|
||||||
|
@ -114,7 +115,7 @@ p, li { white-space: pre-wrap; }
|
||||||
<item>
|
<item>
|
||||||
<spacer name="verticalSpacer_2">
|
<spacer name="verticalSpacer_2">
|
||||||
<property name="orientation">
|
<property name="orientation">
|
||||||
<enum>Qt::Vertical</enum>
|
<enum>Qt::Orientation::Vertical</enum>
|
||||||
</property>
|
</property>
|
||||||
<property name="sizeHint" stdset="0">
|
<property name="sizeHint" stdset="0">
|
||||||
<size>
|
<size>
|
||||||
|
@ -154,10 +155,10 @@ p, li { white-space: pre-wrap; }
|
||||||
<item>
|
<item>
|
||||||
<widget class="QDialogButtonBox" name="buttonBox">
|
<widget class="QDialogButtonBox" name="buttonBox">
|
||||||
<property name="orientation">
|
<property name="orientation">
|
||||||
<enum>Qt::Horizontal</enum>
|
<enum>Qt::Orientation::Horizontal</enum>
|
||||||
</property>
|
</property>
|
||||||
<property name="standardButtons">
|
<property name="standardButtons">
|
||||||
<set>QDialogButtonBox::Ok</set>
|
<set>QDialogButtonBox::StandardButton::Ok</set>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
@ -173,12 +174,32 @@ p, li { white-space: pre-wrap; }
|
||||||
<signal>accepted()</signal>
|
<signal>accepted()</signal>
|
||||||
<receiver>AboutDialog</receiver>
|
<receiver>AboutDialog</receiver>
|
||||||
<slot>accept()</slot>
|
<slot>accept()</slot>
|
||||||
|
<hints>
|
||||||
|
<hint type="sourcelabel">
|
||||||
|
<x>20</x>
|
||||||
|
<y>20</y>
|
||||||
|
</hint>
|
||||||
|
<hint type="destinationlabel">
|
||||||
|
<x>20</x>
|
||||||
|
<y>20</y>
|
||||||
|
</hint>
|
||||||
|
</hints>
|
||||||
</connection>
|
</connection>
|
||||||
<connection>
|
<connection>
|
||||||
<sender>buttonBox</sender>
|
<sender>buttonBox</sender>
|
||||||
<signal>rejected()</signal>
|
<signal>rejected()</signal>
|
||||||
<receiver>AboutDialog</receiver>
|
<receiver>AboutDialog</receiver>
|
||||||
<slot>reject()</slot>
|
<slot>reject()</slot>
|
||||||
|
<hints>
|
||||||
|
<hint type="sourcelabel">
|
||||||
|
<x>20</x>
|
||||||
|
<y>20</y>
|
||||||
|
</hint>
|
||||||
|
<hint type="destinationlabel">
|
||||||
|
<x>20</x>
|
||||||
|
<y>20</y>
|
||||||
|
</hint>
|
||||||
|
</hints>
|
||||||
</connection>
|
</connection>
|
||||||
</connections>
|
</connections>
|
||||||
</ui>
|
</ui>
|
||||||
|
|
|
@ -1034,7 +1034,7 @@ bool GRenderWindow::InitializeOpenGL() {
|
||||||
return true;
|
return true;
|
||||||
#else
|
#else
|
||||||
QMessageBox::warning(this, tr("OpenGL not available!"),
|
QMessageBox::warning(this, tr("OpenGL not available!"),
|
||||||
tr("yuzu has not been compiled with OpenGL support."));
|
tr("eden has not been compiled with OpenGL support."));
|
||||||
return false;
|
return false;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
<property name="windowTitle">
|
<property name="windowTitle">
|
||||||
<string>yuzu Configuration</string>
|
<string>eden Configuration</string>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QVBoxLayout" name="verticalLayout">
|
<layout class="QVBoxLayout" name="verticalLayout">
|
||||||
<item>
|
<item>
|
||||||
|
|
|
@ -96,7 +96,7 @@ void ConfigureGeneral::SetResetCallback(std::function<void()> callback) {
|
||||||
|
|
||||||
void ConfigureGeneral::ResetDefaults() {
|
void ConfigureGeneral::ResetDefaults() {
|
||||||
QMessageBox::StandardButton answer = QMessageBox::question(
|
QMessageBox::StandardButton answer = QMessageBox::question(
|
||||||
this, tr("yuzu"),
|
this, tr("eden"),
|
||||||
tr("This reset all settings and remove all per-game configurations. This will not delete "
|
tr("This reset all settings and remove all per-game configurations. This will not delete "
|
||||||
"game directories, profiles, or input profiles. Proceed?"),
|
"game directories, profiles, or input profiles. Proceed?"),
|
||||||
QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
|
QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
|
||||||
|
|
|
@ -170,27 +170,27 @@ void ConfigureMotionTouch::OnUDPAddServer() {
|
||||||
const int row = udp_server_list_model->rowCount();
|
const int row = udp_server_list_model->rowCount();
|
||||||
|
|
||||||
if (!ok) {
|
if (!ok) {
|
||||||
QMessageBox::warning(this, tr("yuzu"), tr("Port number has invalid characters"));
|
QMessageBox::warning(this, tr("eden"), tr("Port number has invalid characters"));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (port_number < 0 || port_number > 65353) {
|
if (port_number < 0 || port_number > 65353) {
|
||||||
QMessageBox::warning(this, tr("yuzu"), tr("Port has to be in range 0 and 65353"));
|
QMessageBox::warning(this, tr("eden"), tr("Port has to be in range 0 and 65353"));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (!re.match(server_text).hasMatch()) {
|
if (!re.match(server_text).hasMatch()) {
|
||||||
QMessageBox::warning(this, tr("yuzu"), tr("IP address is not valid"));
|
QMessageBox::warning(this, tr("eden"), tr("IP address is not valid"));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// Search for duplicates
|
// Search for duplicates
|
||||||
for (const auto& item : udp_server_list_model->stringList()) {
|
for (const auto& item : udp_server_list_model->stringList()) {
|
||||||
if (item == server_string) {
|
if (item == server_string) {
|
||||||
QMessageBox::warning(this, tr("yuzu"), tr("This UDP server already exists"));
|
QMessageBox::warning(this, tr("eden"), tr("This UDP server already exists"));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Limit server count to 8
|
// Limit server count to 8
|
||||||
if (row == 8) {
|
if (row == 8) {
|
||||||
QMessageBox::warning(this, tr("yuzu"), tr("Unable to add more than 8 servers"));
|
QMessageBox::warning(this, tr("eden"), tr("Unable to add more than 8 servers"));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -284,7 +284,7 @@ void ConfigureMotionTouch::OnConfigureTouchFromButton() {
|
||||||
|
|
||||||
bool ConfigureMotionTouch::CanCloseDialog() {
|
bool ConfigureMotionTouch::CanCloseDialog() {
|
||||||
if (udp_test_in_progress) {
|
if (udp_test_in_progress) {
|
||||||
QMessageBox::warning(this, tr("yuzu"),
|
QMessageBox::warning(this, tr("eden"),
|
||||||
tr("UDP Test or calibration configuration is in progress.<br>Please "
|
tr("UDP Test or calibration configuration is in progress.<br>Please "
|
||||||
"wait for them to finish."));
|
"wait for them to finish."));
|
||||||
return false;
|
return false;
|
||||||
|
|
|
@ -370,13 +370,13 @@ GMainWindow::GMainWindow(std::unique_ptr<QtConfig> config_, bool has_broken_vulk
|
||||||
const auto description = std::string(Common::g_scm_desc);
|
const auto description = std::string(Common::g_scm_desc);
|
||||||
const auto build_id = std::string(Common::g_build_id);
|
const auto build_id = std::string(Common::g_build_id);
|
||||||
|
|
||||||
const auto yuzu_build = fmt::format("yuzu Development Build | {}-{}", branch_name, description);
|
const auto yuzu_build = fmt::format("eden Development Build | {}-{}", branch_name, description);
|
||||||
const auto override_build =
|
const auto override_build =
|
||||||
fmt::format(fmt::runtime(std::string(Common::g_title_bar_format_idle)), build_id);
|
fmt::format(fmt::runtime(std::string(Common::g_title_bar_format_idle)), build_id);
|
||||||
const auto yuzu_build_version = override_build.empty() ? yuzu_build : override_build;
|
const auto yuzu_build_version = override_build.empty() ? yuzu_build : override_build;
|
||||||
const auto processor_count = std::thread::hardware_concurrency();
|
const auto processor_count = std::thread::hardware_concurrency();
|
||||||
|
|
||||||
LOG_INFO(Frontend, "yuzu Version: {}", yuzu_build_version);
|
LOG_INFO(Frontend, "eden Version: {}", yuzu_build_version);
|
||||||
LogRuntimes();
|
LogRuntimes();
|
||||||
#ifdef ARCHITECTURE_x86_64
|
#ifdef ARCHITECTURE_x86_64
|
||||||
const auto& caps = Common::GetCPUCaps();
|
const auto& caps = Common::GetCPUCaps();
|
||||||
|
@ -1339,7 +1339,7 @@ void GMainWindow::InitializeHotkeys() {
|
||||||
|
|
||||||
LinkActionShortcut(ui->action_Load_File, QStringLiteral("Load File"));
|
LinkActionShortcut(ui->action_Load_File, QStringLiteral("Load File"));
|
||||||
LinkActionShortcut(ui->action_Load_Amiibo, QStringLiteral("Load/Remove Amiibo"));
|
LinkActionShortcut(ui->action_Load_Amiibo, QStringLiteral("Load/Remove Amiibo"));
|
||||||
LinkActionShortcut(ui->action_Exit, QStringLiteral("Exit yuzu"));
|
LinkActionShortcut(ui->action_Exit, QStringLiteral("Exit eden"));
|
||||||
LinkActionShortcut(ui->action_Restart, QStringLiteral("Restart Emulation"));
|
LinkActionShortcut(ui->action_Restart, QStringLiteral("Restart Emulation"));
|
||||||
LinkActionShortcut(ui->action_Pause, QStringLiteral("Continue/Pause Emulation"));
|
LinkActionShortcut(ui->action_Pause, QStringLiteral("Continue/Pause Emulation"));
|
||||||
LinkActionShortcut(ui->action_Stop, QStringLiteral("Stop Emulation"));
|
LinkActionShortcut(ui->action_Stop, QStringLiteral("Stop Emulation"));
|
||||||
|
@ -1816,7 +1816,7 @@ bool GMainWindow::LoadROM(const QString& filename, Service::AM::FrontendAppletPa
|
||||||
tr("You are using the deconstructed ROM directory format for this game, which is an "
|
tr("You are using the deconstructed ROM directory format for this game, which is an "
|
||||||
"outdated format that has been superseded by others such as NCA, NAX, XCI, or "
|
"outdated format that has been superseded by others such as NCA, NAX, XCI, or "
|
||||||
"NSP. Deconstructed ROM directories lack icons, metadata, and update "
|
"NSP. Deconstructed ROM directories lack icons, metadata, and update "
|
||||||
"support.<br><br>For an explanation of the various Switch formats yuzu supports, <a "
|
"support.<br><br>For an explanation of the various Switch formats eden supports, <a "
|
||||||
"href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our "
|
"href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our "
|
||||||
"wiki</a>. This message will not be shown again."));
|
"wiki</a>. This message will not be shown again."));
|
||||||
}
|
}
|
||||||
|
@ -1831,7 +1831,7 @@ bool GMainWindow::LoadROM(const QString& filename, Service::AM::FrontendAppletPa
|
||||||
case Core::SystemResultStatus::ErrorVideoCore:
|
case Core::SystemResultStatus::ErrorVideoCore:
|
||||||
QMessageBox::critical(
|
QMessageBox::critical(
|
||||||
this, tr("An error occurred initializing the video core."),
|
this, tr("An error occurred initializing the video core."),
|
||||||
tr("yuzu has encountered an error while running the video core. "
|
tr("eden has encountered an error while running the video core. "
|
||||||
"This is usually caused by outdated GPU drivers, including integrated ones. "
|
"This is usually caused by outdated GPU drivers, including integrated ones. "
|
||||||
"Please see the log for more details. "
|
"Please see the log for more details. "
|
||||||
"For more information on accessing the log, please see the following page: "
|
"For more information on accessing the log, please see the following page: "
|
||||||
|
@ -1849,9 +1849,7 @@ bool GMainWindow::LoadROM(const QString& filename, Service::AM::FrontendAppletPa
|
||||||
tr("Error while loading ROM! %1", "%1 signifies a numeric error code.")
|
tr("Error while loading ROM! %1", "%1 signifies a numeric error code.")
|
||||||
.arg(QString::fromStdString(error_code));
|
.arg(QString::fromStdString(error_code));
|
||||||
const auto description =
|
const auto description =
|
||||||
tr("%1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the "
|
tr("%1<br>Please redump your files or ask on Discord for help.",
|
||||||
"yuzu quickstart guide</a> to redump your files.<br>You can refer "
|
|
||||||
"to the yuzu wiki</a> or the yuzu Discord</a> for help.",
|
|
||||||
"%1 signifies an error string.")
|
"%1 signifies an error string.")
|
||||||
.arg(QString::fromStdString(
|
.arg(QString::fromStdString(
|
||||||
GetResultStatusString(static_cast<Loader::ResultStatus>(error_id))));
|
GetResultStatusString(static_cast<Loader::ResultStatus>(error_id))));
|
||||||
|
@ -1926,7 +1924,7 @@ void GMainWindow::ConfigureFilesystemProvider(const std::string& filepath) {
|
||||||
|
|
||||||
void GMainWindow::BootGame(const QString& filename, Service::AM::FrontendAppletParameters params,
|
void GMainWindow::BootGame(const QString& filename, Service::AM::FrontendAppletParameters params,
|
||||||
StartGameType type) {
|
StartGameType type) {
|
||||||
LOG_INFO(Frontend, "yuzu starting...");
|
LOG_INFO(Frontend, "eden starting...");
|
||||||
|
|
||||||
if (params.program_id == 0 ||
|
if (params.program_id == 0 ||
|
||||||
params.program_id > static_cast<u64>(Service::AM::AppletProgramId::MaxProgramId)) {
|
params.program_id > static_cast<u64>(Service::AM::AppletProgramId::MaxProgramId)) {
|
||||||
|
@ -3089,7 +3087,7 @@ void GMainWindow::OnGameListCreateShortcut(u64 program_id, const std::string& ga
|
||||||
this, GMainWindow::CREATE_SHORTCUT_MSGBOX_FULLSCREEN_YES, qt_game_title)) {
|
this, GMainWindow::CREATE_SHORTCUT_MSGBOX_FULLSCREEN_YES, qt_game_title)) {
|
||||||
arguments = "-f " + arguments;
|
arguments = "-f " + arguments;
|
||||||
}
|
}
|
||||||
const std::string comment = fmt::format("Start {:s} with the yuzu Emulator", game_title);
|
const std::string comment = fmt::format("Start {:s} with the eden Emulator", game_title);
|
||||||
const std::string categories = "Game;Emulator;Qt;";
|
const std::string categories = "Game;Emulator;Qt;";
|
||||||
const std::string keywords = "Switch;Nintendo;";
|
const std::string keywords = "Switch;Nintendo;";
|
||||||
|
|
||||||
|
@ -4254,7 +4252,7 @@ void GMainWindow::OnInstallFirmware() {
|
||||||
QMessageBox::warning(
|
QMessageBox::warning(
|
||||||
this, tr("Firmware install failed"),
|
this, tr("Firmware install failed"),
|
||||||
tr("Firmware installation cancelled, firmware may be in bad state, "
|
tr("Firmware installation cancelled, firmware may be in bad state, "
|
||||||
"restart yuzu or re-install firmware."));
|
"restart eden or re-install firmware."));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -4548,7 +4546,7 @@ void GMainWindow::UpdateWindowTitle(std::string_view title_name, std::string_vie
|
||||||
const auto description = std::string(Common::g_scm_desc);
|
const auto description = std::string(Common::g_scm_desc);
|
||||||
const auto build_id = std::string(Common::g_build_id);
|
const auto build_id = std::string(Common::g_build_id);
|
||||||
|
|
||||||
const auto yuzu_title = fmt::format("yuzu | {}-{}", branch_name, description);
|
const auto yuzu_title = fmt::format("eden | {}-{}", branch_name, description);
|
||||||
const auto override_title =
|
const auto override_title =
|
||||||
fmt::format(fmt::runtime(std::string(Common::g_title_bar_format_idle)), build_id);
|
fmt::format(fmt::runtime(std::string(Common::g_title_bar_format_idle)), build_id);
|
||||||
const auto window_title = override_title.empty() ? yuzu_title : override_title;
|
const auto window_title = override_title.empty() ? yuzu_title : override_title;
|
||||||
|
@ -4789,10 +4787,7 @@ void GMainWindow::OnCheckFirmwareDecryption() {
|
||||||
if (!ContentManager::AreKeysPresent()) {
|
if (!ContentManager::AreKeysPresent()) {
|
||||||
QMessageBox::warning(
|
QMessageBox::warning(
|
||||||
this, tr("Derivation Components Missing"),
|
this, tr("Derivation Components Missing"),
|
||||||
tr("Encryption keys are missing. "
|
tr("Encryption keys are missing."));
|
||||||
"<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu "
|
|
||||||
"quickstart guide</a> to get all your keys, firmware and "
|
|
||||||
"games."));
|
|
||||||
}
|
}
|
||||||
SetFirmwareVersion();
|
SetFirmwareVersion();
|
||||||
UpdateMenuState();
|
UpdateMenuState();
|
||||||
|
@ -4905,8 +4900,8 @@ bool GMainWindow::ConfirmClose() {
|
||||||
UISettings::values.confirm_before_stopping.GetValue() == ConfirmStop::Ask_Based_On_Game) {
|
UISettings::values.confirm_before_stopping.GetValue() == ConfirmStop::Ask_Based_On_Game) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
const auto text = tr("Are you sure you want to close yuzu?");
|
const auto text = tr("Are you sure you want to close eden?");
|
||||||
return question(this, tr("yuzu"), text);
|
return question(this, tr("eden"), text);
|
||||||
}
|
}
|
||||||
|
|
||||||
void GMainWindow::closeEvent(QCloseEvent* event) {
|
void GMainWindow::closeEvent(QCloseEvent* event) {
|
||||||
|
@ -4986,7 +4981,7 @@ bool GMainWindow::ConfirmChangeGame() {
|
||||||
|
|
||||||
// Use custom question to link controller navigation
|
// Use custom question to link controller navigation
|
||||||
return question(
|
return question(
|
||||||
this, tr("yuzu"),
|
this, tr("eden"),
|
||||||
tr("Are you sure you want to stop the emulation? Any unsaved progress will be lost."),
|
tr("Are you sure you want to stop the emulation? Any unsaved progress will be lost."),
|
||||||
QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes);
|
QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes);
|
||||||
}
|
}
|
||||||
|
@ -4995,10 +4990,10 @@ bool GMainWindow::ConfirmForceLockedExit() {
|
||||||
if (emu_thread == nullptr) {
|
if (emu_thread == nullptr) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
const auto text = tr("The currently running application has requested yuzu to not exit.\n\n"
|
const auto text = tr("The currently running application has requested eden to not exit.\n\n"
|
||||||
"Would you like to bypass this and exit anyway?");
|
"Would you like to bypass this and exit anyway?");
|
||||||
|
|
||||||
return question(this, tr("yuzu"), text);
|
return question(this, tr("eden"), text);
|
||||||
}
|
}
|
||||||
|
|
||||||
void GMainWindow::RequestGameExit() {
|
void GMainWindow::RequestGameExit() {
|
||||||
|
@ -5272,7 +5267,7 @@ int main(int argc, char* argv[]) {
|
||||||
|
|
||||||
// Init settings params
|
// Init settings params
|
||||||
QCoreApplication::setOrganizationName(QStringLiteral("yuzu team"));
|
QCoreApplication::setOrganizationName(QStringLiteral("yuzu team"));
|
||||||
QCoreApplication::setApplicationName(QStringLiteral("yuzu"));
|
QCoreApplication::setApplicationName(QStringLiteral("eden"));
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
// Increases the maximum open file limit to 8192
|
// Increases the maximum open file limit to 8192
|
||||||
|
|
|
@ -241,7 +241,7 @@
|
||||||
</action>
|
</action>
|
||||||
<action name="action_About">
|
<action name="action_About">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>&About yuzu</string>
|
<string>&About eden</string>
|
||||||
</property>
|
</property>
|
||||||
</action>
|
</action>
|
||||||
<action name="action_Single_Window_Mode">
|
<action name="action_Single_Window_Mode">
|
||||||
|
@ -376,7 +376,7 @@
|
||||||
</action>
|
</action>
|
||||||
<action name="action_Open_yuzu_Folder">
|
<action name="action_Open_yuzu_Folder">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Open &yuzu Folder</string>
|
<string>Open &eden Folder</string>
|
||||||
</property>
|
</property>
|
||||||
</action>
|
</action>
|
||||||
<action name="action_Capture_Screenshot">
|
<action name="action_Capture_Screenshot">
|
||||||
|
|
|
@ -29,12 +29,12 @@ const ConnectionError ErrorManager::UNABLE_TO_CONNECT(
|
||||||
const ConnectionError ErrorManager::ROOM_IS_FULL(
|
const ConnectionError ErrorManager::ROOM_IS_FULL(
|
||||||
QT_TR_NOOP("Unable to connect to the room because it is already full."));
|
QT_TR_NOOP("Unable to connect to the room because it is already full."));
|
||||||
const ConnectionError ErrorManager::COULD_NOT_CREATE_ROOM(
|
const ConnectionError ErrorManager::COULD_NOT_CREATE_ROOM(
|
||||||
QT_TR_NOOP("Creating a room failed. Please retry. Restarting yuzu might be necessary."));
|
QT_TR_NOOP("Creating a room failed. Please retry. Restarting eden might be necessary."));
|
||||||
const ConnectionError ErrorManager::HOST_BANNED(
|
const ConnectionError ErrorManager::HOST_BANNED(
|
||||||
QT_TR_NOOP("The host of the room has banned you. Speak with the host to unban you "
|
QT_TR_NOOP("The host of the room has banned you. Speak with the host to unban you "
|
||||||
"or try a different room."));
|
"or try a different room."));
|
||||||
const ConnectionError ErrorManager::WRONG_VERSION(
|
const ConnectionError ErrorManager::WRONG_VERSION(
|
||||||
QT_TR_NOOP("Version mismatch! Please update to the latest version of yuzu. If the problem "
|
QT_TR_NOOP("Version mismatch! Please update to the latest version of eden. If the problem "
|
||||||
"persists, contact the room host and ask them to update the server."));
|
"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::WRONG_PASSWORD(QT_TR_NOOP("Incorrect password."));
|
||||||
const ConnectionError ErrorManager::GENERIC_ERROR(QT_TR_NOOP(
|
const ConnectionError ErrorManager::GENERIC_ERROR(QT_TR_NOOP(
|
||||||
|
|
|
@ -239,7 +239,7 @@ const std::array<Shortcut, 28> default_hotkeys{{
|
||||||
{QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Change GPU Accuracy")).toStdString(), QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Main Window")).toStdString(), {std::string("F9"), std::string("Home+R"), Qt::ApplicationShortcut, false}},
|
{QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Change GPU Accuracy")).toStdString(), QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Main Window")).toStdString(), {std::string("F9"), std::string("Home+R"), Qt::ApplicationShortcut, false}},
|
||||||
{QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Continue/Pause Emulation")).toStdString(), QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Main Window")).toStdString(), {std::string("F4"), std::string("Home+Plus"), Qt::WindowShortcut, false}},
|
{QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Continue/Pause Emulation")).toStdString(), QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Main Window")).toStdString(), {std::string("F4"), std::string("Home+Plus"), Qt::WindowShortcut, false}},
|
||||||
{QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Exit Fullscreen")).toStdString(), QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Main Window")).toStdString(), {std::string("Esc"), std::string(""), Qt::WindowShortcut, false}},
|
{QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Exit Fullscreen")).toStdString(), QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Main Window")).toStdString(), {std::string("Esc"), std::string(""), Qt::WindowShortcut, false}},
|
||||||
{QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Exit yuzu")).toStdString(), QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Main Window")).toStdString(), {std::string("Ctrl+Q"), std::string("Home+Minus"), Qt::WindowShortcut, false}},
|
{QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Exit eden")).toStdString(), QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Main Window")).toStdString(), {std::string("Ctrl+Q"), std::string("Home+Minus"), Qt::WindowShortcut, false}},
|
||||||
{QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Fullscreen")).toStdString(), QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Main Window")).toStdString(), {std::string("F11"), std::string("Home+B"), Qt::WindowShortcut, false}},
|
{QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Fullscreen")).toStdString(), QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Main Window")).toStdString(), {std::string("F11"), std::string("Home+B"), Qt::WindowShortcut, false}},
|
||||||
{QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Load File")).toStdString(), QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Main Window")).toStdString(), {std::string("Ctrl+O"), std::string(""), Qt::WidgetWithChildrenShortcut, false}},
|
{QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Load File")).toStdString(), QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Main Window")).toStdString(), {std::string("Ctrl+O"), std::string(""), Qt::WidgetWithChildrenShortcut, false}},
|
||||||
{QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Load/Remove Amiibo")).toStdString(), QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Main Window")).toStdString(), {std::string("F2"), std::string("Home+A"), Qt::WidgetWithChildrenShortcut, false}},
|
{QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Load/Remove Amiibo")).toStdString(), QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Main Window")).toStdString(), {std::string("F2"), std::string("Home+A"), Qt::WidgetWithChildrenShortcut, false}},
|
||||||
|
|
|
@ -138,7 +138,7 @@ EmuWindow_SDL2_GL::EmuWindow_SDL2_GL(InputCommon::InputSubsystem* input_subsyste
|
||||||
OnResize();
|
OnResize();
|
||||||
OnMinimalClientAreaChangeRequest(GetActiveConfig().min_client_area_size);
|
OnMinimalClientAreaChangeRequest(GetActiveConfig().min_client_area_size);
|
||||||
SDL_PumpEvents();
|
SDL_PumpEvents();
|
||||||
LOG_INFO(Frontend, "yuzu Version: {} | {}-{}", Common::g_build_fullname, Common::g_scm_branch,
|
LOG_INFO(Frontend, "eden Version: {} | {}-{}", Common::g_build_fullname, Common::g_scm_branch,
|
||||||
Common::g_scm_desc);
|
Common::g_scm_desc);
|
||||||
Settings::LogSettings();
|
Settings::LogSettings();
|
||||||
}
|
}
|
||||||
|
|
|
@ -40,7 +40,7 @@ EmuWindow_SDL2_Null::EmuWindow_SDL2_Null(InputCommon::InputSubsystem* input_subs
|
||||||
OnResize();
|
OnResize();
|
||||||
OnMinimalClientAreaChangeRequest(GetActiveConfig().min_client_area_size);
|
OnMinimalClientAreaChangeRequest(GetActiveConfig().min_client_area_size);
|
||||||
SDL_PumpEvents();
|
SDL_PumpEvents();
|
||||||
LOG_INFO(Frontend, "yuzu Version: {} | {}-{} (Null)", Common::g_build_name,
|
LOG_INFO(Frontend, "eden Version: {} | {}-{} (Null)", Common::g_build_name,
|
||||||
Common::g_scm_branch, Common::g_scm_desc);
|
Common::g_scm_branch, Common::g_scm_desc);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -82,7 +82,7 @@ EmuWindow_SDL2_VK::EmuWindow_SDL2_VK(InputCommon::InputSubsystem* input_subsyste
|
||||||
OnResize();
|
OnResize();
|
||||||
OnMinimalClientAreaChangeRequest(GetActiveConfig().min_client_area_size);
|
OnMinimalClientAreaChangeRequest(GetActiveConfig().min_client_area_size);
|
||||||
SDL_PumpEvents();
|
SDL_PumpEvents();
|
||||||
LOG_INFO(Frontend, "yuzu Version: {} | {}-{} (Vulkan)", Common::g_build_name,
|
LOG_INFO(Frontend, "eden Version: {} | {}-{} (Vulkan)", Common::g_build_name,
|
||||||
Common::g_scm_branch, Common::g_scm_desc);
|
Common::g_scm_branch, Common::g_scm_desc);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue