mirror of
https://git.eden-emu.dev/eden-emu/eden.git
synced 2025-07-19 20:35:45 +00:00
[desktop, core] yuzu -> Eden, eden -> Eden
Signed-off-by: crueter <crueter@eden-emu.dev>
This commit is contained in:
parent
d125994270
commit
9dfe3cece0
32 changed files with 72 additions and 75 deletions
|
@ -208,7 +208,7 @@ CubebSink::CubebSink(std::string_view target_device_name) {
|
||||||
com_init_result = CoInitializeEx(nullptr, COINIT_MULTITHREADED);
|
com_init_result = CoInitializeEx(nullptr, COINIT_MULTITHREADED);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (cubeb_init(&ctx, "yuzu", nullptr) != CUBEB_OK) {
|
if (cubeb_init(&ctx, "Eden", nullptr) != CUBEB_OK) {
|
||||||
LOG_CRITICAL(Audio_Sink, "cubeb_init failed");
|
LOG_CRITICAL(Audio_Sink, "cubeb_init failed");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -304,7 +304,7 @@ std::vector<std::string> ListCubebSinkDevices(bool capture) {
|
||||||
auto com_init_result = CoInitializeEx(nullptr, COINIT_MULTITHREADED);
|
auto com_init_result = CoInitializeEx(nullptr, COINIT_MULTITHREADED);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (cubeb_init(&ctx, "yuzu Device Enumerator", nullptr) != CUBEB_OK) {
|
if (cubeb_init(&ctx, "Eden Device Enumerator", nullptr) != CUBEB_OK) {
|
||||||
LOG_CRITICAL(Audio_Sink, "cubeb_init failed");
|
LOG_CRITICAL(Audio_Sink, "cubeb_init failed");
|
||||||
return {};
|
return {};
|
||||||
}
|
}
|
||||||
|
@ -352,7 +352,7 @@ bool IsCubebSuitable() {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Init cubeb
|
// Init cubeb
|
||||||
if (cubeb_init(&ctx, "yuzu Latency Getter", nullptr) != CUBEB_OK) {
|
if (cubeb_init(&ctx, "Eden Latency Getter", nullptr) != CUBEB_OK) {
|
||||||
LOG_ERROR(Audio_Sink, "Cubeb failed to init, it is not suitable.");
|
LOG_ERROR(Audio_Sink, "Cubeb failed to init, it is not suitable.");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -386,7 +386,7 @@ bool IsCubebSuitable() {
|
||||||
// Test opening a device with standard parameters
|
// Test opening a device with standard parameters
|
||||||
cubeb_devid output_device{0};
|
cubeb_devid output_device{0};
|
||||||
cubeb_devid input_device{0};
|
cubeb_devid input_device{0};
|
||||||
std::string name{"Yuzu test"};
|
std::string name{"Eden test"};
|
||||||
cubeb_stream* stream{nullptr};
|
cubeb_stream* stream{nullptr};
|
||||||
|
|
||||||
if (cubeb_stream_init(ctx, &stream, name.c_str(), input_device, nullptr, output_device, ¶ms,
|
if (cubeb_stream_init(ctx, &stream, name.c_str(), input_device, nullptr, output_device, ¶ms,
|
||||||
|
|
|
@ -118,7 +118,7 @@ void LogSettings() {
|
||||||
LOG_INFO(Config, "{}: {}", name, Common::FS::PathToUTF8String(path));
|
LOG_INFO(Config, "{}: {}", name, Common::FS::PathToUTF8String(path));
|
||||||
};
|
};
|
||||||
|
|
||||||
LOG_INFO(Config, "yuzu Configuration:");
|
LOG_INFO(Config, "Eden Configuration:");
|
||||||
for (auto& [category, settings] : values.linkage.by_category) {
|
for (auto& [category, settings] : values.linkage.by_category) {
|
||||||
for (const auto& setting : settings) {
|
for (const auto& setting : settings) {
|
||||||
if (setting->Id() == values.eden_token.Id()) {
|
if (setting->Id() == values.eden_token.Id()) {
|
||||||
|
|
|
@ -564,7 +564,7 @@ struct Values {
|
||||||
linkage, 0, "rng_seed", Category::System, Specialization::Hex,
|
linkage, 0, "rng_seed", Category::System, Specialization::Hex,
|
||||||
true, true, &rng_seed_enabled};
|
true, true, &rng_seed_enabled};
|
||||||
Setting<std::string> device_name{
|
Setting<std::string> device_name{
|
||||||
linkage, "eden", "device_name", Category::System, Specialization::Default, true, true};
|
linkage, "Eden", "device_name", Category::System, Specialization::Default, true, true};
|
||||||
|
|
||||||
Setting<s32> current_user{linkage, 0, "current_user", Category::System};
|
Setting<s32> current_user{linkage, 0, "current_user", Category::System};
|
||||||
|
|
||||||
|
|
|
@ -76,13 +76,13 @@ struct UUID {
|
||||||
u128 AsU128() const;
|
u128 AsU128() const;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates a default UUID "yuzu Default UID".
|
* Creates a default UUID "Eden Default UID".
|
||||||
*
|
*
|
||||||
* @returns A UUID with its bytes set to the ASCII values of "yuzu Default UID".
|
* @returns A UUID with its bytes set to the ASCII values of "Eden Default UID".
|
||||||
*/
|
*/
|
||||||
static constexpr UUID MakeDefault() {
|
static constexpr UUID MakeDefault() {
|
||||||
return UUID{
|
return UUID{
|
||||||
{'y', 'u', 'z', 'u', ' ', 'D', 'e', 'f', 'a', 'u', 'l', 't', ' ', 'U', 'I', 'D'},
|
{'E', 'd', 'e', 'n', ' ', 'D', 'e', 'f', 'a', 'u', 'l', 't', ' ', 'U', 'I', 'D'},
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -65,7 +65,7 @@ void DefaultSoftwareKeyboardApplet::ShowNormalKeyboard() const {
|
||||||
LOG_WARNING(Service_AM,
|
LOG_WARNING(Service_AM,
|
||||||
"(STUBBED) called, backend requested to show the normal software keyboard.");
|
"(STUBBED) called, backend requested to show the normal software keyboard.");
|
||||||
|
|
||||||
SubmitNormalText(u"yuzu");
|
SubmitNormalText(u"Eden");
|
||||||
}
|
}
|
||||||
|
|
||||||
void DefaultSoftwareKeyboardApplet::ShowTextCheckDialog(
|
void DefaultSoftwareKeyboardApplet::ShowTextCheckDialog(
|
||||||
|
@ -100,7 +100,7 @@ void DefaultSoftwareKeyboardApplet::ShowInlineKeyboard(
|
||||||
appear_parameters.key_top_as_floating, appear_parameters.enable_backspace_button,
|
appear_parameters.key_top_as_floating, appear_parameters.enable_backspace_button,
|
||||||
appear_parameters.enable_return_button, appear_parameters.disable_cancel_button);
|
appear_parameters.enable_return_button, appear_parameters.disable_cancel_button);
|
||||||
|
|
||||||
std::thread([this] { SubmitInlineText(u"yuzu"); }).detach();
|
std::thread([this] { SubmitInlineText(u"Eden"); }).detach();
|
||||||
}
|
}
|
||||||
|
|
||||||
void DefaultSoftwareKeyboardApplet::HideInlineKeyboard() const {
|
void DefaultSoftwareKeyboardApplet::HideInlineKeyboard() const {
|
||||||
|
|
|
@ -969,7 +969,7 @@ void Module::Interface::InitializeApplicationInfoV2(HLERequestContext& ctx) {
|
||||||
|
|
||||||
void Module::Interface::BeginUserRegistration(HLERequestContext& ctx) {
|
void Module::Interface::BeginUserRegistration(HLERequestContext& ctx) {
|
||||||
const auto user_id = Common::UUID::MakeRandom();
|
const auto user_id = Common::UUID::MakeRandom();
|
||||||
profile_manager->CreateNewUser(user_id, "yuzu");
|
profile_manager->CreateNewUser(user_id, "Eden");
|
||||||
|
|
||||||
LOG_INFO(Service_ACC, "called, uuid={}", user_id.FormattedString());
|
LOG_INFO(Service_ACC, "called, uuid={}", user_id.FormattedString());
|
||||||
|
|
||||||
|
|
|
@ -49,7 +49,7 @@ ProfileManager::ProfileManager() {
|
||||||
|
|
||||||
// Create an user if none are present
|
// Create an user if none are present
|
||||||
if (user_count == 0) {
|
if (user_count == 0) {
|
||||||
CreateNewUser(UUID::MakeRandom(), "eden");
|
CreateNewUser(UUID::MakeRandom(), "Eden");
|
||||||
WriteUserSaveFile();
|
WriteUserSaveFile();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -68,14 +68,13 @@ static void PrintHelp(const char* argv0) {
|
||||||
"-a, --web-api-url yuzu Web API url\n"
|
"-a, --web-api-url yuzu Web API url\n"
|
||||||
"-b, --ban-list-file The file for storing the room ban list\n"
|
"-b, --ban-list-file The file for storing the room ban list\n"
|
||||||
"-l, --log-file The file for storing the room log\n"
|
"-l, --log-file The file for storing the room log\n"
|
||||||
"-e, --enable-mods Allow Community Moderators to moderate on your room\n"
|
|
||||||
"-h, --help Display this help and exit\n"
|
"-h, --help Display this help and exit\n"
|
||||||
"-v, --version Output version information and exit\n",
|
"-v, --version Output version information and exit\n",
|
||||||
argv0);
|
argv0);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void PrintVersion() {
|
static void PrintVersion() {
|
||||||
LOG_INFO(Network, "yuzu dedicated room {} {} Libnetwork: {}", Common::g_scm_branch,
|
LOG_INFO(Network, "Eden dedicated room {} {} Libnetwork: {}", Common::g_scm_branch,
|
||||||
Common::g_scm_desc, Network::network_version);
|
Common::g_scm_desc, Network::network_version);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -229,7 +228,6 @@ void LaunchRoom(int argc, char** argv, bool called_by_option)
|
||||||
{"web-api-url", required_argument, 0, 'a'},
|
{"web-api-url", required_argument, 0, 'a'},
|
||||||
{"ban-list-file", required_argument, 0, 'b'},
|
{"ban-list-file", required_argument, 0, 'b'},
|
||||||
{"log-file", required_argument, 0, 'l'},
|
{"log-file", required_argument, 0, 'l'},
|
||||||
{"enable-mods", no_argument, 0, 'e'},
|
|
||||||
{"help", no_argument, 0, 'h'},
|
{"help", no_argument, 0, 'h'},
|
||||||
{"version", no_argument, 0, 'v'},
|
{"version", no_argument, 0, 'v'},
|
||||||
// Entry option
|
// Entry option
|
||||||
|
@ -369,7 +367,7 @@ void LaunchRoom(int argc, char** argv, bool called_by_option)
|
||||||
std::make_unique<WebService::VerifyUserJWT>(Settings::values.web_api_url.GetValue());
|
std::make_unique<WebService::VerifyUserJWT>(Settings::values.web_api_url.GetValue());
|
||||||
#else
|
#else
|
||||||
LOG_INFO(Network,
|
LOG_INFO(Network,
|
||||||
"yuzu Web Services is not available with this build: validation is disabled.");
|
"Eden Web Services is not available with this build: validation is disabled.");
|
||||||
verify_backend = std::make_unique<Network::VerifyUser::NullBackend>();
|
verify_backend = std::make_unique<Network::VerifyUser::NullBackend>();
|
||||||
#endif
|
#endif
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -489,7 +489,7 @@ void SDLDriver::CloseJoysticks() {
|
||||||
SDLDriver::SDLDriver(std::string input_engine_) : InputEngine(std::move(input_engine_)) {
|
SDLDriver::SDLDriver(std::string input_engine_) : InputEngine(std::move(input_engine_)) {
|
||||||
// Set our application name. Currently passed to DBus by SDL and visible to the user through
|
// Set our application name. Currently passed to DBus by SDL and visible to the user through
|
||||||
// their desktop environment.
|
// their desktop environment.
|
||||||
SDL_SetHint(SDL_HINT_APP_NAME, "yuzu");
|
SDL_SetHint(SDL_HINT_APP_NAME, "Eden");
|
||||||
|
|
||||||
if (!Settings::values.enable_raw_input) {
|
if (!Settings::values.enable_raw_input) {
|
||||||
// Disable raw input. When enabled this setting causes SDL to die when a web applet opens
|
// Disable raw input. When enabled this setting causes SDL to die when a web applet opens
|
||||||
|
|
|
@ -186,7 +186,7 @@ void NsightAftermathTracker::OnShaderDebugInfoCallback(const void* shader_debug_
|
||||||
|
|
||||||
void NsightAftermathTracker::OnCrashDumpDescriptionCallback(
|
void NsightAftermathTracker::OnCrashDumpDescriptionCallback(
|
||||||
PFN_GFSDK_Aftermath_AddGpuCrashDumpDescription add_description) {
|
PFN_GFSDK_Aftermath_AddGpuCrashDumpDescription add_description) {
|
||||||
add_description(GFSDK_Aftermath_GpuCrashDumpDescriptionKey_ApplicationName, "yuzu");
|
add_description(GFSDK_Aftermath_GpuCrashDumpDescriptionKey_ApplicationName, "Eden");
|
||||||
}
|
}
|
||||||
|
|
||||||
void NsightAftermathTracker::GpuCrashDumpCallback(const void* gpu_crash_dump,
|
void NsightAftermathTracker::GpuCrashDumpCallback(const void* gpu_crash_dump,
|
||||||
|
|
|
@ -437,9 +437,9 @@ Instance Instance::Create(u32 version, Span<const char*> layers, Span<const char
|
||||||
const VkApplicationInfo application_info{
|
const VkApplicationInfo application_info{
|
||||||
.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO,
|
.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO,
|
||||||
.pNext = nullptr,
|
.pNext = nullptr,
|
||||||
.pApplicationName = "yuzu Emulator",
|
.pApplicationName = "Eden Emulator",
|
||||||
.applicationVersion = VK_MAKE_VERSION(0, 1, 0),
|
.applicationVersion = VK_MAKE_VERSION(0, 1, 0),
|
||||||
.pEngineName = "yuzu Emulator",
|
.pEngineName = "Eden Emulator",
|
||||||
.engineVersion = VK_MAKE_VERSION(0, 1, 0),
|
.engineVersion = VK_MAKE_VERSION(0, 1, 0),
|
||||||
.apiVersion = VK_API_VERSION_1_3,
|
.apiVersion = VK_API_VERSION_1_3,
|
||||||
};
|
};
|
||||||
|
|
|
@ -69,7 +69,7 @@
|
||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string><html><head/><body><p><span style=" font-size:28pt;">eden</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>
|
||||||
|
@ -101,8 +101,8 @@ p, li { white-space: pre-wrap; }
|
||||||
hr { height: 1px; border-width: 0; }
|
hr { height: 1px; border-width: 0; }
|
||||||
li.unchecked::marker { content: "\2610"; }
|
li.unchecked::marker { content: "\2610"; }
|
||||||
li.checked::marker { content: "\2612"; }
|
li.checked::marker { content: "\2612"; }
|
||||||
</style></head><body style=" font-family:'Adwaita Sans'; font-size:11pt; font-weight:400; font-style:normal;">
|
</style></head><body style=" font-family:'Noto Sans'; font-size:9pt; 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>
|
<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::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter</set>
|
<set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter</set>
|
||||||
|
@ -165,7 +165,6 @@ li.checked::marker { content: "\2612"; }
|
||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
<resources>
|
<resources>
|
||||||
<include location="../../dist/qt_themes_default/default/default.qrc"/>
|
|
||||||
<include location="../../dist/qt_themes/default/default.qrc"/>
|
<include location="../../dist/qt_themes/default/default.qrc"/>
|
||||||
</resources>
|
</resources>
|
||||||
<connections>
|
<connections>
|
||||||
|
|
|
@ -286,7 +286,7 @@ GRenderWindow::GRenderWindow(GMainWindow* parent, EmuThread* emu_thread_,
|
||||||
Core::System& system_)
|
Core::System& system_)
|
||||||
: QWidget(parent),
|
: QWidget(parent),
|
||||||
emu_thread(emu_thread_), input_subsystem{std::move(input_subsystem_)}, system{system_} {
|
emu_thread(emu_thread_), input_subsystem{std::move(input_subsystem_)}, system{system_} {
|
||||||
setWindowTitle(QStringLiteral("eden %1 | %2-%3")
|
setWindowTitle(QStringLiteral("Eden %1 | %2-%3")
|
||||||
.arg(QString::fromUtf8(Common::g_build_name),
|
.arg(QString::fromUtf8(Common::g_build_name),
|
||||||
QString::fromUtf8(Common::g_scm_branch),
|
QString::fromUtf8(Common::g_scm_branch),
|
||||||
QString::fromUtf8(Common::g_scm_desc)));
|
QString::fromUtf8(Common::g_scm_desc)));
|
||||||
|
@ -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("eden has not been compiled with OpenGL support."));
|
tr("Eden has not been compiled with OpenGL support."));
|
||||||
return false;
|
return false;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
|
@ -560,7 +560,7 @@
|
||||||
</font>
|
</font>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>**This will be reset automatically when eden closes.</string>
|
<string>**This will be reset automatically when Eden closes.</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="indent">
|
<property name="indent">
|
||||||
<number>20</number>
|
<number>20</number>
|
||||||
|
|
|
@ -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("eden"),
|
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);
|
||||||
|
|
|
@ -2656,7 +2656,7 @@
|
||||||
<item row="2" column="0">
|
<item row="2" column="0">
|
||||||
<widget class="QCheckBox" name="enable_raw_input">
|
<widget class="QCheckBox" name="enable_raw_input">
|
||||||
<property name="toolTip">
|
<property name="toolTip">
|
||||||
<string>Requires restarting eden</string>
|
<string>Requires restarting Eden</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="minimumSize">
|
<property name="minimumSize">
|
||||||
<size>
|
<size>
|
||||||
|
@ -2698,7 +2698,7 @@
|
||||||
<item row="5" column="0">
|
<item row="5" column="0">
|
||||||
<widget class="QCheckBox" name="enable_joycon_driver">
|
<widget class="QCheckBox" name="enable_joycon_driver">
|
||||||
<property name="toolTip">
|
<property name="toolTip">
|
||||||
<string>Requires restarting eden</string>
|
<string>Requires restarting Eden</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="minimumSize">
|
<property name="minimumSize">
|
||||||
<size>
|
<size>
|
||||||
|
@ -2714,7 +2714,7 @@
|
||||||
<item row="6" column="0">
|
<item row="6" column="0">
|
||||||
<widget class="QCheckBox" name="enable_procon_driver">
|
<widget class="QCheckBox" name="enable_procon_driver">
|
||||||
<property name="toolTip">
|
<property name="toolTip">
|
||||||
<string>Requires restarting eden</string>
|
<string>Requires restarting Eden</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="minimumSize">
|
<property name="minimumSize">
|
||||||
<size>
|
<size>
|
||||||
|
|
|
@ -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("eden"), 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("eden"), 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("eden"), 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("eden"), 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("eden"), 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("eden"),
|
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;
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
<item row="0" column="0" colspan="4">
|
<item row="0" column="0" colspan="4">
|
||||||
<widget class="QLabel" name="label_1">
|
<widget class="QLabel" name="label_1">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string><html><head/><body><p>Reads controller input from scripts in the same format as TAS-nx scripts.<br/>For a more detailed explanation, please consult the <a href="https://eden-emulator.github.io/help/feature/tas/"><span style=" text-decoration: underline; color:#039be5;">help page</span></a> on the eden website.</p></body></html></string>
|
<string><html><head/><body><p>Reads controller input from scripts in the same format as TAS-nx scripts.<br/>For a more detailed explanation, please consult the <a href="https://eden-emulator.github.io/help/feature/tas/"><span style=" text-decoration: underline; color:#039be5;">help page</span></a> on the Eden website.</p></body></html></string>
|
||||||
</property>
|
</property>
|
||||||
<property name="openExternalLinks">
|
<property name="openExternalLinks">
|
||||||
<bool>true</bool>
|
<bool>true</bool>
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Warning: The settings in this page affect the inner workings of eden's emulated touchscreen. Changing them may result in undesirable behavior, such as the touchscreen partially or not working. You should only use this page if you know what you are doing.</string>
|
<string>Warning: The settings in this page affect the inner workings of Eden's emulated touchscreen. Changing them may result in undesirable behavior, such as the touchscreen partially or not working. You should only use this page if you know what you are doing.</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="wordWrap">
|
<property name="wordWrap">
|
||||||
<bool>true</bool>
|
<bool>true</bool>
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
<item>
|
<item>
|
||||||
<widget class="QGroupBox" name="groupBoxWebConfig">
|
<widget class="QGroupBox" name="groupBoxWebConfig">
|
||||||
<property name="title">
|
<property name="title">
|
||||||
<string>eden Web Service</string>
|
<string>Eden Web Service</string>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QVBoxLayout" name="verticalLayoutYuzuWebService">
|
<layout class="QVBoxLayout" name="verticalLayoutYuzuWebService">
|
||||||
<item>
|
<item>
|
||||||
|
|
|
@ -420,12 +420,12 @@ std::unique_ptr<TranslationMap> InitializeTranslations(QWidget* parent)
|
||||||
INSERT(UISettings,
|
INSERT(UISettings,
|
||||||
select_user_on_boot,
|
select_user_on_boot,
|
||||||
tr("Prompt for user on game boot"),
|
tr("Prompt for user on game boot"),
|
||||||
tr("Ask to select a user profile on each boot, useful if multiple people use eden on "
|
tr("Ask to select a user profile on each boot, useful if multiple people use Eden on "
|
||||||
"the same PC."));
|
"the same PC."));
|
||||||
INSERT(UISettings,
|
INSERT(UISettings,
|
||||||
pause_when_in_background,
|
pause_when_in_background,
|
||||||
tr("Pause emulation when in background"),
|
tr("Pause emulation when in background"),
|
||||||
tr("This setting pauses eden when focusing other windows."));
|
tr("This setting pauses Eden when focusing other windows."));
|
||||||
INSERT(UISettings,
|
INSERT(UISettings,
|
||||||
confirm_before_stopping,
|
confirm_before_stopping,
|
||||||
tr("Confirm before stopping emulation"),
|
tr("Confirm before stopping emulation"),
|
||||||
|
|
|
@ -390,13 +390,13 @@ GMainWindow::GMainWindow(bool has_broken_vulkan)
|
||||||
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("eden 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, "eden 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();
|
||||||
|
@ -1410,7 +1410,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 eden"));
|
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"));
|
||||||
|
@ -1969,7 +1969,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 eden supports, <a "
|
"support.<br><br>For an explanation of the various Switch formats Eden supports, <a "
|
||||||
"href='https://eden-emulator.github.io/wiki/overview-of-switch-game-formats'>check out our "
|
"href='https://eden-emulator.github.io/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."));
|
||||||
}
|
}
|
||||||
|
@ -1984,7 +1984,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("eden 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: "
|
||||||
|
@ -2076,7 +2076,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, "eden 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)) {
|
||||||
|
@ -3621,8 +3621,8 @@ void GMainWindow::OnMenuReportCompatibility() {
|
||||||
} else {
|
} else {
|
||||||
QMessageBox::critical(
|
QMessageBox::critical(
|
||||||
this, tr("Missing yuzu Account"),
|
this, tr("Missing yuzu Account"),
|
||||||
tr("In order to submit a game compatibility test case, you must link your eden "
|
tr("In order to submit a game compatibility test case, you must set up your web token and "
|
||||||
"account.<br><br/>To link your eden account, go to Emulation > Configuration "
|
"username.<br><br/>To link your eden account, go to Emulation > Configuration "
|
||||||
"> "
|
"> "
|
||||||
"Web."));
|
"Web."));
|
||||||
}
|
}
|
||||||
|
@ -3650,7 +3650,7 @@ void GMainWindow::OnOpenQuickstartGuide() {
|
||||||
}
|
}
|
||||||
|
|
||||||
void GMainWindow::OnOpenFAQ() {
|
void GMainWindow::OnOpenFAQ() {
|
||||||
OpenURL(QUrl(QStringLiteral("https://eden-emulator.github.io/")));
|
OpenURL(QUrl(QStringLiteral("https://eden-emu.dev")));
|
||||||
}
|
}
|
||||||
|
|
||||||
void GMainWindow::OnOpenDiscord()
|
void GMainWindow::OnOpenDiscord()
|
||||||
|
@ -5260,8 +5260,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 eden?");
|
const auto text = tr("Are you sure you want to close Eden?");
|
||||||
return question(this, tr("eden"), text);
|
return question(this, tr("Eden"), text);
|
||||||
}
|
}
|
||||||
|
|
||||||
void GMainWindow::closeEvent(QCloseEvent* event) {
|
void GMainWindow::closeEvent(QCloseEvent* event) {
|
||||||
|
@ -5341,7 +5341,7 @@ bool GMainWindow::ConfirmChangeGame() {
|
||||||
|
|
||||||
// Use custom question to link controller navigation
|
// Use custom question to link controller navigation
|
||||||
return question(
|
return question(
|
||||||
this, tr("eden"),
|
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);
|
||||||
}
|
}
|
||||||
|
@ -5350,10 +5350,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 eden 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("eden"), text);
|
return question(this, tr("Eden"), text);
|
||||||
}
|
}
|
||||||
|
|
||||||
void GMainWindow::RequestGameExit() {
|
void GMainWindow::RequestGameExit() {
|
||||||
|
|
|
@ -269,7 +269,7 @@
|
||||||
</action>
|
</action>
|
||||||
<action name="action_About">
|
<action name="action_About">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>&About eden</string>
|
<string>&About Eden</string>
|
||||||
</property>
|
</property>
|
||||||
</action>
|
</action>
|
||||||
<action name="action_Single_Window_Mode">
|
<action name="action_Single_Window_Mode">
|
||||||
|
|
|
@ -60,7 +60,7 @@ HostRoomWindow::HostRoomWindow(QWidget* parent, QStandardItemModel* list,
|
||||||
ui->username->setText(
|
ui->username->setText(
|
||||||
QString::fromStdString(UISettings::values.multiplayer_room_nickname.GetValue()));
|
QString::fromStdString(UISettings::values.multiplayer_room_nickname.GetValue()));
|
||||||
if (ui->username->text().isEmpty() && !Settings::values.eden_username.GetValue().empty()) {
|
if (ui->username->text().isEmpty() && !Settings::values.eden_username.GetValue().empty()) {
|
||||||
// Use eden Web Service user name as nickname by default
|
// Use Eden Web Service user name as nickname by default
|
||||||
ui->username->setText(QString::fromStdString(Settings::values.eden_username.GetValue()));
|
ui->username->setText(QString::fromStdString(Settings::values.eden_username.GetValue()));
|
||||||
}
|
}
|
||||||
ui->room_name->setText(
|
ui->room_name->setText(
|
||||||
|
@ -186,7 +186,7 @@ void HostRoomWindow::Host() {
|
||||||
QMessageBox::warning(
|
QMessageBox::warning(
|
||||||
this, tr("Error"),
|
this, tr("Error"),
|
||||||
tr("Failed to announce the room to the public lobby. In order to host a "
|
tr("Failed to announce the room to the public lobby. In order to host a "
|
||||||
"room publicly, you must have a valid eden account configured in "
|
"room publicly, you must have a valid Eden account configured in "
|
||||||
"Emulation -> Configure -> Web. If you do not want to publish a room in "
|
"Emulation -> Configure -> Web. If you do not want to publish a room in "
|
||||||
"the public lobby, then select Unlisted instead.\nDebug Message: ") +
|
"the public lobby, then select Unlisted instead.\nDebug Message: ") +
|
||||||
QString::fromStdString(result.result_string),
|
QString::fromStdString(result.result_string),
|
||||||
|
|
|
@ -66,14 +66,14 @@ Lobby::Lobby(QWidget* parent, QStandardItemModel* list,
|
||||||
QString::fromStdString(UISettings::values.multiplayer_nickname.GetValue()));
|
QString::fromStdString(UISettings::values.multiplayer_nickname.GetValue()));
|
||||||
|
|
||||||
// Try find the best nickname by default
|
// Try find the best nickname by default
|
||||||
if (ui->nickname->text().isEmpty() || ui->nickname->text() == QStringLiteral("eden")) {
|
if (ui->nickname->text().isEmpty() || ui->nickname->text() == QStringLiteral("Eden")) {
|
||||||
if (!Settings::values.eden_username.GetValue().empty()) {
|
if (!Settings::values.eden_username.GetValue().empty()) {
|
||||||
ui->nickname->setText(
|
ui->nickname->setText(
|
||||||
QString::fromStdString(Settings::values.eden_username.GetValue()));
|
QString::fromStdString(Settings::values.eden_username.GetValue()));
|
||||||
} else if (!GetProfileUsername().empty()) {
|
} else if (!GetProfileUsername().empty()) {
|
||||||
ui->nickname->setText(QString::fromStdString(GetProfileUsername()));
|
ui->nickname->setText(QString::fromStdString(GetProfileUsername()));
|
||||||
} else {
|
} else {
|
||||||
ui->nickname->setText(QStringLiteral("eden"));
|
ui->nickname->setText(QStringLiteral("Eden"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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 eden 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 eden. 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(
|
||||||
|
|
|
@ -242,7 +242,7 @@ const std::array<Shortcut, 30> default_hotkeys{{
|
||||||
{QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Configure Current Game")).toStdString(), QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Main Window")).toStdString(), {std::string("Ctrl+."), std::string(""), Qt::WidgetWithChildrenShortcut, false}},
|
{QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Configure Current Game")).toStdString(), QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Main Window")).toStdString(), {std::string("Ctrl+."), std::string(""), Qt::WidgetWithChildrenShortcut, 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 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", "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}},
|
||||||
|
|
|
@ -223,7 +223,7 @@ void EmuWindow_SDL2::WaitEvent() {
|
||||||
const u32 current_time = SDL_GetTicks();
|
const u32 current_time = SDL_GetTicks();
|
||||||
if (current_time > last_time + 2000) {
|
if (current_time > last_time + 2000) {
|
||||||
const auto results = system.GetAndResetPerfStats();
|
const auto results = system.GetAndResetPerfStats();
|
||||||
const auto title = fmt::format("eden {} | {}-{} | FPS: {:.0f} ({:.0f}%)",
|
const auto title = fmt::format("Eden {} | {}-{} | FPS: {:.0f} ({:.0f}%)",
|
||||||
Common::g_build_fullname,
|
Common::g_build_fullname,
|
||||||
Common::g_scm_branch,
|
Common::g_scm_branch,
|
||||||
Common::g_scm_desc,
|
Common::g_scm_desc,
|
||||||
|
@ -238,7 +238,7 @@ void EmuWindow_SDL2::WaitEvent() {
|
||||||
void EmuWindow_SDL2::SetWindowIcon() {
|
void EmuWindow_SDL2::SetWindowIcon() {
|
||||||
SDL_RWops* const yuzu_icon_stream = SDL_RWFromConstMem((void*)yuzu_icon, yuzu_icon_size);
|
SDL_RWops* const yuzu_icon_stream = SDL_RWFromConstMem((void*)yuzu_icon, yuzu_icon_size);
|
||||||
if (yuzu_icon_stream == nullptr) {
|
if (yuzu_icon_stream == nullptr) {
|
||||||
LOG_WARNING(Frontend, "Failed to create eden icon stream.");
|
LOG_WARNING(Frontend, "Failed to create Eden icon stream.");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
SDL_Surface* const window_icon = SDL_LoadBMP_RW(yuzu_icon_stream, 1);
|
SDL_Surface* const window_icon = SDL_LoadBMP_RW(yuzu_icon_stream, 1);
|
||||||
|
|
|
@ -90,7 +90,7 @@ EmuWindow_SDL2_GL::EmuWindow_SDL2_GL(InputCommon::InputSubsystem* input_subsyste
|
||||||
}
|
}
|
||||||
SDL_GL_SetSwapInterval(0);
|
SDL_GL_SetSwapInterval(0);
|
||||||
|
|
||||||
std::string window_title = fmt::format("eden {} | {}-{}", Common::g_build_fullname,
|
std::string window_title = fmt::format("Eden {} | {}-{}", Common::g_build_fullname,
|
||||||
Common::g_scm_branch, Common::g_scm_desc);
|
Common::g_scm_branch, Common::g_scm_desc);
|
||||||
render_window =
|
render_window =
|
||||||
SDL_CreateWindow(window_title.c_str(),
|
SDL_CreateWindow(window_title.c_str(),
|
||||||
|
@ -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, "eden 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();
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
EmuWindow_SDL2_Null::EmuWindow_SDL2_Null(InputCommon::InputSubsystem* input_subsystem_,
|
EmuWindow_SDL2_Null::EmuWindow_SDL2_Null(InputCommon::InputSubsystem* input_subsystem_,
|
||||||
Core::System& system_, bool fullscreen)
|
Core::System& system_, bool fullscreen)
|
||||||
: EmuWindow_SDL2{input_subsystem_, system_} {
|
: EmuWindow_SDL2{input_subsystem_, system_} {
|
||||||
const std::string window_title = fmt::format("eden {} | {}-{} (Vulkan)", Common::g_build_name,
|
const std::string window_title = fmt::format("Eden {} | {}-{} (Vulkan)", Common::g_build_name,
|
||||||
Common::g_scm_branch, Common::g_scm_desc);
|
Common::g_scm_branch, Common::g_scm_desc);
|
||||||
render_window =
|
render_window =
|
||||||
SDL_CreateWindow(window_title.c_str(), SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED,
|
SDL_CreateWindow(window_title.c_str(), SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED,
|
||||||
|
@ -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, "eden 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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
EmuWindow_SDL2_VK::EmuWindow_SDL2_VK(InputCommon::InputSubsystem* input_subsystem_,
|
EmuWindow_SDL2_VK::EmuWindow_SDL2_VK(InputCommon::InputSubsystem* input_subsystem_,
|
||||||
Core::System& system_, bool fullscreen)
|
Core::System& system_, bool fullscreen)
|
||||||
: EmuWindow_SDL2{input_subsystem_, system_} {
|
: EmuWindow_SDL2{input_subsystem_, system_} {
|
||||||
const std::string window_title = fmt::format("eden {} | {}-{} (Vulkan)",
|
const std::string window_title = fmt::format("Eden {} | {}-{} (Vulkan)",
|
||||||
Common::g_build_name,
|
Common::g_build_name,
|
||||||
Common::g_scm_branch,
|
Common::g_scm_branch,
|
||||||
Common::g_scm_desc);
|
Common::g_scm_desc);
|
||||||
|
@ -84,7 +84,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, "eden 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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -88,7 +88,7 @@ static void PrintHelp(const char* argv0) {
|
||||||
}
|
}
|
||||||
|
|
||||||
static void PrintVersion() {
|
static void PrintVersion() {
|
||||||
std::cout << "eden " << Common::g_scm_branch << " " << Common::g_scm_desc << std::endl;
|
std::cout << "Eden " << Common::g_scm_branch << " " << Common::g_scm_desc << std::endl;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void OnStateChanged(const Network::RoomMember::State& state) {
|
static void OnStateChanged(const Network::RoomMember::State& state) {
|
||||||
|
@ -408,7 +408,7 @@ int main(int argc, char** argv) {
|
||||||
const u16 error_id = static_cast<u16>(load_result) - loader_id;
|
const u16 error_id = static_cast<u16>(load_result) - loader_id;
|
||||||
LOG_CRITICAL(Frontend,
|
LOG_CRITICAL(Frontend,
|
||||||
"While attempting to load the ROM requested, an error occurred. Please "
|
"While attempting to load the ROM requested, an error occurred. Please "
|
||||||
"refer to the eden wiki for more information or the eden discord for "
|
"refer to the Eden wiki for more information or the Eden discord for "
|
||||||
"additional help.\n\nError Code: {:04X}-{:04X}\nError Description: {}",
|
"additional help.\n\nError Code: {:04X}-{:04X}\nError Description: {}",
|
||||||
loader_id,
|
loader_id,
|
||||||
error_id,
|
error_id,
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue