From 86905820cd479a6e12af2fe4f4dd8396644b12ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= <bjorn@lindeijer.nl>
Date: Mon, 15 Aug 2016 13:50:04 +0200
Subject: [PATCH] Preferences: Fixed style changing to native when switching
 language

Was a problem with the way the translated values of the style combo box
were being updated.
---
 src/tiled/preferencesdialog.cpp |  9 +++++++++
 src/tiled/preferencesdialog.ui  | 18 +-----------------
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/src/tiled/preferencesdialog.cpp b/src/tiled/preferencesdialog.cpp
index 2c52e68002..80638309a9 100755
--- a/src/tiled/preferencesdialog.cpp
+++ b/src/tiled/preferencesdialog.cpp
@@ -61,6 +61,11 @@ PreferencesDialog::PreferencesDialog(QWidget *parent)
     mUi->languageCombo->model()->sort(0);
     mUi->languageCombo->insertItem(0, tr("System default"));
 
+    mUi->styleCombo->addItems(QStringList()
+                              << QApplication::translate("PreferencesDialog", "Native")
+                              << QApplication::translate("PreferencesDialog", "Fusion")
+                              << QApplication::translate("PreferencesDialog", "Tiled Fusion"));
+
     PluginListModel *pluginListModel = new PluginListModel(this);
     QSortFilterProxyModel *pluginProxyModel = new QSortFilterProxyModel(this);
     pluginProxyModel->setSortLocaleAware(true);
@@ -178,6 +183,10 @@ void PreferencesDialog::fromPreferences()
 void PreferencesDialog::retranslateUi()
 {
     mUi->languageCombo->setItemText(0, tr("System default"));
+
+    mUi->styleCombo->setItemText(0, QApplication::translate("PreferencesDialog", "Native"));
+    mUi->styleCombo->setItemText(1, QApplication::translate("PreferencesDialog", "Fusion"));
+    mUi->styleCombo->setItemText(2, QApplication::translate("PreferencesDialog", "Tiled Fusion"));
 }
 
 void PreferencesDialog::styleComboChanged(int index)
diff --git a/src/tiled/preferencesdialog.ui b/src/tiled/preferencesdialog.ui
index a7d0782056..9b1a00c6ef 100644
--- a/src/tiled/preferencesdialog.ui
+++ b/src/tiled/preferencesdialog.ui
@@ -204,23 +204,7 @@
            </spacer>
           </item>
           <item row="0" column="2">
-           <widget class="QComboBox" name="styleCombo">
-            <item>
-             <property name="text">
-              <string>Native</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Fusion</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Tiled Fusion</string>
-             </property>
-            </item>
-           </widget>
+           <widget class="QComboBox" name="styleCombo"/>
           </item>
           <item row="2" column="0" colspan="2">
            <widget class="QLabel" name="selectionColorLabel">