WiiPane: Use ConfigControls where applicable

Source/Core/DolphinQt/Config/ConfigControls/ConfigChoice.cpp

@@ -25,6 +25,26 @@ void ConfigChoice::OnConfigChanged()
   setCurrentIndex(ReadValue(m_setting));
 }
 
+ConfigChoiceU32::ConfigChoiceU32(const QStringList& options, const Config::Info<u32>& setting,
+                                 Config::Layer* layer)
+    : ConfigControl(setting.GetLocation(), layer), m_setting(setting)
+{
+  addItems(options);
+  setCurrentIndex(ReadValue(setting));
+
+  connect(this, &QComboBox::currentIndexChanged, this, &ConfigChoiceU32::Update);
+}
+
+void ConfigChoiceU32::Update(int choice)
+{
+  SaveValue(m_setting, (u32)choice);
+}
+
+void ConfigChoiceU32::OnConfigChanged()
+{
+  setCurrentIndex(ReadValue(m_setting));
+}
+
 ConfigStringChoice::ConfigStringChoice(const std::vector<std::string>& options,
                                        const Config::Info<std::string>& setting,
                                        Config::Layer* layer)

Source/Core/DolphinQt/Config/ConfigControls/ConfigChoice.h

@@ -28,6 +28,59 @@ private:
   Config::Info<int> m_setting;
 };
 
+class ConfigChoiceU32 final : public ConfigControl<ToolTipComboBox>
+{
+  Q_OBJECT
+public:
+  ConfigChoiceU32(const QStringList& options, const Config::Info<u32>& setting,
+                  Config::Layer* layer = nullptr);
+
+protected:
+  void OnConfigChanged() override;
+
+private:
+  void Update(int choice);
+
+  Config::Info<u32> m_setting;
+};
+
+template <typename T>
+class ConfigChoiceMap final : public ConfigControl<ToolTipComboBox>
+{
+public:
+  ConfigChoiceMap(const std::vector<std::pair<QString, T>>& options, const Config::Info<T>& setting,
+                  Config::Layer* layer = nullptr)
+      : ConfigControl<ToolTipComboBox>(setting.GetLocation(), layer), m_setting(setting),
+        m_options(options)
+  {
+    for (const auto& [option_text, option_data] : options)
+      addItem(option_text);
+
+    OnConfigChanged();
+    connect(this, &QComboBox::currentIndexChanged, this, &ConfigChoiceMap::Update);
+  }
+
+protected:
+  void OnConfigChanged() override
+  {
+    const T value = ReadValue(m_setting);
+    const auto it = std::find_if(m_options.begin(), m_options.end(),
+                                 [&value](const auto& pair) { return pair.second == value; });
+
+    int index =
+        (it != m_options.end()) ? static_cast<int>(std::distance(m_options.begin(), it)) : -1;
+
+    const QSignalBlocker blocker(this);
+    setCurrentIndex(index);
+  }
+
+private:
+  void Update(int choice) { SaveValue(m_setting, m_options[choice].second); }
+
+  const Config::Info<T> m_setting;
+  const std::vector<std::pair<QString, T>> m_options;
+};
+
 class ConfigStringChoice final : public ConfigControl<ToolTipComboBox>
 {
   Q_OBJECT

Source/Core/DolphinQt/Settings.cpp

@@ -773,10 +773,7 @@ bool Settings::IsSDCardInserted() const
 void Settings::SetSDCardInserted(bool inserted)
 {
   if (IsSDCardInserted() != inserted)
-  {
     Config::SetBaseOrCurrent(Config::MAIN_WII_SD_CARD, inserted);
-    emit SDCardInsertionChanged(inserted);
-  }
 }
 
 bool Settings::IsUSBKeyboardConnected() const
@@ -787,10 +784,7 @@ bool Settings::IsUSBKeyboardConnected() const
 void Settings::SetUSBKeyboardConnected(bool connected)
 {
   if (IsUSBKeyboardConnected() != connected)
-  {
     Config::SetBaseOrCurrent(Config::MAIN_WII_KEYBOARD, connected);
-    emit USBKeyboardConnectionChanged(connected);
-  }
 }
 
 bool Settings::IsWiiSpeakMuted() const

Source/Core/DolphinQt/Settings.h

@@ -223,8 +223,6 @@ signals:
   void AnalyticsToggled(bool enabled);
   void ReleaseDevices();
   void DevicesChanged();
-  void SDCardInsertionChanged(bool inserted);
-  void USBKeyboardConnectionChanged(bool connected);
   void WiiSpeakMuteChanged(bool muted);
   void EnableGfxModsChanged(bool enabled);
 

Source/Core/DolphinQt/Settings/WiiPane.cpp

@@ -8,19 +8,14 @@
 #include <optional>
 #include <utility>
 
-#include <QCheckBox>
-#include <QComboBox>
 #include <QDir>
 #include <QGridLayout>
 #include <QGroupBox>
 #include <QHBoxLayout>
 #include <QLabel>
-#include <QLineEdit>
 #include <QListWidget>
 #include <QPushButton>
-#include <QSlider>
 #include <QSpacerItem>
-#include <QStringList>
 
 #include "Common/Config/Config.h"
 #include "Common/FatFsUtil.h"
@@ -33,29 +28,18 @@
 #include "Core/System.h"
 #include "Core/USBUtils.h"
 
+#include "DolphinQt/Config/ConfigControls/ConfigBool.h"
+#include "DolphinQt/Config/ConfigControls/ConfigChoice.h"
+#include "DolphinQt/Config/ConfigControls/ConfigSlider.h"
+#include "DolphinQt/Config/ConfigControls/ConfigUserPath.h"
 #include "DolphinQt/QtUtils/DolphinFileDialog.h"
 #include "DolphinQt/QtUtils/ModalMessageBox.h"
 #include "DolphinQt/QtUtils/NonDefaultQPushButton.h"
 #include "DolphinQt/QtUtils/ParallelProgressDialog.h"
 #include "DolphinQt/QtUtils/QtUtils.h"
-#include "DolphinQt/QtUtils/SignalBlocking.h"
 #include "DolphinQt/Settings.h"
 #include "DolphinQt/Settings/USBDevicePicker.h"
 
-// SYSCONF uses 0 for bottom and 1 for top, but we place them in
-// the other order in the GUI so that Top will be above Bottom,
-// matching the respective physical placements of the sensor bar.
-// This also matches the layout of the settings in the Wii Menu.
-static int TranslateSensorBarPosition(int position)
-{
-  if (position == 0)
-    return 1;
-  if (position == 1)
-    return 0;
-
-  return position;
-}
-
 namespace
 {
 struct SDSizeComboEntry
@@ -89,7 +73,7 @@ constexpr std::array sd_size_combo_entries{
 WiiPane::WiiPane(QWidget* parent) : QWidget(parent)
 {
   CreateLayout();
-  LoadConfig();
+  PopulateUSBPassthroughListWidget();
   ConnectLayout();
   ValidateSelectionState();
   OnEmulationStateChanged(!Core::IsUninitialized(Core::System::GetInstance()));
@@ -106,39 +90,15 @@ void WiiPane::CreateLayout()
 
 void WiiPane::ConnectLayout()
 {
-  // Misc Settings
-  connect(m_aspect_ratio_choice, &QComboBox::currentIndexChanged, this, &WiiPane::OnSaveConfig);
-  connect(m_system_language_choice, &QComboBox::currentIndexChanged, this, &WiiPane::OnSaveConfig);
-  connect(m_sound_mode_choice, &QComboBox::currentIndexChanged, this, &WiiPane::OnSaveConfig);
-  connect(m_screensaver_checkbox, &QCheckBox::toggled, this, &WiiPane::OnSaveConfig);
-  connect(m_pal60_mode_checkbox, &QCheckBox::toggled, this, &WiiPane::OnSaveConfig);
-  connect(m_connect_keyboard_checkbox, &QCheckBox::toggled, this, &WiiPane::OnSaveConfig);
-  connect(&Settings::Instance(), &Settings::SDCardInsertionChanged, m_sd_card_checkbox,
-          &QCheckBox::setChecked);
-  connect(&Settings::Instance(), &Settings::USBKeyboardConnectionChanged,
-          m_connect_keyboard_checkbox, &QCheckBox::setChecked);
-  connect(m_wiilink_checkbox, &QCheckBox::toggled, this, &WiiPane::OnSaveConfig);
-
-  // SD Card Settings
-  connect(m_sd_card_checkbox, &QCheckBox::toggled, this, &WiiPane::OnSaveConfig);
-  connect(m_allow_sd_writes_checkbox, &QCheckBox::toggled, this, &WiiPane::OnSaveConfig);
-  connect(m_sync_sd_folder_checkbox, &QCheckBox::toggled, this, &WiiPane::OnSaveConfig);
-  connect(m_sd_card_size_combo, &QComboBox::currentIndexChanged, this, &WiiPane::OnSaveConfig);
-
   // Whitelisted USB Passthrough Devices
+  connect(&Settings::Instance(), &Settings::ConfigChanged, this,
+          &WiiPane::PopulateUSBPassthroughListWidget);
   connect(m_whitelist_usb_list, &QListWidget::itemClicked, this, &WiiPane::ValidateSelectionState);
   connect(m_whitelist_usb_add_button, &QPushButton::clicked, this,
           &WiiPane::OnUSBWhitelistAddButton);
   connect(m_whitelist_usb_remove_button, &QPushButton::clicked, this,
           &WiiPane::OnUSBWhitelistRemoveButton);
 
-  // Wii Remote Settings
-  connect(m_wiimote_ir_sensor_position, &QComboBox::currentIndexChanged, this,
-          &WiiPane::OnSaveConfig);
-  connect(m_wiimote_ir_sensitivity, &QSlider::valueChanged, this, &WiiPane::OnSaveConfig);
-  connect(m_wiimote_speaker_volume, &QSlider::valueChanged, this, &WiiPane::OnSaveConfig);
-  connect(m_wiimote_motor, &QCheckBox::toggled, this, &WiiPane::OnSaveConfig);
-
   // Emulation State
   connect(&Settings::Instance(), &Settings::EmulationStateChanged, this, [this](Core::State state) {
     OnEmulationStateChanged(state != Core::State::Uninitialized);
@@ -151,45 +111,44 @@ void WiiPane::CreateMisc()
   auto* misc_settings_group_layout = new QGridLayout();
   misc_settings_group->setLayout(misc_settings_group_layout);
   m_main_layout->addWidget(misc_settings_group);
-  m_pal60_mode_checkbox = new QCheckBox(tr("Use PAL60 Mode (EuRGB60)"));
+  m_pal60_mode_checkbox = new ConfigBool(tr("Use PAL60 Mode (EuRGB60)"), Config::SYSCONF_PAL60);
-  m_screensaver_checkbox = new QCheckBox(tr("Enable Screen Saver"));
+  m_screensaver_checkbox = new ConfigBool(tr("Enable Screen Saver"), Config::SYSCONF_SCREENSAVER);
-  m_wiilink_checkbox = new QCheckBox(tr("Enable WiiConnect24 via WiiLink"));
+  m_wiilink_checkbox =
-  m_connect_keyboard_checkbox = new QCheckBox(tr("Connect USB Keyboard"));
+      new ConfigBool(tr("Enable WiiConnect24 via WiiLink"), Config::MAIN_WII_WIILINK_ENABLE);
+  m_connect_keyboard_checkbox =
+      new ConfigBool(tr("Connect USB Keyboard"), Config::MAIN_WII_KEYBOARD);
 
   m_aspect_ratio_choice_label = new QLabel(tr("Aspect Ratio:"));
-  m_aspect_ratio_choice = new QComboBox();
+  m_aspect_ratio_choice = new ConfigChoiceMap<bool>({{tr("4:3"), false}, {tr("16:9"), true}},
-  m_aspect_ratio_choice->addItem(tr("4:3"));
+                                                    Config::SYSCONF_WIDESCREEN);
-  m_aspect_ratio_choice->addItem(tr("16:9"));
 
   m_system_language_choice_label = new QLabel(tr("System Language:"));
-  m_system_language_choice = new QComboBox();
+  m_system_language_choice = new ConfigChoiceU32(
-  m_system_language_choice->addItem(tr("Japanese"));
+      {tr("Japanese"), tr("English"), tr("German"), tr("French"), tr("Spanish"), tr("Italian"),
-  m_system_language_choice->addItem(tr("English"));
+       tr("Dutch"), tr("Simplified Chinese"), tr("Traditional Chinese"), tr("Korean")},
-  m_system_language_choice->addItem(tr("German"));
+      Config::SYSCONF_LANGUAGE);
-  m_system_language_choice->addItem(tr("French"));
-  m_system_language_choice->addItem(tr("Spanish"));
-  m_system_language_choice->addItem(tr("Italian"));
-  m_system_language_choice->addItem(tr("Dutch"));
-  m_system_language_choice->addItem(tr("Simplified Chinese"));
-  m_system_language_choice->addItem(tr("Traditional Chinese"));
-  m_system_language_choice->addItem(tr("Korean"));
 
   m_sound_mode_choice_label = new QLabel(tr("Sound:"));
-  m_sound_mode_choice = new QComboBox();
+  m_sound_mode_choice = new ConfigChoiceU32(
-  m_sound_mode_choice->addItem(tr("Mono"));
+      {// i18n: Mono audio
-  m_sound_mode_choice->addItem(tr("Stereo"));
+       tr("Mono"),
-  // i18n: Surround audio (Dolby Pro Logic II)
+       // i18n: Stereo audio
-  m_sound_mode_choice->addItem(tr("Surround"));
+       tr("Stereo"),
+       // i18n: Surround audio (Dolby Pro Logic II)
+       tr("Surround")},
+      Config::SYSCONF_SOUND_MODE);
 
-  m_pal60_mode_checkbox->setToolTip(tr("Sets the Wii display mode to 60Hz (480i) instead of 50Hz "
+  m_pal60_mode_checkbox->SetDescription(
-                                       "(576i) for PAL games.\nMay not work for all games."));
+      tr("Sets the Wii display mode to 60Hz (480i) instead of 50Hz "
-  m_screensaver_checkbox->setToolTip(tr("Dims the screen after five minutes of inactivity."));
+         "(576i) for PAL games.\nMay not work for all games."));
-  m_wiilink_checkbox->setToolTip(tr(
+  m_screensaver_checkbox->SetDescription(tr("Dims the screen after five minutes of inactivity."));
+  m_wiilink_checkbox->SetDescription(tr(
       "Enables the WiiLink service for WiiConnect24 channels.\nWiiLink is an alternate provider "
       "for the discontinued WiiConnect24 Channels such as the Forecast and Nintendo Channels\nRead "
       "the Terms of Service at: https://www.wiilink24.com/tos"));
-  m_system_language_choice->setToolTip(tr("Sets the Wii system language."));
+  m_system_language_choice->SetDescription(tr("Sets the Wii system language."));
-  m_connect_keyboard_checkbox->setToolTip(tr("May cause slow down in Wii Menu and some games."));
+  m_connect_keyboard_checkbox->SetDescription(
+      tr("May cause slow down in Wii Menu and some games."));
 
   misc_settings_group_layout->addWidget(m_pal60_mode_checkbox, 0, 0, 1, 1);
   misc_settings_group_layout->addWidget(m_connect_keyboard_checkbox, 0, 1, 1, 1);
@@ -211,18 +170,17 @@ void WiiPane::CreateSDCard()
   m_main_layout->addWidget(sd_settings_group);
 
   int row = 0;
-  m_sd_card_checkbox = new QCheckBox(tr("Insert SD Card"));
+  m_sd_card_checkbox = new ConfigBool(tr("Insert SD Card"), Config::MAIN_WII_SD_CARD);
-  m_sd_card_checkbox->setToolTip(tr("Supports SD and SDHC. Default size is 128 MB."));
+  m_sd_card_checkbox->SetDescription(tr("Supports SD and SDHC. Default size is 128 MB."));
-  m_allow_sd_writes_checkbox = new QCheckBox(tr("Allow Writes to SD Card"));
+  m_allow_sd_writes_checkbox =
+      new ConfigBool(tr("Allow Writes to SD Card"), Config::MAIN_ALLOW_SD_WRITES);
   sd_settings_group_layout->addWidget(m_sd_card_checkbox, row, 0, 1, 1);
   sd_settings_group_layout->addWidget(m_allow_sd_writes_checkbox, row, 1, 1, 1);
   ++row;
 
   {
     QHBoxLayout* hlayout = new QHBoxLayout;
-    m_sd_raw_edit = new QLineEdit(QString::fromStdString(File::GetUserPath(F_WIISDCARDIMAGE_IDX)));
+    m_sd_raw_edit = new ConfigUserPath(F_WIISDCARDIMAGE_IDX, Config::MAIN_WII_SD_CARD_IMAGE_PATH);
-    connect(m_sd_raw_edit, &QLineEdit::editingFinished,
-            [this] { SetSDRaw(m_sd_raw_edit->text()); });
     QPushButton* sdcard_open = new NonDefaultQPushButton(QStringLiteral("..."));
     connect(sdcard_open, &QPushButton::clicked, this, &WiiPane::BrowseSDRaw);
     hlayout->addWidget(new QLabel(tr("SD Card Path:")));
@@ -233,8 +191,9 @@ void WiiPane::CreateSDCard()
     ++row;
   }
 
-  m_sync_sd_folder_checkbox = new QCheckBox(tr("Automatically Sync with Folder"));
+  m_sync_sd_folder_checkbox = new ConfigBool(tr("Automatically Sync with Folder"),
-  m_sync_sd_folder_checkbox->setToolTip(
+                                             Config::MAIN_WII_SD_CARD_ENABLE_FOLDER_SYNC);
+  m_sync_sd_folder_checkbox->SetDescription(
       tr("Synchronizes the SD Card with the SD Sync Folder when starting and ending emulation."));
   sd_settings_group_layout->addWidget(m_sync_sd_folder_checkbox, row, 0, 1, 2);
   ++row;
@@ -242,9 +201,7 @@ void WiiPane::CreateSDCard()
   {
     QHBoxLayout* hlayout = new QHBoxLayout;
     m_sd_sync_folder_edit =
-        new QLineEdit(QString::fromStdString(File::GetUserPath(D_WIISDCARDSYNCFOLDER_IDX)));
+        new ConfigUserPath(D_WIISDCARDSYNCFOLDER_IDX, Config::MAIN_WII_SD_CARD_SYNC_FOLDER_PATH);
-    connect(m_sd_sync_folder_edit, &QLineEdit::editingFinished,
-            [this] { SetSDSyncFolder(m_sd_sync_folder_edit->text()); });
     QPushButton* sdcard_open = new NonDefaultQPushButton(QStringLiteral("..."));
     connect(sdcard_open, &QPushButton::clicked, this, &WiiPane::BrowseSDSyncFolder);
     hlayout->addWidget(new QLabel(tr("SD Sync Folder:")));
@@ -255,9 +212,11 @@ void WiiPane::CreateSDCard()
     ++row;
   }
 
-  m_sd_card_size_combo = new QComboBox();
+  std::vector<std::pair<QString, u64>> sd_size_choices;
-  for (size_t i = 0; i < sd_size_combo_entries.size(); ++i)
+  for (const auto& entry : sd_size_combo_entries)
-    m_sd_card_size_combo->addItem(tr(sd_size_combo_entries[i].name));
+    sd_size_choices.emplace_back(tr(entry.name), entry.size);
+
+  m_sd_card_size_combo = new ConfigChoiceMap(sd_size_choices, Config::MAIN_WII_SD_CARD_FILESIZE);
   sd_settings_group_layout->addWidget(new QLabel(tr("SD Card File Size:")), row, 0);
   sd_settings_group_layout->addWidget(m_sd_card_size_combo, row, 1);
   ++row;
@@ -346,26 +305,21 @@ void WiiPane::CreateWiiRemoteSettings()
   auto* wii_remote_settings_group_layout = new QGridLayout();
   wii_remote_settings_group->setLayout(wii_remote_settings_group_layout);
   m_main_layout->addWidget(wii_remote_settings_group);
-  m_wiimote_motor = new QCheckBox(tr("Enable Rumble"));
+  m_wiimote_motor = new ConfigBool(tr("Enable Rumble"), Config::SYSCONF_WIIMOTE_MOTOR);
 
   m_wiimote_sensor_position_label = new QLabel(tr("Sensor Bar Position:"));
-  m_wiimote_ir_sensor_position = new QComboBox();
+  m_wiimote_ir_sensor_position = new ConfigChoiceMap<u32>({{tr("Top"), 1}, {tr("Bottom"), 0}},
-  m_wiimote_ir_sensor_position->addItem(tr("Top"));
+                                                          Config::SYSCONF_SENSOR_BAR_POSITION);
-  m_wiimote_ir_sensor_position->addItem(tr("Bottom"));
 
   // IR Sensitivity Slider
   // i18n: IR stands for infrared and refers to the pointer functionality of Wii Remotes
   m_wiimote_ir_sensitivity_label = new QLabel(tr("IR Sensitivity:"));
-  m_wiimote_ir_sensitivity = new QSlider(Qt::Horizontal);
   // Wii menu saves values from 1 to 5.
-  m_wiimote_ir_sensitivity->setMinimum(1);
+  m_wiimote_ir_sensitivity = new ConfigSliderU32(1, 5, Config::SYSCONF_SENSOR_BAR_SENSITIVITY, 1);
-  m_wiimote_ir_sensitivity->setMaximum(5);
 
   // Speaker Volume Slider
   m_wiimote_speaker_volume_label = new QLabel(tr("Speaker Volume:"));
-  m_wiimote_speaker_volume = new QSlider(Qt::Horizontal);
+  m_wiimote_speaker_volume = new ConfigSliderU32(0, 127, Config::SYSCONF_SPEAKER_VOLUME, 1);
-  m_wiimote_speaker_volume->setMinimum(0);
-  m_wiimote_speaker_volume->setMaximum(127);
 
   wii_remote_settings_group_layout->addWidget(m_wiimote_sensor_position_label, 0, 0);
   wii_remote_settings_group_layout->addWidget(m_wiimote_ir_sensor_position, 0, 1);
@@ -392,68 +346,6 @@ void WiiPane::OnEmulationStateChanged(bool running)
   m_wiilink_checkbox->setEnabled(!running);
 }
 
-void WiiPane::LoadConfig()
-{
-  m_screensaver_checkbox->setChecked(Config::Get(Config::SYSCONF_SCREENSAVER));
-  m_pal60_mode_checkbox->setChecked(Config::Get(Config::SYSCONF_PAL60));
-  m_connect_keyboard_checkbox->setChecked(Settings::Instance().IsUSBKeyboardConnected());
-  m_aspect_ratio_choice->setCurrentIndex(Config::Get(Config::SYSCONF_WIDESCREEN));
-  m_system_language_choice->setCurrentIndex(Config::Get(Config::SYSCONF_LANGUAGE));
-  m_sound_mode_choice->setCurrentIndex(Config::Get(Config::SYSCONF_SOUND_MODE));
-  m_wiilink_checkbox->setChecked(Config::Get(Config::MAIN_WII_WIILINK_ENABLE));
-
-  m_sd_card_checkbox->setChecked(Settings::Instance().IsSDCardInserted());
-  m_allow_sd_writes_checkbox->setChecked(Config::Get(Config::MAIN_ALLOW_SD_WRITES));
-  m_sync_sd_folder_checkbox->setChecked(Config::Get(Config::MAIN_WII_SD_CARD_ENABLE_FOLDER_SYNC));
-
-  const u64 sd_card_size = Config::Get(Config::MAIN_WII_SD_CARD_FILESIZE);
-  for (size_t i = 0; i < sd_size_combo_entries.size(); ++i)
-  {
-    if (sd_size_combo_entries[i].size == sd_card_size)
-      m_sd_card_size_combo->setCurrentIndex(static_cast<int>(i));
-  }
-
-  PopulateUSBPassthroughListWidget();
-
-  m_wiimote_ir_sensor_position->setCurrentIndex(
-      TranslateSensorBarPosition(Config::Get(Config::SYSCONF_SENSOR_BAR_POSITION)));
-  m_wiimote_ir_sensitivity->setValue(Config::Get(Config::SYSCONF_SENSOR_BAR_SENSITIVITY));
-  m_wiimote_speaker_volume->setValue(Config::Get(Config::SYSCONF_SPEAKER_VOLUME));
-  m_wiimote_motor->setChecked(Config::Get(Config::SYSCONF_WIIMOTE_MOTOR));
-}
-
-void WiiPane::OnSaveConfig()
-{
-  Config::ConfigChangeCallbackGuard config_guard;
-
-  Config::SetBase(Config::SYSCONF_SCREENSAVER, m_screensaver_checkbox->isChecked());
-  Config::SetBase(Config::SYSCONF_PAL60, m_pal60_mode_checkbox->isChecked());
-  Settings::Instance().SetUSBKeyboardConnected(m_connect_keyboard_checkbox->isChecked());
-
-  Config::SetBase<u32>(Config::SYSCONF_SENSOR_BAR_POSITION,
-                       TranslateSensorBarPosition(m_wiimote_ir_sensor_position->currentIndex()));
-  Config::SetBase<u32>(Config::SYSCONF_SENSOR_BAR_SENSITIVITY, m_wiimote_ir_sensitivity->value());
-  Config::SetBase<u32>(Config::SYSCONF_SPEAKER_VOLUME, m_wiimote_speaker_volume->value());
-  Config::SetBase<u32>(Config::SYSCONF_LANGUAGE, m_system_language_choice->currentIndex());
-  Config::SetBase<bool>(Config::SYSCONF_WIDESCREEN, m_aspect_ratio_choice->currentIndex());
-  Config::SetBase<u32>(Config::SYSCONF_SOUND_MODE, m_sound_mode_choice->currentIndex());
-  Config::SetBase(Config::SYSCONF_WIIMOTE_MOTOR, m_wiimote_motor->isChecked());
-  Config::SetBase(Config::MAIN_WII_WIILINK_ENABLE, m_wiilink_checkbox->isChecked());
-
-  Settings::Instance().SetSDCardInserted(m_sd_card_checkbox->isChecked());
-  Config::SetBase(Config::MAIN_ALLOW_SD_WRITES, m_allow_sd_writes_checkbox->isChecked());
-  Config::SetBase(Config::MAIN_WII_SD_CARD_ENABLE_FOLDER_SYNC,
-                  m_sync_sd_folder_checkbox->isChecked());
-
-  const int sd_card_size_index = m_sd_card_size_combo->currentIndex();
-  if (sd_card_size_index >= 0 &&
-      static_cast<size_t>(sd_card_size_index) < sd_size_combo_entries.size())
-  {
-    Config::SetBase(Config::MAIN_WII_SD_CARD_FILESIZE,
-                    sd_size_combo_entries[sd_card_size_index].size);
-  }
-}
-
 void WiiPane::ValidateSelectionState()
 {
   m_whitelist_usb_remove_button->setEnabled(m_whitelist_usb_list->currentIndex().isValid());
@@ -518,13 +410,7 @@ void WiiPane::BrowseSDRaw()
       tr("SD Card Image (*.raw);;"
          "All Files (*)")));
   if (!file.isEmpty())
-    SetSDRaw(file);
+    m_sd_raw_edit->SetTextAndUpdate(file);
-}
-
-void WiiPane::SetSDRaw(const QString& path)
-{
-  Config::SetBase(Config::MAIN_WII_SD_CARD_IMAGE_PATH, path.toStdString());
-  SignalBlocking(m_sd_raw_edit)->setText(path);
 }
 
 void WiiPane::BrowseSDSyncFolder()
@@ -533,11 +419,5 @@ void WiiPane::BrowseSDSyncFolder()
       this, tr("Select a Folder to Sync with the SD Card Image"),
       QString::fromStdString(File::GetUserPath(D_WIISDCARDSYNCFOLDER_IDX))));
   if (!file.isEmpty())
-    SetSDSyncFolder(file);
+    m_sd_sync_folder_edit->SetTextAndUpdate(file);
-}
-
-void WiiPane::SetSDSyncFolder(const QString& path)
-{
-  Config::SetBase(Config::MAIN_WII_SD_CARD_SYNC_FOLDER_PATH, path.toStdString());
-  SignalBlocking(m_sd_sync_folder_edit)->setText(path);
 }

Source/Core/DolphinQt/Settings/WiiPane.h

@@ -5,13 +5,17 @@
 
 #include <QWidget>
 
-class QCheckBox;
+#include "Common/CommonTypes.h"
-class QComboBox;
+
+class ConfigBool;
+template <typename T>
+class ConfigChoiceMap;
+class ConfigChoiceU32;
+class ConfigSliderU32;
+class ConfigUserPath;
 class QLabel;
-class QLineEdit;
 class QListWidget;
 class QPushButton;
-class QSlider;
 class QString;
 class QVBoxLayout;
 
@@ -30,8 +34,6 @@ private:
   void CreateWhitelistedUSBPassthroughDevices();
   void CreateWiiRemoteSettings();
 
-  void LoadConfig();
-  void OnSaveConfig();
   void OnEmulationStateChanged(bool running);
 
   void ValidateSelectionState();
@@ -40,32 +42,30 @@ private:
   void OnUSBWhitelistRemoveButton();
 
   void BrowseSDRaw();
-  void SetSDRaw(const QString& path);
   void BrowseSDSyncFolder();
-  void SetSDSyncFolder(const QString& path);
 
   // Widgets
   QVBoxLayout* m_main_layout;
 
   // Misc Settings
-  QCheckBox* m_screensaver_checkbox;
+  ConfigBool* m_screensaver_checkbox;
-  QCheckBox* m_pal60_mode_checkbox;
+  ConfigBool* m_pal60_mode_checkbox;
-  QCheckBox* m_connect_keyboard_checkbox;
+  ConfigBool* m_connect_keyboard_checkbox;
-  QCheckBox* m_wiilink_checkbox;
+  ConfigBool* m_wiilink_checkbox;
-  QComboBox* m_system_language_choice;
+  ConfigChoiceU32* m_system_language_choice;
   QLabel* m_system_language_choice_label;
-  QComboBox* m_aspect_ratio_choice;
+  ConfigChoiceMap<bool>* m_aspect_ratio_choice;
   QLabel* m_aspect_ratio_choice_label;
-  QComboBox* m_sound_mode_choice;
+  ConfigChoiceU32* m_sound_mode_choice;
   QLabel* m_sound_mode_choice_label;
 
   // SD Card Settings
-  QCheckBox* m_sd_card_checkbox;
+  ConfigBool* m_sd_card_checkbox;
-  QCheckBox* m_allow_sd_writes_checkbox;
+  ConfigBool* m_allow_sd_writes_checkbox;
-  QCheckBox* m_sync_sd_folder_checkbox;
+  ConfigBool* m_sync_sd_folder_checkbox;
-  QComboBox* m_sd_card_size_combo;
+  ConfigChoiceMap<u64>* m_sd_card_size_combo;
-  QLineEdit* m_sd_raw_edit;
+  ConfigUserPath* m_sd_raw_edit;
-  QLineEdit* m_sd_sync_folder_edit;
+  ConfigUserPath* m_sd_sync_folder_edit;
   QPushButton* m_sd_pack_button;
   QPushButton* m_sd_unpack_button;
 
@@ -76,10 +76,10 @@ private:
 
   // Wii Remote Settings
   QLabel* m_wiimote_sensor_position_label;
-  QComboBox* m_wiimote_ir_sensor_position;
+  ConfigChoiceMap<u32>* m_wiimote_ir_sensor_position;
-  QSlider* m_wiimote_ir_sensitivity;
+  ConfigSliderU32* m_wiimote_ir_sensitivity;
   QLabel* m_wiimote_ir_sensitivity_label;
-  QSlider* m_wiimote_speaker_volume;
+  ConfigSliderU32* m_wiimote_speaker_volume;
   QLabel* m_wiimote_speaker_volume_label;
-  QCheckBox* m_wiimote_motor;
+  ConfigBool* m_wiimote_motor;
 };

Source/Core/UICommon/UICommon.cpp

@@ -109,9 +109,6 @@ static void InitCustomPaths()
   CreateDumpPath(Config::Get(Config::MAIN_DUMP_PATH));
   CreateResourcePackPath(Config::Get(Config::MAIN_RESOURCEPACK_PATH));
   CreateWFSPath(Config::Get(Config::MAIN_WFS_PATH));
-  File::SetUserPath(F_WIISDCARDIMAGE_IDX, Config::Get(Config::MAIN_WII_SD_CARD_IMAGE_PATH));
-  File::SetUserPath(D_WIISDCARDSYNCFOLDER_IDX,
-                    Config::Get(Config::MAIN_WII_SD_CARD_SYNC_FOLDER_PATH));
   File::CreateFullPath(File::GetUserPath(D_WIISDCARDSYNCFOLDER_IDX));
 #ifdef HAS_LIBMGBA
   File::CreateFullPath(File::GetUserPath(D_GBASAVES_IDX));