diff --git a/Source/Core/DolphinQt2/CMakeLists.txt b/Source/Core/DolphinQt2/CMakeLists.txt index fb1ee4b824..fed7fbe600 100644 --- a/Source/Core/DolphinQt2/CMakeLists.txt +++ b/Source/Core/DolphinQt2/CMakeLists.txt @@ -28,6 +28,7 @@ set(SRCS GameList/GameTracker.cpp GameList/ListProxyModel.cpp GameList/TableDelegate.cpp + Settings/InterfacePane.cpp ) list(APPEND LIBS core uicommon) 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); } diff --git a/Source/Core/DolphinQt2/DolphinQt2.vcxproj b/Source/Core/DolphinQt2/DolphinQt2.vcxproj index 90773ae69f..4cf34eaa85 100644 --- a/Source/Core/DolphinQt2/DolphinQt2.vcxproj +++ b/Source/Core/DolphinQt2/DolphinQt2.vcxproj @@ -56,7 +56,7 @@ /NODEFAULTLIB:libcmt - $(ProjectDir)\VideoInterface;$(ProjectDir)\GameList;$(ProjectDir)\Config;%(AdditionalIncludeDirectories) + $(ProjectDir)\VideoInterface;$(ProjectDir)\GameList;$(ProjectDir)\Settings;$(ProjectDir)\Config;%(AdditionalIncludeDirectories) @@ -94,11 +94,13 @@ + + @@ -121,6 +123,7 @@ + @@ -142,6 +145,7 @@ +