1 files changed, 61 insertions, 34 deletions

diff --git a/src/yuzu/configuration/configure_dialog.cpp b/src/yuzu/configuration/configure_dialog.cpp
index 32c05b797..e636964e3 100644
--- a/src/yuzu/configuration/configure_dialog.cpp
+++ b/src/yuzu/configuration/configure_dialog.cpp
@@ -4,6 +4,7 @@
 
 #include <QHash>
 #include <QListWidgetItem>
+#include <QSignalBlocker>
 #include "core/settings.h"
 #include "ui_configure.h"
 #include "yuzu/configuration/config.h"
@@ -15,47 +16,69 @@ ConfigureDialog::ConfigureDialog(QWidget* parent, HotkeyRegistry& registry)
     : QDialog(parent), ui(new Ui::ConfigureDialog), registry(registry) {
     ui->setupUi(this);
     ui->hotkeysTab->Populate(registry);
-    this->setConfiguration();
-    this->PopulateSelectionList();
-
     setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
 
+    SetConfiguration();
+    PopulateSelectionList();
+
     connect(ui->selectorList, &QListWidget::itemSelectionChanged, this,
             &ConfigureDialog::UpdateVisibleTabs);
 
     adjustSize();
     ui->selectorList->setCurrentRow(0);
-
-    // Synchronise lists upon initialisation
-    ui->hotkeysTab->EmitHotkeysChanged();
 }
 
 ConfigureDialog::~ConfigureDialog() = default;
 
-void ConfigureDialog::setConfiguration() {}
-
-void ConfigureDialog::applyConfiguration() {
-    ui->generalTab->applyConfiguration();
-    ui->gameListTab->applyConfiguration();
-    ui->systemTab->applyConfiguration();
-    ui->profileManagerTab->applyConfiguration();
-    ui->inputTab->applyConfiguration();
-    ui->hotkeysTab->applyConfiguration(registry);
-    ui->graphicsTab->applyConfiguration();
-    ui->audioTab->applyConfiguration();
-    ui->debugTab->applyConfiguration();
-    ui->webTab->applyConfiguration();
+void ConfigureDialog::SetConfiguration() {}
+
+void ConfigureDialog::ApplyConfiguration() {
+    ui->generalTab->ApplyConfiguration();
+    ui->gameListTab->ApplyConfiguration();
+    ui->systemTab->ApplyConfiguration();
+    ui->profileManagerTab->ApplyConfiguration();
+    ui->inputTab->ApplyConfiguration();
+    ui->hotkeysTab->ApplyConfiguration(registry);
+    ui->graphicsTab->ApplyConfiguration();
+    ui->audioTab->ApplyConfiguration();
+    ui->debugTab->ApplyConfiguration();
+    ui->webTab->ApplyConfiguration();
     Settings::Apply();
     Settings::LogSettings();
 }
 
+void ConfigureDialog::changeEvent(QEvent* event) {
+    if (event->type() == QEvent::LanguageChange) {
+        RetranslateUI();
+    }
+
+    QDialog::changeEvent(event);
+}
+
+void ConfigureDialog::RetranslateUI() {
+    const int old_row = ui->selectorList->currentRow();
+    const int old_index = ui->tabWidget->currentIndex();
+
+    ui->retranslateUi(this);
+
+    PopulateSelectionList();
+    ui->selectorList->setCurrentRow(old_row);
+
+    UpdateVisibleTabs();
+    ui->tabWidget->setCurrentIndex(old_index);
+}
+
 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("Profiles"), tr("Audio")}},
          {tr("Graphics"), {tr("Graphics")}},
-         {tr("Controls"), {tr("Input"), tr("Hotkeys")}}}};
+         {tr("Controls"), {tr("Input"), tr("Hotkeys")}}},
+    };
+
+    [[maybe_unused]] const QSignalBlocker blocker(ui->selectorList);
 
+    ui->selectorList->clear();
     for (const auto& entry : items) {
         auto* const item = new QListWidgetItem(entry.first);
         item->setData(Qt::UserRole, entry.second);
@@ -66,24 +89,28 @@ void ConfigureDialog::PopulateSelectionList() {
 
 void ConfigureDialog::UpdateVisibleTabs() {
     const auto items = ui->selectorList->selectedItems();
-    if (items.isEmpty())
+    if (items.isEmpty()) {
         return;
+    }
 
-    const std::map<QString, QWidget*> widgets = {{tr("General"), ui->generalTab},
-                                                 {tr("System"), ui->systemTab},
-                                                 {tr("Profiles"), ui->profileManagerTab},
-                                                 {tr("Input"), ui->inputTab},
-                                                 {tr("Hotkeys"), ui->hotkeysTab},
-                                                 {tr("Graphics"), ui->graphicsTab},
-                                                 {tr("Audio"), ui->audioTab},
-                                                 {tr("Debug"), ui->debugTab},
-                                                 {tr("Web"), ui->webTab},
-                                                 {tr("Game List"), ui->gameListTab}};
+    const std::map<QString, QWidget*> widgets = {
+        {tr("General"), ui->generalTab},
+        {tr("System"), ui->systemTab},
+        {tr("Profiles"), ui->profileManagerTab},
+        {tr("Input"), ui->inputTab},
+        {tr("Hotkeys"), ui->hotkeysTab},
+        {tr("Graphics"), ui->graphicsTab},
+        {tr("Audio"), ui->audioTab},
+        {tr("Debug"), ui->debugTab},
+        {tr("Web"), ui->webTab},
+        {tr("Game List"), ui->gameListTab},
+    };
+
+    [[maybe_unused]] const QSignalBlocker blocker(ui->tabWidget);
 
     ui->tabWidget->clear();
-
     const QStringList tabs = items[0]->data(Qt::UserRole).toStringList();
-
-    for (const auto& tab : tabs)
+    for (const auto& tab : tabs) {
         ui->tabWidget->addTab(widgets.find(tab)->second, tab);
+    }
 }