#ifdef Q_WS_MAC
ui.minimizeOnClose->hide();
#endif
+#ifdef QT_NO_SYSTEMTRAYICON
+ ui.useSystemTrayIcon->hide();
+#endif
initAutoWidgets();
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);
- _locales << locale;
- ui.languageComboBox->addItem(QLocale::languageToString(locale.language()));
+ if(!rx.exactMatch(translationFile))
+ continue;
+ if(!rx.cap(1).isEmpty())
+ continue;
+ QLocale locale(rx.cap(2));
+ _locales[QLocale::languageToString(locale.language())] = locale;
+ }
+ foreach(QString language, _locales.keys()) {
+ ui.languageComboBox->addItem(language);
}
}
void AppearanceSettingsPage::defaults() {
ui.styleComboBox->setCurrentIndex(0);
+ ui.languageComboBox->setCurrentIndex(1);
SettingsPage::defaults();
widgetHasChanged();
ui.styleComboBox->setCurrentIndex(0);
} else {
ui.styleComboBox->setCurrentIndex(ui.styleComboBox->findText(style, Qt::MatchExactly));
- QApplication::setStyle(style);
}
ui.styleComboBox->setProperty("storedValue", ui.styleComboBox->currentIndex());
// 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());
uiSettings.setValue("Style", QString(""));
} else {
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()
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];
+ locale = _locales.values()[index - 2];
return locale;
}
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;