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