diff options
author | yuzubot <yuzu@yuzu-emu.org> | 2023-07-25 17:38:12 +0000 |
---|---|---|
committer | yuzubot <yuzu@yuzu-emu.org> | 2023-07-25 17:38:12 +0000 |
commit | fc1ab2564e53004ee4c35741662eec0d2149ec75 (patch) | |
tree | 7b5117d787b4bae47474296235c805665cd1ef24 /src/yuzu/configuration/configure_general.h | |
parent | 821d5eb1176eea180d8f84fb9c6c9a58ff845f39 (diff) |
"Merge Tagged PR 10839"mainline-0-1507
Diffstat (limited to 'src/yuzu/configuration/configure_general.h')
-rw-r--r-- | src/yuzu/configuration/configure_general.h | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/src/yuzu/configuration/configure_general.h b/src/yuzu/configuration/configure_general.h index 7ff63f4253..2d953f6793 100644 --- a/src/yuzu/configuration/configure_general.h +++ b/src/yuzu/configuration/configure_general.h @@ -5,48 +5,49 @@ #include <functional> #include <memory> +#include <vector> #include <QWidget> +#include "yuzu/configuration/configuration_shared.h" namespace Core { class System; } class ConfigureDialog; - -namespace ConfigurationShared { -enum class CheckState; -} - class HotkeyRegistry; namespace Ui { class ConfigureGeneral; } -class ConfigureGeneral : public QWidget { - Q_OBJECT +namespace ConfigurationShared { +class Builder; +} +class ConfigureGeneral : public ConfigurationShared::Tab { public: - explicit ConfigureGeneral(const Core::System& system_, QWidget* parent = nullptr); + explicit ConfigureGeneral(const Core::System& system_, + std::shared_ptr<std::vector<ConfigurationShared::Tab*>> group, + const ConfigurationShared::Builder& builder, + QWidget* parent = nullptr); ~ConfigureGeneral() override; void SetResetCallback(std::function<void()> callback); void ResetDefaults(); - void ApplyConfiguration(); - void SetConfiguration(); + void ApplyConfiguration() override; + void SetConfiguration() override; private: + void Setup(const ConfigurationShared::Builder& builder); + void changeEvent(QEvent* event) override; void RetranslateUI(); - void SetupPerGameUI(); - std::function<void()> reset_callback; std::unique_ptr<Ui::ConfigureGeneral> ui; - ConfigurationShared::CheckState use_speed_limit; - ConfigurationShared::CheckState use_multi_core; + std::vector<std::function<void(bool)>> apply_funcs{}; const Core::System& system; }; |