Merge pull request #5370 from Ryanel/qt-settings-general

Qt: Add General Pane to Settings

1 files changed, 8 insertions, 5 deletions

diff --git a/Source/Core/DolphinQt2/Config/SettingsWindow.cpp b/Source/Core/DolphinQt2/Config/SettingsWindow.cpp
index 5f02ce1eee..63d29e4255 100644
--- a/Source/Core/DolphinQt2/Config/SettingsWindow.cpp
+++ b/Source/Core/DolphinQt2/Config/SettingsWindow.cpp
@@ -4,8 +4,10 @@
 
 #include "DolphinQt2/Config/SettingsWindow.h"
 #include "DolphinQt2/Settings.h"
+#include "DolphinQt2/Settings/GeneralPane.h"
 #include "DolphinQt2/Settings/InterfacePane.h"
 
+
 SettingsWindow::SettingsWindow(QWidget* parent) : QDialog(parent)
 {
   // Set Window Properties
@@ -49,6 +51,8 @@ void SettingsWindow::SetupSettingsWidget()
   m_settings_outer = new QStackedWidget;
   m_settings_outer->setCurrentIndex(0);
 
+  // Panes initalised here
+  m_settings_outer->addWidget(new GeneralPane);
   m_settings_outer->addWidget(new InterfacePane);
 }
 
@@ -64,8 +68,9 @@ void SettingsWindow::MakeUnfinishedWarning()
 
 void SettingsWindow::AddCategoryToList(const QString& title, const QString& icon)
 {
+  QString dir = Settings().GetThemeDir();
   QListWidgetItem* button = new QListWidgetItem();
-  button->setIcon(QIcon(icon));
+  button->setIcon(QIcon(dir.append(icon)));
   button->setText(title);
   button->setTextAlignment(Qt::AlignVCenter);
   button->setSizeHint(QSize(28, 28));
@@ -75,16 +80,14 @@ void SettingsWindow::AddCategoryToList(const QString& title, const QString& icon
 
 void SettingsWindow::MakeCategoryList()
 {
-  QString dir = Settings().GetThemeDir();
-
   m_categories = new QListWidget;
   m_categories->setMaximumWidth(175);
   m_categories->setIconSize(QSize(32, 32));
   m_categories->setMovement(QListView::Static);
   m_categories->setSpacing(0);
 
-  AddCategoryToList(tr("Interface"), dir.append(QStringLiteral("config.png")));
-
+  AddCategoryToList(tr("General"), QStringLiteral("config.png"));
+  AddCategoryToList(tr("Interface"), QStringLiteral("browse.png"));
   connect(m_categories, &QListWidget::currentItemChanged, this, &SettingsWindow::changePage);
 }