diff options
| author | Michael Maltese <mchtly@gmail.com> | 2017-06-22 15:11:53 -0700 |
|---|---|---|
| committer | Michael Maltese <mchtly@gmail.com> | 2017-06-29 17:17:32 -0700 |
| commit | d0fdb9f1491db121d37a7a807293c84f32adbad3 (patch) | |
| tree | 5d288988e78f49fca117c21d708e605c86c929b0 /Source/Core/DolphinQt2/MenuBar.cpp | |
| parent | 898bbffaa7cd124801f4682270e1b8d38840dc24 (diff) | |
DolphinQt2: replace Settings with SConfig where possible
Changes:
- `ShowDevelopmentWarning` is now under the '[Interface]' group in
Dolphin.ini, with other interface-related settings. So, whoever uses
DolphinQt will have to edit that manually again. Sorry!
- Game search paths and the last file are now shared properly with
DolphinWX
- Qt-only preferences like "Preferred View: list/table" are now
stored using the platform's native settings storage, rather than in
UI.ini
Diffstat (limited to 'Source/Core/DolphinQt2/MenuBar.cpp')
| -rw-r--r-- | Source/Core/DolphinQt2/MenuBar.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/Source/Core/DolphinQt2/MenuBar.cpp b/Source/Core/DolphinQt2/MenuBar.cpp index 888a5d8400..3a3a44a149 100644 --- a/Source/Core/DolphinQt2/MenuBar.cpp +++ b/Source/Core/DolphinQt2/MenuBar.cpp @@ -10,6 +10,7 @@ #include <QUrl> #include "Core/CommonTitles.h" +#include "Core/ConfigManager.h" #include "Core/IOS/ES/ES.h" #include "Core/IOS/IOS.h" #include "Core/State.h" @@ -235,16 +236,16 @@ void MenuBar::AddGameListTypeSection(QMenu* view_menu) void MenuBar::AddTableColumnsMenu(QMenu* view_menu) { - auto& settings = Settings::Instance(); - static const QMap<QString, bool*> columns{{tr("Platform"), &settings.PlatformVisible()}, - {tr("ID"), &settings.IDVisible()}, - {tr("Banner"), &settings.BannerVisible()}, - {tr("Title"), &settings.TitleVisible()}, - {tr("Description"), &settings.DescriptionVisible()}, - {tr("Maker"), &settings.MakerVisible()}, - {tr("Size"), &settings.SizeVisible()}, - {tr("Country"), &settings.CountryVisible()}, - {tr("Quality"), &settings.StateVisible()}}; + static const QMap<QString, bool*> columns{ + {tr("Platform"), &SConfig::GetInstance().m_showSystemColumn}, + {tr("ID"), &SConfig::GetInstance().m_showIDColumn}, + {tr("Banner"), &SConfig::GetInstance().m_showBannerColumn}, + {tr("Title"), &SConfig::GetInstance().m_showTitleColumn}, + {tr("Description"), &SConfig::GetInstance().m_showDescriptionColumn}, + {tr("Maker"), &SConfig::GetInstance().m_showMakerColumn}, + {tr("Size"), &SConfig::GetInstance().m_showSizeColumn}, + {tr("Country"), &SConfig::GetInstance().m_showRegionColumn}, + {tr("Quality"), &SConfig::GetInstance().m_showStateColumn}}; QActionGroup* column_group = new QActionGroup(this); QMenu* cols_menu = view_menu->addMenu(tr("Table Columns")); @@ -258,7 +259,6 @@ void MenuBar::AddTableColumnsMenu(QMenu* view_menu) action->setChecked(*config); connect(action, &QAction::toggled, [this, config, key](bool value) { *config = value; - Settings::Instance().Save(); emit ColumnVisibilityToggled(key, value); }); } @@ -266,7 +266,7 @@ void MenuBar::AddTableColumnsMenu(QMenu* view_menu) void MenuBar::UpdateToolsMenu(bool emulation_started) { - const bool enable_wii_tools = !emulation_started || !Settings::Instance().IsWiiGameRunning(); + const bool enable_wii_tools = !emulation_started || !SConfig::GetInstance().bWii; m_perform_online_update_menu->setEnabled(enable_wii_tools); if (enable_wii_tools) { |
