From e6ad51e3d58894c388bd94753e11a4c118089e68 Mon Sep 17 00:00:00 2001 From: omardotdev Date: Fri, 17 Apr 2026 06:58:40 +0200 Subject: [PATCH] [settings] remove duplicate settings (#3847) this removes the duplicate serial knob, battery/unit serial shown on the settings tab and uses the debugging tab instead (this used to be a pr to fix breeze compatibility issues where the text/input fields would look wrong when the theme was set to breeze but since the settings was moved its not really needed to change the window size) Co-authored-by: Omar <180954465+omardotdev@users.noreply.github.com> Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/3847 Reviewed-by: crueter Reviewed-by: Lizzie Co-authored-by: omardotdev Co-committed-by: omardotdev --- src/common/settings.h | 6 +++--- src/qt_common/config/shared_translation.cpp | 3 --- src/yuzu/configuration/configure_debug.cpp | 4 ++++ 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/common/settings.h b/src/common/settings.h index bec1e93e79..ca61ac906e 100644 --- a/src/common/settings.h +++ b/src/common/settings.h @@ -636,8 +636,8 @@ struct Values { Category::System}; SwitchableSetting region_index{linkage, Region::Usa, "region_index", Category::System}; SwitchableSetting time_zone_index{linkage, TimeZone::Auto, "time_zone_index", Category::System}; - Setting serial_battery{linkage, 0, "serial_battery", Category::System}; - Setting serial_unit{linkage, 0, "serial_unit", Category::System}; + Setting serial_battery{linkage, 0, "serial_battery", Category::Debugging}; + Setting serial_unit{linkage, 0, "serial_unit", Category::Debugging}; // Measured in seconds since epoch SwitchableSetting custom_rtc_enabled{linkage, false, "custom_rtc_enabled", Category::System, Specialization::Paired, true, true}; SwitchableSetting custom_rtc{ @@ -807,7 +807,7 @@ struct Values { 0, 65535, "debug_knobs", - Category::Core, + Category::Debugging, Specialization::Countable, true, true}; diff --git a/src/qt_common/config/shared_translation.cpp b/src/qt_common/config/shared_translation.cpp index 670c1ba0d6..2bcaf416df 100644 --- a/src/qt_common/config/shared_translation.cpp +++ b/src/qt_common/config/shared_translation.cpp @@ -317,9 +317,6 @@ std::unique_ptr InitializeTranslations(QObject* parent) { "their resolution, details and supported controllers and depending on this setting.\n" "Setting to Handheld can help improve performance for low end systems.")); INSERT(Settings, current_user, QString(), QString()); - INSERT(Settings, serial_unit, tr("Unit Serial"), QString()); - INSERT(Settings, serial_battery, tr("Battery Serial"), QString()); - INSERT(Settings, debug_knobs, tr("Debug knobs"), QString()); // Controls diff --git a/src/yuzu/configuration/configure_debug.cpp b/src/yuzu/configuration/configure_debug.cpp index fadaf1c01a..9db48c084b 100644 --- a/src/yuzu/configuration/configure_debug.cpp +++ b/src/yuzu/configuration/configure_debug.cpp @@ -51,6 +51,8 @@ void ConfigureDebug::SetConfiguration() { ui->enable_all_controllers->setChecked(Settings::values.enable_all_controllers.GetValue()); ui->extended_logging->setChecked(Settings::values.extended_logging.GetValue()); ui->perform_vulkan_check->setChecked(Settings::values.perform_vulkan_check.GetValue()); + ui->serial_battery_edit->setText(QString::fromStdString(std::to_string(Settings::values.serial_battery.GetValue()))); + ui->serial_board_edit->setText(QString::fromStdString(std::to_string(Settings::values.serial_unit.GetValue()))); #ifdef YUZU_USE_QT_WEB_ENGINE ui->disable_web_applet->setChecked(Settings::values.disable_web_applet.GetValue()); #else @@ -126,6 +128,8 @@ void ConfigureDebug::ApplyConfiguration() { Settings::values.extended_logging = ui->extended_logging->isChecked(); Settings::values.perform_vulkan_check = ui->perform_vulkan_check->isChecked(); Settings::values.disable_web_applet = ui->disable_web_applet->isChecked(); + Settings::values.serial_battery = ui->serial_battery_edit->text().toUInt(); + Settings::values.serial_unit = ui->serial_board_edit->text().toUInt(); Settings::values.debug_knobs = ui->debug_knobs_spinbox->value(); Debugger::ToggleConsole(); Common::Log::Filter filter;