diff options
Diffstat (limited to 'Source/Core/DolphinQt/Config/ConfigControls/ConfigChoice.cpp')
| -rw-r--r-- | Source/Core/DolphinQt/Config/ConfigControls/ConfigChoice.cpp | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/Source/Core/DolphinQt/Config/ConfigControls/ConfigChoice.cpp b/Source/Core/DolphinQt/Config/ConfigControls/ConfigChoice.cpp index 060678f161..ad65f0c96b 100644 --- a/Source/Core/DolphinQt/Config/ConfigControls/ConfigChoice.cpp +++ b/Source/Core/DolphinQt/Config/ConfigControls/ConfigChoice.cpp @@ -33,7 +33,7 @@ void ConfigChoice::Update(int choice) ConfigStringChoice::ConfigStringChoice(const std::vector<std::string>& options, const Config::Info<std::string>& setting) - : m_setting(setting) + : m_setting(setting), m_text_is_data(true) { for (const auto& op : options) addItem(QString::fromStdString(op)); @@ -42,6 +42,17 @@ ConfigStringChoice::ConfigStringChoice(const std::vector<std::string>& options, Load(); } +ConfigStringChoice::ConfigStringChoice(const std::vector<std::pair<QString, QString>>& options, + const Config::Info<std::string>& setting) + : m_setting(setting), m_text_is_data(false) +{ + for (const auto& [option_text, option_data] : options) + addItem(option_text, option_data); + + Connect(); + Load(); +} + void ConfigStringChoice::Connect() { const auto on_config_changed = [this]() { @@ -58,11 +69,21 @@ void ConfigStringChoice::Connect() void ConfigStringChoice::Update(int index) { - Config::SetBaseOrCurrent(m_setting, itemText(index).toStdString()); + if (m_text_is_data) + { + Config::SetBaseOrCurrent(m_setting, itemText(index).toStdString()); + } + else + { + Config::SetBaseOrCurrent(m_setting, itemData(index).toString().toStdString()); + } } void ConfigStringChoice::Load() { + const QString setting_value = QString::fromStdString(Config::Get(m_setting)); + + const int index = m_text_is_data ? findText(setting_value) : findData(setting_value); const QSignalBlocker blocker(this); - setCurrentIndex(findText(QString::fromStdString(Config::Get(m_setting)))); + setCurrentIndex(index); } |
