Qt/Configure: Use sidebar to divide tabs into smaller groups
This commit is contained in:
parent
9df1461cec
commit
d63a63cff0
3 changed files with 106 additions and 54 deletions
|
@ -2,18 +2,22 @@
|
||||||
<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>
|
||||||
|
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||||
|
<item>
|
||||||
|
<widget class="QListWidget" name="selectorList">
|
||||||
|
<property name="minimumWidth">
|
||||||
|
<number>150</number>
|
||||||
|
</property>
|
||||||
|
<property name="maximumWidth">
|
||||||
|
<number>150</number>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QTabWidget" name="tabWidget">
|
<widget class="QTabWidget" name="tabWidget">
|
||||||
<property name="currentIndex">
|
<property name="currentIndex">
|
||||||
|
@ -61,6 +65,8 @@
|
||||||
</widget>
|
</widget>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
</layout>
|
||||||
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QDialogButtonBox" name="buttonBox">
|
<widget class="QDialogButtonBox" name="buttonBox">
|
||||||
<property name="standardButtons">
|
<property name="standardButtons">
|
||||||
|
|
|
@ -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);
|
||||||
|
}
|
||||||
|
|
|
@ -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);
|
||||||
|
|
Loading…
Reference in a new issue