sort languages in settings V2

[quassel.git] / src / qtui / settingspages / appearancesettingspage.cpp

diff --git a/src/qtui/settingspages/appearancesettingspage.cpp b/src/qtui/settingspages/appearancesettingspage.cpp
index d5d63d3..0795e91 100644 (file)
--- a/src/qtui/settingspages/appearancesettingspage.cpp
+++ b/src/qtui/settingspages/appearancesettingspage.cpp
@@ -39,6 +39,9 @@ AppearanceSettingsPage::AppearanceSettingsPage(QWidget *parent)
 #ifdef Q_WS_MAC
   ui.minimizeOnClose->hide();
 #endif
+#ifdef QT_NO_SYSTEMTRAYICON
+  ui.useSystemTrayIcon->hide();
+#endif
 
   initAutoWidgets();
   initStyleComboBox();
@@ -84,8 +87,10 @@ void AppearanceSettingsPage::initLanguageComboBox() {
     if(!rx.cap(1).isEmpty())
       continue;
     QLocale locale(rx.cap(2));
-    _locales << locale;
-    ui.languageComboBox->addItem(QLocale::languageToString(locale.language()));
+    _locales[QLocale::languageToString(locale.language())] = locale;
+  }
+  foreach(QString language, _locales.keys()) {
+    ui.languageComboBox->addItem(language);
   }
 }
 
@@ -154,7 +159,6 @@ void AppearanceSettingsPage::save() {
 
   if(ui.languageComboBox->currentIndex() == 1) {
     uiSettings.remove("Locale"); // force the default (QLocale::system())
-    qDebug() << "removing";
   } else {
     uiSettings.setValue("Locale", selectedLocale());
   }
@@ -206,7 +210,7 @@ QLocale AppearanceSettingsPage::selectedLocale() const {
   else if(index == 0)
     locale = QLocale::c();
   else if(index > 1)
-    locale = _locales[index - 2];
+    locale = _locales.values()[index - 2];
 
   return locale;
 }