mirror of
				https://github.com/PabloMK7/citra.git
				synced 2025-10-31 13:50:03 +00:00 
			
		
		
		
	configure_dialog: backport minor changes from yuzu
This commit is contained in:
		
							parent
							
								
									6be1b4d293
								
							
						
					
					
						commit
						59dbc72e7b
					
				
					 2 changed files with 8 additions and 8 deletions
				
			
		|  | @ -2,7 +2,7 @@ | |||
| // Licensed under GPLv2 or any later version
 | ||||
| // Refer to the license.txt file included.
 | ||||
| 
 | ||||
| #include <QHash> | ||||
| #include <map> | ||||
| #include <QListWidgetItem> | ||||
| #include "citra_qt/configuration/config.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")}}}}; | ||||
| 
 | ||||
|     for (const auto& entry : items) { | ||||
|         auto* item = new QListWidgetItem(entry.first); | ||||
|         auto* const item = new QListWidgetItem(entry.first); | ||||
|         item->setData(Qt::UserRole, entry.second); | ||||
| 
 | ||||
|         ui->selectorList->addItem(item); | ||||
|  | @ -111,11 +111,11 @@ void ConfigureDialog::retranslateUi() { | |||
| } | ||||
| 
 | ||||
| void ConfigureDialog::UpdateVisibleTabs() { | ||||
|     auto items = ui->selectorList->selectedItems(); | ||||
|     const auto items = ui->selectorList->selectedItems(); | ||||
|     if (items.isEmpty()) | ||||
|         return; | ||||
| 
 | ||||
|     const QHash<QString, QWidget*> widgets = { | ||||
|     const std::map<QString, QWidget*> widgets = { | ||||
|         {"General", ui->generalTab},   {"System", ui->systemTab}, | ||||
|         {"Input", ui->inputTab},       {"Hotkeys", ui->hotkeysTab}, | ||||
|         {"Graphics", ui->graphicsTab}, {"Audio", ui->audioTab}, | ||||
|  | @ -124,8 +124,8 @@ void ConfigureDialog::UpdateVisibleTabs() { | |||
| 
 | ||||
|     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) | ||||
|         ui->tabWidget->addTab(widgets[tab], tr(qPrintable(tab))); | ||||
|         ui->tabWidget->addTab(widgets.at(tab), tr(qPrintable(tab))); | ||||
| } | ||||
|  |  | |||
|  | @ -21,8 +21,6 @@ public: | |||
|     ~ConfigureDialog() override; | ||||
| 
 | ||||
|     void applyConfiguration(); | ||||
|     void UpdateVisibleTabs(); | ||||
|     void PopulateSelectionList(); | ||||
| 
 | ||||
| private slots: | ||||
|     void onLanguageChanged(const QString& locale); | ||||
|  | @ -33,6 +31,8 @@ signals: | |||
| private: | ||||
|     void setConfiguration(); | ||||
|     void retranslateUi(); | ||||
|     void UpdateVisibleTabs(); | ||||
|     void PopulateSelectionList(); | ||||
| 
 | ||||
|     std::unique_ptr<Ui::ConfigureDialog> ui; | ||||
|     HotkeyRegistry& registry; | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue