diff options
| author | Léo Lam <leo@leolam.fr> | 2020-05-24 15:26:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-24 15:26:44 +0200 |
| commit | a660033e8c394634a22c02a031969685fcdb4fba (patch) | |
| tree | f3afbce12a09535e0b342b1220acd1fb7a37bdb3 /Source/Core/DolphinQt/Config/Graphics/GraphicsWindow.cpp | |
| parent | 1203e626b37ba557273d0426187790ae9c4e5678 (diff) | |
| parent | 8df56cb319fd59ceab1122580fe5a318b0344cf6 (diff) | |
Merge pull request #8792 from leoetlino/video-backend
Migrate video backend setting to the new config system
Diffstat (limited to 'Source/Core/DolphinQt/Config/Graphics/GraphicsWindow.cpp')
| -rw-r--r-- | Source/Core/DolphinQt/Config/Graphics/GraphicsWindow.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Source/Core/DolphinQt/Config/Graphics/GraphicsWindow.cpp b/Source/Core/DolphinQt/Config/Graphics/GraphicsWindow.cpp index e66f5a27ff..b9ca205b08 100644 --- a/Source/Core/DolphinQt/Config/Graphics/GraphicsWindow.cpp +++ b/Source/Core/DolphinQt/Config/Graphics/GraphicsWindow.cpp @@ -11,6 +11,8 @@ #include <QTabWidget> #include <QVBoxLayout> +#include "Common/Config/Config.h" +#include "Core/Config/MainSettings.h" #include "Core/ConfigManager.h" #include "DolphinQt/Config/Graphics/AdvancedWidget.h" @@ -32,7 +34,7 @@ GraphicsWindow::GraphicsWindow(X11Utils::XRRConfiguration* xrr_config, MainWindo setWindowTitle(tr("Graphics")); setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); - OnBackendChanged(QString::fromStdString(SConfig::GetInstance().m_strVideoBackend)); + OnBackendChanged(QString::fromStdString(Config::Get(Config::MAIN_GFX_BACKEND))); } void GraphicsWindow::CreateMainLayout() @@ -77,7 +79,7 @@ void GraphicsWindow::CreateMainLayout() m_wrapped_advanced = GetWrappedWidget(m_advanced_widget, this, 50, 305); m_wrapped_software = GetWrappedWidget(m_software_renderer, this, 50, 305); - if (SConfig::GetInstance().m_strVideoBackend != "Software Renderer") + if (Config::Get(Config::MAIN_GFX_BACKEND) != "Software Renderer") { m_tab_widget->addTab(m_wrapped_general, tr("General")); m_tab_widget->addTab(m_wrapped_enhancements, tr("Enhancements")); @@ -94,8 +96,8 @@ void GraphicsWindow::CreateMainLayout() void GraphicsWindow::OnBackendChanged(const QString& backend_name) { - SConfig::GetInstance().m_strVideoBackend = backend_name.toStdString(); - VideoBackendBase::PopulateBackendInfo(); + Config::SetBase(Config::MAIN_GFX_BACKEND, backend_name.toStdString()); + VideoBackendBase::PopulateBackendInfoFromUI(); setWindowTitle( tr("%1 Graphics Configuration").arg(tr(g_video_backend->GetDisplayName().c_str()))); |