X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fappearancesettingspage.cpp;h=91369f9c90417986b1164a78834d4408a1d19e09;hp=19d2d9c836d9f54042ffd3236d4fc46723166b0a;hb=c0f725d462b8f9737cfc5ee6a9766b61cf103ab1;hpb=a8c38cbe8d8686cc36c42b04d556a3d51d37576d

diff --git a/src/qtui/settingspages/appearancesettingspage.cpp b/src/qtui/settingspages/appearancesettingspage.cpp
index 19d2d9c8..91369f9c 100644
--- 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();
@@ -75,12 +78,15 @@ void AppearanceSettingsPage::initStyleComboBox() {
 }
 
 void AppearanceSettingsPage::initLanguageComboBox() {
-  QDir i18nDir(Quassel::translationDirPath(), "quassel_*.qm");
+  QDir i18nDir(Quassel::translationDirPath(), "*.qm");
 
+  QRegExp rx("(qt_)?([a-zA-Z_]+)\\.qm");
   foreach(QString translationFile, i18nDir.entryList()) {
-    QString localeName(translationFile.mid(8));
-    localeName.chop(3);
-    QLocale locale(localeName);
+    if(!rx.exactMatch(translationFile))
+      continue;
+    if(!rx.cap(1).isEmpty())
+      continue;
+    QLocale locale(rx.cap(2));
     _locales << locale;
     ui.languageComboBox->addItem(QLocale::languageToString(locale.language()));
   }
@@ -88,6 +94,7 @@ void AppearanceSettingsPage::initLanguageComboBox() {
 
 void AppearanceSettingsPage::defaults() {
   ui.styleComboBox->setCurrentIndex(0);
+  ui.languageComboBox->setCurrentIndex(1);
 
   SettingsPage::defaults();
   widgetHasChanged();
@@ -108,9 +115,9 @@ void AppearanceSettingsPage::load() {
   // Language
   QLocale locale = uiSettings.value("Locale", QLocale::system()).value<QLocale>();
   if(locale == QLocale::system())
-    ui.languageComboBox->setCurrentIndex(0);
-  else if(locale.language() == QLocale::C)
     ui.languageComboBox->setCurrentIndex(1);
+  else if(locale.language() == QLocale::C)  // we use C for "untranslated"
+    ui.languageComboBox->setCurrentIndex(0);
   else
     ui.languageComboBox->setCurrentIndex(ui.languageComboBox->findText(QLocale::languageToString(locale.language()), Qt::MatchExactly));
   ui.languageComboBox->setProperty("storedValue", ui.languageComboBox->currentIndex());
@@ -146,12 +153,14 @@ void AppearanceSettingsPage::save() {
     uiSettings.setValue("Style", ui.styleComboBox->currentText());
     QApplication::setStyle(ui.styleComboBox->currentText());
   }
+  ui.styleComboBox->setProperty("storedValue", ui.styleComboBox->currentIndex());
 
-  if(ui.languageComboBox->currentIndex() == 0) {
+  if(ui.languageComboBox->currentIndex() == 1) {
     uiSettings.remove("Locale"); // force the default (QLocale::system())
   } else {
     uiSettings.setValue("Locale", selectedLocale());
   }
+  ui.languageComboBox->setProperty("storedValue", ui.languageComboBox->currentIndex());
 
   bool needsStyleReload =
         ui.useCustomStyleSheet->isChecked() != ui.useCustomStyleSheet->property("storedValue").toBool()
@@ -194,9 +203,9 @@ void AppearanceSettingsPage::save() {
 QLocale AppearanceSettingsPage::selectedLocale() const {
   QLocale locale;
   int index = ui.languageComboBox->currentIndex();
-  if(index == 0)
+  if(index == 1)
     locale = QLocale::system();
-  else if(index == 1)
+  else if(index == 0)
     locale = QLocale::c();
   else if(index > 1)
     locale = _locales[index - 2];
@@ -222,8 +231,7 @@ void AppearanceSettingsPage::widgetHasChanged() {
 
 bool AppearanceSettingsPage::testHasChanged() {
   if(ui.styleComboBox->currentIndex() != ui.styleComboBox->property("storedValue").toInt()) return true;
-
-  if(selectedLocale() != QLocale()) return true; // QLocale() returns the default locale (manipulated via loadTranslation())
+  if(ui.languageComboBox->currentIndex() != ui.languageComboBox->property("storedValue").toInt()) return true;
 
   if(SettingsPage::hasChanged(ui.userNoticesInStatusBuffer)) return true;
   if(SettingsPage::hasChanged(ui.userNoticesInDefaultBuffer)) return true;