diff options
| author | 2021-05-25 20:48:02 -0400 | |
|---|---|---|
| committer | 2021-06-01 17:09:33 -0400 | |
| commit | 8aeb42566968053d1a74f50f8453930cfdf2c42c (patch) | |
| tree | a301ddf950e14281e1d42daeda1cf102d678684e /src | |
| parent | Merge pull request #6396 from lat9nq/mingw-sdl-fix (diff) | |
| download | yuzu-8aeb42566968053d1a74f50f8453930cfdf2c42c.tar.gz yuzu-8aeb42566968053d1a74f50f8453930cfdf2c42c.tar.xz yuzu-8aeb42566968053d1a74f50f8453930cfdf2c42c.zip | |
configuration: Initial work to reset all settings
This commit does not compile.
Initial work to add and connect a Reset to Defaults button to the
configure_general tab.
Co-authored-by: german77 <juangerman-13@hotmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/yuzu/configuration/config.cpp | 6 | ||||
| -rw-r--r-- | src/yuzu/configuration/config.h | 1 | ||||
| -rw-r--r-- | src/yuzu/configuration/configure_general.cpp | 14 | ||||
| -rw-r--r-- | src/yuzu/configuration/configure_general.h | 1 | ||||
| -rw-r--r-- | src/yuzu/configuration/configure_general.ui | 7 | ||||
| -rw-r--r-- | src/yuzu/main.cpp | 4 |
6 files changed, 33 insertions, 0 deletions
diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp index eb58bfa5b..0ea508acd 100644 --- a/src/yuzu/configuration/config.cpp +++ b/src/yuzu/configuration/config.cpp | |||
| @@ -1632,6 +1632,12 @@ void Config::Save() { | |||
| 1632 | SaveValues(); | 1632 | SaveValues(); |
| 1633 | } | 1633 | } |
| 1634 | 1634 | ||
| 1635 | void Config::ResetDefaults() { | ||
| 1636 | FS::Delete(qt_config_loc); | ||
| 1637 | FS::CreateFullPath(qt_config_loc); | ||
| 1638 | Reload(); | ||
| 1639 | } | ||
| 1640 | |||
| 1635 | void Config::ReadControlPlayerValue(std::size_t player_index) { | 1641 | void Config::ReadControlPlayerValue(std::size_t player_index) { |
| 1636 | qt_config->beginGroup(QStringLiteral("Controls")); | 1642 | qt_config->beginGroup(QStringLiteral("Controls")); |
| 1637 | ReadPlayerValue(player_index); | 1643 | ReadPlayerValue(player_index); |
diff --git a/src/yuzu/configuration/config.h b/src/yuzu/configuration/config.h index ce3355588..cd68d7b4d 100644 --- a/src/yuzu/configuration/config.h +++ b/src/yuzu/configuration/config.h | |||
| @@ -28,6 +28,7 @@ public: | |||
| 28 | 28 | ||
| 29 | void Reload(); | 29 | void Reload(); |
| 30 | void Save(); | 30 | void Save(); |
| 31 | void ResetDefaults(); | ||
| 31 | 32 | ||
| 32 | void ReadControlPlayerValue(std::size_t player_index); | 33 | void ReadControlPlayerValue(std::size_t player_index); |
| 33 | void SaveControlPlayerValue(std::size_t player_index); | 34 | void SaveControlPlayerValue(std::size_t player_index); |
diff --git a/src/yuzu/configuration/configure_general.cpp b/src/yuzu/configuration/configure_general.cpp index 55a6a37bd..a107cd3e1 100644 --- a/src/yuzu/configuration/configure_general.cpp +++ b/src/yuzu/configuration/configure_general.cpp | |||
| @@ -4,11 +4,13 @@ | |||
| 4 | 4 | ||
| 5 | #include <QCheckBox> | 5 | #include <QCheckBox> |
| 6 | #include <QSpinBox> | 6 | #include <QSpinBox> |
| 7 | #include <QMessageBox> | ||
| 7 | #include "common/settings.h" | 8 | #include "common/settings.h" |
| 8 | #include "core/core.h" | 9 | #include "core/core.h" |
| 9 | #include "ui_configure_general.h" | 10 | #include "ui_configure_general.h" |
| 10 | #include "yuzu/configuration/configuration_shared.h" | 11 | #include "yuzu/configuration/configuration_shared.h" |
| 11 | #include "yuzu/configuration/configure_general.h" | 12 | #include "yuzu/configuration/configure_general.h" |
| 13 | #include "yuzu/configuration/config.h" | ||
| 12 | #include "yuzu/uisettings.h" | 14 | #include "yuzu/uisettings.h" |
| 13 | 15 | ||
| 14 | ConfigureGeneral::ConfigureGeneral(QWidget* parent) | 16 | ConfigureGeneral::ConfigureGeneral(QWidget* parent) |
| @@ -23,6 +25,9 @@ ConfigureGeneral::ConfigureGeneral(QWidget* parent) | |||
| 23 | connect(ui->toggle_frame_limit, &QCheckBox::clicked, ui->frame_limit, | 25 | connect(ui->toggle_frame_limit, &QCheckBox::clicked, ui->frame_limit, |
| 24 | [this]() { ui->frame_limit->setEnabled(ui->toggle_frame_limit->isChecked()); }); | 26 | [this]() { ui->frame_limit->setEnabled(ui->toggle_frame_limit->isChecked()); }); |
| 25 | } | 27 | } |
| 28 | |||
| 29 | connect(ui->button_reset_defaults, &QPushButton::clicked, this, | ||
| 30 | &ConfigureGeneral::ResetDefaults); | ||
| 26 | } | 31 | } |
| 27 | 32 | ||
| 28 | ConfigureGeneral::~ConfigureGeneral() = default; | 33 | ConfigureGeneral::~ConfigureGeneral() = default; |
| @@ -49,6 +54,15 @@ void ConfigureGeneral::SetConfiguration() { | |||
| 49 | } | 54 | } |
| 50 | } | 55 | } |
| 51 | 56 | ||
| 57 | void ConfigureGeneral::ResetDefaults() { | ||
| 58 | QMessageBox::StandardButton answer = QMessageBox::question( | ||
| 59 | this, tr("yuzu"), tr("Are you sure you want to <b>reset your settings</b>?"), | ||
| 60 | QMessageBox::Yes | QMessageBox::No, QMessageBox::No); | ||
| 61 | if (answer == QMessageBox::No) | ||
| 62 | return; | ||
| 63 | UISettings::values. | ||
| 64 | } | ||
| 65 | |||
| 52 | void ConfigureGeneral::ApplyConfiguration() { | 66 | void ConfigureGeneral::ApplyConfiguration() { |
| 53 | ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_multi_core, ui->use_multi_core, | 67 | ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_multi_core, ui->use_multi_core, |
| 54 | use_multi_core); | 68 | use_multi_core); |
diff --git a/src/yuzu/configuration/configure_general.h b/src/yuzu/configuration/configure_general.h index 323ffbd8f..3d8a1dae0 100644 --- a/src/yuzu/configuration/configure_general.h +++ b/src/yuzu/configuration/configure_general.h | |||
| @@ -24,6 +24,7 @@ public: | |||
| 24 | explicit ConfigureGeneral(QWidget* parent = nullptr); | 24 | explicit ConfigureGeneral(QWidget* parent = nullptr); |
| 25 | ~ConfigureGeneral() override; | 25 | ~ConfigureGeneral() override; |
| 26 | 26 | ||
| 27 | void ResetDefaults(); | ||
| 27 | void ApplyConfiguration(); | 28 | void ApplyConfiguration(); |
| 28 | 29 | ||
| 29 | private: | 30 | private: |
diff --git a/src/yuzu/configuration/configure_general.ui b/src/yuzu/configuration/configure_general.ui index 2711116a2..ae8ed5ca5 100644 --- a/src/yuzu/configuration/configure_general.ui +++ b/src/yuzu/configuration/configure_general.ui | |||
| @@ -91,6 +91,13 @@ | |||
| 91 | </layout> | 91 | </layout> |
| 92 | </widget> | 92 | </widget> |
| 93 | </item> | 93 | </item> |
| 94 | <item alignment="Qt::AlignRight"> | ||
| 95 | <widget class="QPushButton" name="button_reset_defaults"> | ||
| 96 | <property name="text"> | ||
| 97 | <string>Reset All Settings</string> | ||
| 98 | </property> | ||
| 99 | </widget> | ||
| 100 | </item> | ||
| 94 | <item> | 101 | <item> |
| 95 | <spacer name="verticalSpacer"> | 102 | <spacer name="verticalSpacer"> |
| 96 | <property name="orientation"> | 103 | <property name="orientation"> |
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 0f0e228b0..838bb6926 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp | |||
| @@ -2593,7 +2593,11 @@ void GMainWindow::OnConfigure() { | |||
| 2593 | configure_dialog.ApplyConfiguration(); | 2593 | configure_dialog.ApplyConfiguration(); |
| 2594 | controller_dialog->refreshConfiguration(); | 2594 | controller_dialog->refreshConfiguration(); |
| 2595 | } | 2595 | } |
| 2596 | |||
| 2597 | configure_dialog.ApplyConfiguration(); | ||
| 2598 | controller_dialog->refreshConfiguration(); | ||
| 2596 | InitializeHotkeys(); | 2599 | InitializeHotkeys(); |
| 2600 | |||
| 2597 | if (UISettings::values.theme != old_theme) { | 2601 | if (UISettings::values.theme != old_theme) { |
| 2598 | UpdateUITheme(); | 2602 | UpdateUITheme(); |
| 2599 | } | 2603 | } |