citra-emu
/
citra
Archived
1
0
Fork 0
Code

Merge pull request #4187 from spycrab/qt_config_sidebar 

Qt/Configure: Use sidebar to divide tabs into smaller groups
This commit is contained in:
Weiyi Wang 2018-09-14 16:45:45 -04:00 committed by GitHub
parent 8c354ff6b1 d63a63cff0
commit 6767f4562b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 106 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
src/citra_qt/configuration/configure.ui
View File

@ -2,64 +2,70 @@
<ui version="4.0"> <ui version="4.0">
<class>ConfigureDialog</class> <class>ConfigureDialog</class>
<widget class="QDialog" name="ConfigureDialog"> <widget class="QDialog" name="ConfigureDialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>461</width>
<height>500</height>
</rect>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>Citra Configuration</string> <string>Citra Configuration</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
<widget class="QTabWidget" name="tabWidget"> <layout class="QHBoxLayout" name="horizontalLayout">
<property name="currentIndex"> <item>
<number>0</number> <widget class="QListWidget" name="selectorList">
</property> <property name="minimumWidth">
<widget class="ConfigureGeneral" name="generalTab"> <number>150</number>
<attribute name="title"> </property>
<string>General</string> <property name="maximumWidth">
</attribute> <number>150</number>
</widget> </property>
<widget class="ConfigureSystem" name="systemTab"> </widget>
<attribute name="title"> </item>
<string>System</string> <item>
</attribute> <widget class="QTabWidget" name="tabWidget">
</widget> <property name="currentIndex">
<widget class="ConfigureInput" name="inputTab"> <number>0</number>
<attribute name="title"> </property>
<string>Input</string> <widget class="ConfigureGeneral" name="generalTab">
</attribute> <attribute name="title">
</widget> <string>General</string>
<widget class="ConfigureGraphics" name="graphicsTab"> </attribute>
<attribute name="title"> </widget>
<string>Graphics</string> <widget class="ConfigureSystem" name="systemTab">
</attribute> <attribute name="title">
</widget> <string>System</string>
<widget class="ConfigureAudio" name="audioTab"> </attribute>
<attribute name="title"> </widget>
<string>Audio</string> <widget class="ConfigureInput" name="inputTab">
</attribute> <attribute name="title">
</widget> <string>Input</string>
<widget class="ConfigureCamera" name="cameraTab"> </attribute>
<attribute name="title"> </widget>
<string>Camera</string> <widget class="ConfigureGraphics" name="graphicsTab">
</attribute> <attribute name="title">
</widget> <string>Graphics</string>
<widget class="ConfigureDebug" name="debugTab"> </attribute>
<attribute name="title"> </widget>
<string>Debug</string> <widget class="ConfigureAudio" name="audioTab">
</attribute> <attribute name="title">
</widget> <string>Audio</string>
<widget class="ConfigureWeb" name="webTab"> </attribute>
<attribute name="title"> </widget>
<string>Web</string> <widget class="ConfigureCamera" name="cameraTab">
</attribute> <attribute name="title">
</widget> <string>Camera</string>
</widget> </attribute>
</widget>
<widget class="ConfigureDebug" name="debugTab">
<attribute name="title">
<string>Debug</string>
</attribute>
</widget>
<widget class="ConfigureWeb" name="webTab">
<attribute name="title">
<string>Web</string>
</attribute>
</widget>
</widget>
</item>
</layout>
</item> </item>
<item> <item>
<widget class="QDialogButtonBox" name="buttonBox"> <widget class="QDialogButtonBox" name="buttonBox">
@ -89,7 +95,7 @@
<header>configuration/configure_audio.h</header> <header>configuration/configure_audio.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget> <customwidget>
<class>ConfigureCamera</class> <class>ConfigureCamera</class>
<extends>QWidget</extends> <extends>QWidget</extends>
<header>configuration/configure_camera.h</header> <header>configuration/configure_camera.h</header>

44
src/citra_qt/configuration/configure_dialog.cpp
View File

@ -2,6 +2,8 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <QHash>
#include <QListWidgetItem>
#include "citra_qt/configuration/config.h" #include "citra_qt/configuration/config.h"
#include "citra_qt/configuration/configure_dialog.h" #include "citra_qt/configuration/configure_dialog.h"
#include "citra_qt/hotkeys.h" #include "citra_qt/hotkeys.h"
@ -13,8 +15,15 @@ ConfigureDialog::ConfigureDialog(QWidget* parent, const HotkeyRegistry& registry
ui->setupUi(this); ui->setupUi(this);
ui->generalTab->PopulateHotkeyList(registry); ui->generalTab->PopulateHotkeyList(registry);
this->setConfiguration(); this->setConfiguration();
this->PopulateSelectionList();
connect(ui->generalTab, &ConfigureGeneral::languageChanged, this, connect(ui->generalTab, &ConfigureGeneral::languageChanged, this,
&ConfigureDialog::onLanguageChanged); &ConfigureDialog::onLanguageChanged);
connect(ui->selectorList, &QListWidget::itemSelectionChanged, this,
&ConfigureDialog::UpdateVisibleTabs);
adjustSize();
ui->selectorList->setCurrentRow(0);
} }
ConfigureDialog::~ConfigureDialog() = default; ConfigureDialog::~ConfigureDialog() = default;
@ -34,6 +43,22 @@ void ConfigureDialog::applyConfiguration() {
Settings::LogSettings(); Settings::LogSettings();
} }
void ConfigureDialog::PopulateSelectionList() {
const std::array<std::pair<QString, QStringList>, 4> items{
{{tr("General"), {tr("General"), tr("Web"), tr("Debug")}},
{tr("System"), {tr("System"), tr("Audio")}},
{tr("Graphics"), {tr("Graphics")}},
{tr("Controls"), {tr("Input")}}}};
for (const auto& entry : items) {
auto* item = new QListWidgetItem(entry.first);
item->setData(Qt::UserRole, entry.second);
ui->selectorList->addItem(item);
}
}
void ConfigureDialog::onLanguageChanged(const QString& locale) { void ConfigureDialog::onLanguageChanged(const QString& locale) {
emit languageChanged(locale); emit languageChanged(locale);
ui->retranslateUi(this); ui->retranslateUi(this);
@ -46,3 +71,22 @@ void ConfigureDialog::onLanguageChanged(const QString& locale) {
ui->debugTab->retranslateUi(); ui->debugTab->retranslateUi();
ui->webTab->retranslateUi(); ui->webTab->retranslateUi();
} }
void ConfigureDialog::UpdateVisibleTabs() {
auto items = ui->selectorList->selectedItems();
if (items.isEmpty())
return;
const QHash<QString, QWidget*> widgets = {
{tr("General"), ui->generalTab}, {tr("System"), ui->systemTab},
{tr("Input"), ui->inputTab}, {tr("Graphics"), ui->graphicsTab},
{tr("Audio"), ui->audioTab}, {tr("Camera"), ui->cameraTab},
{tr("Debug"), ui->debugTab}, {tr("Web"), ui->webTab}};
ui->tabWidget->clear();
QStringList tabs = items[0]->data(Qt::UserRole).toStringList();
for (const auto& tab : tabs)
ui->tabWidget->addTab(widgets[tab], tab);
}

2
src/citra_qt/configuration/configure_dialog.h
View File

@ -21,6 +21,8 @@ public:
~ConfigureDialog(); ~ConfigureDialog();
void applyConfiguration(); void applyConfiguration();
void UpdateVisibleTabs();
void PopulateSelectionList();
private slots: private slots:
void onLanguageChanged(const QString& locale); void onLanguageChanged(const QString& locale);