mirror of
https://git.eden-emu.dev/eden-emu/eden.git
synced 2026-06-06 01:13:45 -04:00
[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 <crueter@eden-emu.dev> Reviewed-by: Lizzie <lizzie@eden-emu.dev> Co-authored-by: omardotdev <omardotdev@eden-emu.dev> Co-committed-by: omardotdev <omardotdev@eden-emu.dev>
This commit is contained in:
parent
f11b69d6b7
commit
e6ad51e3d5
3 changed files with 7 additions and 6 deletions
|
|
@ -636,8 +636,8 @@ struct Values {
|
||||||
Category::System};
|
Category::System};
|
||||||
SwitchableSetting<Region, true> region_index{linkage, Region::Usa, "region_index", Category::System};
|
SwitchableSetting<Region, true> region_index{linkage, Region::Usa, "region_index", Category::System};
|
||||||
SwitchableSetting<TimeZone, true> time_zone_index{linkage, TimeZone::Auto, "time_zone_index", Category::System};
|
SwitchableSetting<TimeZone, true> time_zone_index{linkage, TimeZone::Auto, "time_zone_index", Category::System};
|
||||||
Setting<u32> serial_battery{linkage, 0, "serial_battery", Category::System};
|
Setting<u32> serial_battery{linkage, 0, "serial_battery", Category::Debugging};
|
||||||
Setting<u32> serial_unit{linkage, 0, "serial_unit", Category::System};
|
Setting<u32> serial_unit{linkage, 0, "serial_unit", Category::Debugging};
|
||||||
// Measured in seconds since epoch
|
// Measured in seconds since epoch
|
||||||
SwitchableSetting<bool> custom_rtc_enabled{linkage, false, "custom_rtc_enabled", Category::System, Specialization::Paired, true, true};
|
SwitchableSetting<bool> custom_rtc_enabled{linkage, false, "custom_rtc_enabled", Category::System, Specialization::Paired, true, true};
|
||||||
SwitchableSetting<s64> custom_rtc{
|
SwitchableSetting<s64> custom_rtc{
|
||||||
|
|
@ -807,7 +807,7 @@ struct Values {
|
||||||
0,
|
0,
|
||||||
65535,
|
65535,
|
||||||
"debug_knobs",
|
"debug_knobs",
|
||||||
Category::Core,
|
Category::Debugging,
|
||||||
Specialization::Countable,
|
Specialization::Countable,
|
||||||
true,
|
true,
|
||||||
true};
|
true};
|
||||||
|
|
|
||||||
|
|
@ -317,9 +317,6 @@ std::unique_ptr<TranslationMap> InitializeTranslations(QObject* parent) {
|
||||||
"their resolution, details and supported controllers and depending on this setting.\n"
|
"their resolution, details and supported controllers and depending on this setting.\n"
|
||||||
"Setting to Handheld can help improve performance for low end systems."));
|
"Setting to Handheld can help improve performance for low end systems."));
|
||||||
INSERT(Settings, current_user, QString(), QString());
|
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
|
// Controls
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -51,6 +51,8 @@ void ConfigureDebug::SetConfiguration() {
|
||||||
ui->enable_all_controllers->setChecked(Settings::values.enable_all_controllers.GetValue());
|
ui->enable_all_controllers->setChecked(Settings::values.enable_all_controllers.GetValue());
|
||||||
ui->extended_logging->setChecked(Settings::values.extended_logging.GetValue());
|
ui->extended_logging->setChecked(Settings::values.extended_logging.GetValue());
|
||||||
ui->perform_vulkan_check->setChecked(Settings::values.perform_vulkan_check.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
|
#ifdef YUZU_USE_QT_WEB_ENGINE
|
||||||
ui->disable_web_applet->setChecked(Settings::values.disable_web_applet.GetValue());
|
ui->disable_web_applet->setChecked(Settings::values.disable_web_applet.GetValue());
|
||||||
#else
|
#else
|
||||||
|
|
@ -126,6 +128,8 @@ void ConfigureDebug::ApplyConfiguration() {
|
||||||
Settings::values.extended_logging = ui->extended_logging->isChecked();
|
Settings::values.extended_logging = ui->extended_logging->isChecked();
|
||||||
Settings::values.perform_vulkan_check = ui->perform_vulkan_check->isChecked();
|
Settings::values.perform_vulkan_check = ui->perform_vulkan_check->isChecked();
|
||||||
Settings::values.disable_web_applet = ui->disable_web_applet->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();
|
Settings::values.debug_knobs = ui->debug_knobs_spinbox->value();
|
||||||
Debugger::ToggleConsole();
|
Debugger::ToggleConsole();
|
||||||
Common::Log::Filter filter;
|
Common::Log::Filter filter;
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue