summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinQt2/Config/SettingsWindow.cpp
diff options
context:
space:
mode:
authorAnthony <Helios747@users.noreply.github.com>2017-05-11 11:19:27 -0700
committerGitHub <noreply@github.com>2017-05-11 11:19:27 -0700
commit33980d816a7554d5deff3b4b588ed3cd451c86cf (patch)
treeb160bd2c63b9e48052bf7a2cccaa205174fb7729 /Source/Core/DolphinQt2/Config/SettingsWindow.cpp
parentade0e51a78a08f8c1c4e7ca055e5f6621e387f36 (diff)
parent8112c736fed8798fcc8d872825aa11ff418ef8d2 (diff)
Merge pull request #5378 from Ryanel/qt-settings-interface
Qt: Add Interface Pane to Settings
Diffstat (limited to 'Source/Core/DolphinQt2/Config/SettingsWindow.cpp')
-rw-r--r--Source/Core/DolphinQt2/Config/SettingsWindow.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/Source/Core/DolphinQt2/Config/SettingsWindow.cpp b/Source/Core/DolphinQt2/Config/SettingsWindow.cpp
index 5992dcfdfe..5f02ce1eee 100644
--- a/Source/Core/DolphinQt2/Config/SettingsWindow.cpp
+++ b/Source/Core/DolphinQt2/Config/SettingsWindow.cpp
@@ -2,8 +2,9 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
-#include "DolphinQt2/Settings.h"
#include "DolphinQt2/Config/SettingsWindow.h"
+#include "DolphinQt2/Settings.h"
+#include "DolphinQt2/Settings/InterfacePane.h"
SettingsWindow::SettingsWindow(QWidget* parent) : QDialog(parent)
{
@@ -47,6 +48,8 @@ void SettingsWindow::SetupSettingsWidget()
{
m_settings_outer = new QStackedWidget;
m_settings_outer->setCurrentIndex(0);
+
+ m_settings_outer->addWidget(new InterfacePane);
}
void SettingsWindow::MakeUnfinishedWarning()
@@ -80,6 +83,8 @@ void SettingsWindow::MakeCategoryList()
m_categories->setMovement(QListView::Static);
m_categories->setSpacing(0);
+ AddCategoryToList(tr("Interface"), dir.append(QStringLiteral("config.png")));
+
connect(m_categories, &QListWidget::currentItemChanged, this, &SettingsWindow::changePage);
}