Merge pull request #1944 from FearlessTobi/port-4187

Port citra-emu/citra#4187: "Qt/Configure: Use sidebar to divide tabs into smaller groups"

src/yuzu/configuration/configure.ui

@@ -6,14 +6,32 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>461</width>
+    <width>382</width>
-    <height>659</height>
+    <height>241</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>yuzu Configuration</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QListWidget" name="selectorList">
+       <property name="minimumSize">
+        <size>
+         <width>150</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>150</width>
+         <height>16777215</height>
+        </size>
+       </property>
+      </widget>
+     </item>
      <item>
       <widget class="QTabWidget" name="tabWidget">
        <property name="currentIndex">
@@ -61,6 +79,8 @@
        </widget>
       </widget>
      </item>
+    </layout>
+   </item>
    <item>
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="standardButtons">
@@ -77,12 +97,6 @@
    <header>configuration/configure_general.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>ConfigureGameList</class>
-   <extends>QWidget</extends>
-   <header>configuration/configure_gamelist.h</header>
-   <container>1</container>
-  </customwidget>
   <customwidget>
    <class>ConfigureSystem</class>
    <extends>QWidget</extends>
@@ -101,12 +115,6 @@
    <header>configuration/configure_debug.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>ConfigureInputSimple</class>
-   <extends>QWidget</extends>
-   <header>configuration/configure_input_simple.h</header>
-   <container>1</container>
-  </customwidget>
   <customwidget>
    <class>ConfigureGraphics</class>
    <extends>QWidget</extends>
@@ -119,6 +127,18 @@
    <header>configuration/configure_web.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>ConfigureGameList</class>
+   <extends>QWidget</extends>
+   <header>configuration/configure_gamelist.h</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>ConfigureInputSimple</class>
+   <extends>QWidget</extends>
+   <header>configuration/configure_input_simple.h</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections>

src/yuzu/configuration/configure_dialog.cpp

@@ -2,6 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include <QHash>
+#include <QListWidgetItem>
 #include "core/settings.h"
 #include "ui_configure.h"
 #include "yuzu/configuration/config.h"
@@ -13,6 +15,13 @@ ConfigureDialog::ConfigureDialog(QWidget* parent, const HotkeyRegistry& registry
     ui->setupUi(this);
     ui->generalTab->PopulateHotkeyList(registry);
     this->setConfiguration();
+    this->PopulateSelectionList();
+    connect(ui->selectorList, &QListWidget::itemSelectionChanged, this,
+            &ConfigureDialog::UpdateVisibleTabs);
+
+    adjustSize();
+
+    ui->selectorList->setCurrentRow(0);
 }
 
 ConfigureDialog::~ConfigureDialog() = default;
@@ -30,3 +39,37 @@ void ConfigureDialog::applyConfiguration() {
     ui->webTab->applyConfiguration();
     Settings::Apply();
 }
+
+void ConfigureDialog::PopulateSelectionList() {
+    const std::array<std::pair<QString, QStringList>, 4> items{
+        {{tr("General"), {tr("General"), tr("Web"), tr("Debug"), tr("Game List")}},
+         {tr("System"), {tr("System"), tr("Audio")}},
+         {tr("Graphics"), {tr("Graphics")}},
+         {tr("Controls"), {tr("Input")}}}};
+
+    for (const auto& entry : items) {
+        auto* const item = new QListWidgetItem(entry.first);
+        item->setData(Qt::UserRole, entry.second);
+
+        ui->selectorList->addItem(item);
+    }
+}
+
+void ConfigureDialog::UpdateVisibleTabs() {
+    const auto items = ui->selectorList->selectedItems();
+    if (items.isEmpty())
+        return;
+
+    const std::map<QString, QWidget*> widgets = {
+        {tr("General"), ui->generalTab}, {tr("System"), ui->systemTab},
+        {tr("Input"), ui->inputTab},     {tr("Graphics"), ui->graphicsTab},
+        {tr("Audio"), ui->audioTab},     {tr("Debug"), ui->debugTab},
+        {tr("Web"), ui->webTab},         {tr("Game List"), ui->gameListTab}};
+
+    ui->tabWidget->clear();
+
+    const QStringList tabs = items[0]->data(Qt::UserRole).toStringList();
+
+    for (const auto& tab : tabs)
+        ui->tabWidget->addTab(widgets.find(tab)->second, tab);
+}

src/yuzu/configuration/configure_dialog.h

@@ -24,6 +24,8 @@ public:
 
 private:
     void setConfiguration();
+    void UpdateVisibleTabs();
+    void PopulateSelectionList();
 
     std::unique_ptr<Ui::ConfigureDialog> ui;
 };