citra-emu
/
citra
Archived
1
0
Fork 0
Code

configure_dialog: backport minor changes from yuzu

This commit is contained in:
fearlessTobi 2019-02-05 22:07:03 +01:00
parent 6be1b4d293
commit 59dbc72e7b
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@
// 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 <map>
#include <QListWidgetItem> #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"
@ -74,7 +74,7 @@ void ConfigureDialog::PopulateSelectionList() {
{tr("Controls"), {QT_TR_NOOP("Input"), QT_TR_NOOP("Hotkeys")}}}}; {tr("Controls"), {QT_TR_NOOP("Input"), QT_TR_NOOP("Hotkeys")}}}};
for (const auto& entry : items) { for (const auto& entry : items) {
auto* item = new QListWidgetItem(entry.first); auto* const item = new QListWidgetItem(entry.first);
item->setData(Qt::UserRole, entry.second); item->setData(Qt::UserRole, entry.second);
ui->selectorList->addItem(item); ui->selectorList->addItem(item);
@ -111,11 +111,11 @@ void ConfigureDialog::retranslateUi() {
} }
void ConfigureDialog::UpdateVisibleTabs() { void ConfigureDialog::UpdateVisibleTabs() {
auto items = ui->selectorList->selectedItems(); const auto items = ui->selectorList->selectedItems();
if (items.isEmpty()) if (items.isEmpty())
return; return;
const QHash<QString, QWidget*> widgets = { const std::map<QString, QWidget*> widgets = {
{"General", ui->generalTab}, {"System", ui->systemTab}, {"General", ui->generalTab}, {"System", ui->systemTab},
{"Input", ui->inputTab}, {"Hotkeys", ui->hotkeysTab}, {"Input", ui->inputTab}, {"Hotkeys", ui->hotkeysTab},
{"Graphics", ui->graphicsTab}, {"Audio", ui->audioTab}, {"Graphics", ui->graphicsTab}, {"Audio", ui->audioTab},
@ -124,8 +124,8 @@ void ConfigureDialog::UpdateVisibleTabs() {
ui->tabWidget->clear(); ui->tabWidget->clear();
QStringList tabs = items[0]->data(Qt::UserRole).toStringList(); const QStringList tabs = items[0]->data(Qt::UserRole).toStringList();
for (const auto& tab : tabs) for (const auto& tab : tabs)
ui->tabWidget->addTab(widgets[tab], tr(qPrintable(tab))); ui->tabWidget->addTab(widgets.at(tab), tr(qPrintable(tab)));
} }

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

@ -21,8 +21,6 @@ public:
~ConfigureDialog() override; ~ConfigureDialog() override;
void applyConfiguration(); void applyConfiguration();
void UpdateVisibleTabs();
void PopulateSelectionList();
private slots: private slots:
void onLanguageChanged(const QString& locale); void onLanguageChanged(const QString& locale);
@ -33,6 +31,8 @@ signals:
private: private:
void setConfiguration(); void setConfiguration();
void retranslateUi(); void retranslateUi();
void UpdateVisibleTabs();
void PopulateSelectionList();
std::unique_ptr<Ui::ConfigureDialog> ui; std::unique_ptr<Ui::ConfigureDialog> ui;
HotkeyRegistry& registry; HotkeyRegistry& registry;