From 827082c5ac30ff488016d168e3ca93021eb612e4 Mon Sep 17 00:00:00 2001 From: lat9nq <22451773+lat9nq@users.noreply.github.com> Date: Tue, 9 May 2023 01:38:01 -0400 Subject: [PATCH] configure_general: Generate UI using containers This leaves per-game config's General tab empty? --- src/yuzu/configuration/configure_dialog.cpp | 2 +- src/yuzu/configuration/configure_general.cpp | 105 ++++-------------- src/yuzu/configuration/configure_general.h | 8 +- src/yuzu/configuration/configure_general.ui | 87 +++------------ src/yuzu/configuration/configure_per_game.cpp | 2 +- 5 files changed, 41 insertions(+), 163 deletions(-) diff --git a/src/yuzu/configuration/configure_dialog.cpp b/src/yuzu/configuration/configure_dialog.cpp index 5b356a074a..8baa8de1e4 100644 --- a/src/yuzu/configuration/configure_dialog.cpp +++ b/src/yuzu/configuration/configure_dialog.cpp @@ -38,7 +38,7 @@ ConfigureDialog::ConfigureDialog(QWidget* parent, HotkeyRegistry& registry_, cpu_tab{std::make_unique(system_, nullptr, this)}, debug_tab_tab{std::make_unique(system_, this)}, filesystem_tab{std::make_unique(this)}, - general_tab{std::make_unique(system_, nullptr, this)}, + general_tab{std::make_unique(system_, nullptr, *translations, this)}, graphics_advanced_tab{ std::make_unique(system_, nullptr, *translations, this)}, graphics_tab{std::make_unique( diff --git a/src/yuzu/configuration/configure_general.cpp b/src/yuzu/configuration/configure_general.cpp index 764ff68b38..743ea824cd 100644 --- a/src/yuzu/configuration/configure_general.cpp +++ b/src/yuzu/configuration/configure_general.cpp @@ -9,23 +9,19 @@ #include "ui_configure_general.h" #include "yuzu/configuration/configuration_shared.h" #include "yuzu/configuration/configure_general.h" +#include "yuzu/configuration/shared_widget.h" #include "yuzu/uisettings.h" ConfigureGeneral::ConfigureGeneral( const Core::System& system_, - std::shared_ptr> group, QWidget* parent) - : Tab(group, parent), ui{std::make_unique()}, system{system_} { + std::shared_ptr> group, + const ConfigurationShared::TranslationMap& translations_, QWidget* parent) + : Tab(group, parent), ui{std::make_unique()}, system{system_}, + translations{translations_} { ui->setupUi(this); - SetupPerGameUI(); - SetConfiguration(); - // if (Settings::IsConfiguringGlobal()) { - // connect(ui->toggle_speed_limit, &QCheckBox::clicked, ui->speed_limit, - // [this]() { ui->speed_limit->setEnabled(ui->toggle_speed_limit->isChecked()); }); - // } - connect(ui->button_reset_defaults, &QPushButton::clicked, this, &ConfigureGeneral::ResetDefaults); } @@ -34,29 +30,20 @@ ConfigureGeneral::~ConfigureGeneral() = default; void ConfigureGeneral::SetConfiguration() { const bool runtime_lock = !system.IsPoweredOn(); + QLayout& layout = *ui->general_widget->layout(); - ui->use_multi_core->setEnabled(runtime_lock); - ui->use_multi_core->setChecked(Settings::values.use_multi_core.GetValue()); + for (const auto setting : + UISettings::values.linkage.by_category[Settings::Category::UiGeneral]) { + ConfigurationShared::Widget* widget = + new ConfigurationShared::Widget(setting, translations, this, runtime_lock, apply_funcs); - ui->toggle_check_exit->setChecked(UISettings::values.confirm_before_closing.GetValue()); - ui->toggle_user_on_boot->setChecked(UISettings::values.select_user_on_boot.GetValue()); - ui->toggle_background_pause->setChecked(UISettings::values.pause_when_in_background.GetValue()); - ui->toggle_hide_mouse->setChecked(UISettings::values.hide_mouse.GetValue()); - ui->toggle_controller_applet_disabled->setEnabled(runtime_lock); - ui->toggle_controller_applet_disabled->setChecked( - UISettings::values.controller_applet_disabled.GetValue()); + if (!widget->Valid()) { + delete widget; + continue; + } - // ui->toggle_speed_limit->setChecked(Settings::values.use_speed_limit.GetValue()); - // ui->speed_limit->setValue(Settings::values.speed_limit.GetValue()); - - ui->button_reset_defaults->setEnabled(runtime_lock); - - // if (Settings::IsConfiguringGlobal()) { - // ui->speed_limit->setEnabled(Settings::values.use_speed_limit.GetValue()); - // } else { - // ui->speed_limit->setEnabled(Settings::values.use_speed_limit.GetValue() && - // use_speed_limit != ConfigurationShared::CheckState::Global); - // } + layout.addWidget(widget); + } } // Called to set the callback when resetting settings to defaults @@ -79,32 +66,9 @@ void ConfigureGeneral::ResetDefaults() { } void ConfigureGeneral::ApplyConfiguration() { - ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_multi_core, ui->use_multi_core, - use_multi_core); - - if (Settings::IsConfiguringGlobal()) { - UISettings::values.confirm_before_closing = ui->toggle_check_exit->isChecked(); - UISettings::values.select_user_on_boot = ui->toggle_user_on_boot->isChecked(); - UISettings::values.pause_when_in_background = ui->toggle_background_pause->isChecked(); - UISettings::values.hide_mouse = ui->toggle_hide_mouse->isChecked(); - UISettings::values.controller_applet_disabled = - ui->toggle_controller_applet_disabled->isChecked(); - - // Guard if during game and set to game-specific value - // if (Settings::values.use_speed_limit.UsingGlobal()) { - // Settings::values.use_speed_limit.SetValue(ui->toggle_speed_limit->checkState() == - // Qt::Checked); - // Settings::values.speed_limit.SetValue(ui->speed_limit->value()); - // } - } else { - // bool global_speed_limit = use_speed_limit == ConfigurationShared::CheckState::Global; - // Settings::values.use_speed_limit.SetGlobal(global_speed_limit); - // Settings::values.speed_limit.SetGlobal(global_speed_limit); - // if (!global_speed_limit) { - // Settings::values.use_speed_limit.SetValue(ui->toggle_speed_limit->checkState() == - // Qt::Checked); - // Settings::values.speed_limit.SetValue(ui->speed_limit->value()); - // } + bool powered_on = system.IsPoweredOn(); + for (const auto& func : apply_funcs) { + func(powered_on); } } @@ -119,34 +83,3 @@ void ConfigureGeneral::changeEvent(QEvent* event) { void ConfigureGeneral::RetranslateUI() { ui->retranslateUi(this); } - -void ConfigureGeneral::SetupPerGameUI() { - if (Settings::IsConfiguringGlobal()) { - // Disables each setting if: - // - A game is running (thus settings in use), and - // - A non-global setting is applied. - // ui->toggle_speed_limit->setEnabled(Settings::values.use_speed_limit.UsingGlobal()); - // ui->speed_limit->setEnabled(Settings::values.speed_limit.UsingGlobal()); - - return; - } - - ui->toggle_check_exit->setVisible(false); - ui->toggle_user_on_boot->setVisible(false); - ui->toggle_background_pause->setVisible(false); - ui->toggle_hide_mouse->setVisible(false); - ui->toggle_controller_applet_disabled->setVisible(false); - - ui->button_reset_defaults->setVisible(false); - - // ConfigurationShared::SetColoredTristate(ui->toggle_speed_limit, - // Settings::values.use_speed_limit, use_speed_limit); - ConfigurationShared::SetColoredTristate(ui->use_multi_core, Settings::values.use_multi_core, - use_multi_core); - - // connect(ui->toggle_speed_limit, &QCheckBox::clicked, ui->speed_limit, [this]() { - // ui->speed_limit->setEnabled(ui->toggle_speed_limit->isChecked() && - // (use_speed_limit != - // ConfigurationShared::CheckState::Global)); - // }); -} diff --git a/src/yuzu/configuration/configure_general.h b/src/yuzu/configuration/configure_general.h index 0aad69f0a7..7692c16daa 100644 --- a/src/yuzu/configuration/configure_general.h +++ b/src/yuzu/configuration/configure_general.h @@ -7,6 +7,7 @@ #include #include #include "yuzu/configuration/configuration_shared.h" +#include "yuzu/configuration/shared_widget.h" namespace Core { class System; @@ -23,6 +24,7 @@ class ConfigureGeneral : public ConfigurationShared::Tab { public: explicit ConfigureGeneral(const Core::System& system_, std::shared_ptr> group, + const ConfigurationShared::TranslationMap& translations_, QWidget* parent = nullptr); ~ConfigureGeneral() override; @@ -35,14 +37,12 @@ private: void changeEvent(QEvent* event) override; void RetranslateUI(); - void SetupPerGameUI(); - std::function reset_callback; std::unique_ptr ui; - ConfigurationShared::CheckState use_speed_limit; - ConfigurationShared::CheckState use_multi_core; + std::forward_list> apply_funcs{}; const Core::System& system; + const ConfigurationShared::TranslationMap& translations; }; diff --git a/src/yuzu/configuration/configure_general.ui b/src/yuzu/configuration/configure_general.ui index fe757d011e..a10e7d3a50 100644 --- a/src/yuzu/configuration/configure_general.ui +++ b/src/yuzu/configuration/configure_general.ui @@ -26,77 +26,22 @@ - - - - - - - Limit Speed Percent - - - - - - - % - - - 1 - - - 9999 - - - 100 - - - - - - - - - Multicore CPU Emulation - - - - - - - Confirm exit while emulation is running - - - - - - - Prompt for user on game boot - - - - - - - Pause emulation when in background - - - - - - - Hide mouse on inactivity - - - - - - - Disable controller applet - - - - + + + + 0 + + + 0 + + + 0 + + + 0 + + + diff --git a/src/yuzu/configuration/configure_per_game.cpp b/src/yuzu/configuration/configure_per_game.cpp index 9e229977d8..05da9bda00 100644 --- a/src/yuzu/configuration/configure_per_game.cpp +++ b/src/yuzu/configuration/configure_per_game.cpp @@ -53,7 +53,7 @@ ConfigurePerGame::ConfigurePerGame(QWidget* parent, u64 title_id_, const std::st addons_tab = std::make_unique(system_, this); audio_tab = std::make_unique(system_, tab_group, this); cpu_tab = std::make_unique(system_, tab_group, this); - general_tab = std::make_unique(system_, tab_group, this); + general_tab = std::make_unique(system_, tab_group, *translations, this); graphics_advanced_tab = std::make_unique(system_, tab_group, *translations, this); graphics_tab = std::make_unique(