X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fappearancesettingspage.cpp;h=7ca75e38083af82efe1b5f3a0226773196b7e94d;hp=d193b4155bf3aa0c0a640174044792f90cf80218;hb=c1cf157116de7fc3da96203aa6f03c38c7ebb650;hpb=30b159cb876a9495de42e9a3e70ca050516f0805

diff --git a/src/qtui/settingspages/appearancesettingspage.cpp b/src/qtui/settingspages/appearancesettingspage.cpp
index d193b415..7ca75e38 100644
--- a/src/qtui/settingspages/appearancesettingspage.cpp
+++ b/src/qtui/settingspages/appearancesettingspage.cpp
@@ -31,8 +31,7 @@
 #include "qtuisettings.h"
 #include "qtuistyle.h"
 
-
-AppearanceSettingsPage::AppearanceSettingsPage(QWidget *parent)
+AppearanceSettingsPage::AppearanceSettingsPage(QWidget* parent)
     : SettingsPage(tr("Interface"), QString(), parent)
 {
     ui.setupUi(this);
@@ -53,10 +52,10 @@ AppearanceSettingsPage::AppearanceSettingsPage(QWidget *parent)
     initLanguageComboBox();
     initIconThemeComboBox();
 
-    foreach(QComboBox *comboBox, findChildren<QComboBox *>()) {
+    foreach (QComboBox* comboBox, findChildren<QComboBox*>()) {
         connect(comboBox, selectOverload<const QString&>(&QComboBox::currentIndexChanged), this, &AppearanceSettingsPage::widgetHasChanged);
     }
-    foreach(QCheckBox *checkBox, findChildren<QCheckBox *>()) {
+    foreach (QCheckBox* checkBox, findChildren<QCheckBox*>()) {
         connect(checkBox, &QAbstractButton::clicked, this, &AppearanceSettingsPage::widgetHasChanged);
     }
 
@@ -75,23 +74,21 @@ AppearanceSettingsPage::AppearanceSettingsPage(QWidget *parent)
     connect(ui.errorMsgsInCurrentBuffer, &QAbstractButton::clicked, this, &AppearanceSettingsPage::widgetHasChanged);
 }
 
-
 void AppearanceSettingsPage::initStyleComboBox()
 {
     QStringList styleList = QStyleFactory::keys();
     ui.styleComboBox->addItem(tr("<System Default>"));
-    foreach(QString style, styleList) {
+    foreach (QString style, styleList) {
         ui.styleComboBox->addItem(style);
     }
 }
 
-
 void AppearanceSettingsPage::initLanguageComboBox()
 {
     QDir i18nDir(Quassel::translationDirPath(), "*.qm");
 
     QRegExp rx("(qt_)?([a-zA-Z_]+)\\.qm");
-    foreach(QString translationFile, i18nDir.entryList()) {
+    foreach (QString translationFile, i18nDir.entryList()) {
         if (!rx.exactMatch(translationFile))
             continue;
         if (!rx.cap(1).isEmpty())
@@ -99,7 +96,7 @@ void AppearanceSettingsPage::initLanguageComboBox()
         QLocale locale(rx.cap(2));
         _locales[QLocale::languageToString(locale.language())] = locale;
     }
-    foreach(QString language, _locales.keys()) {
+    foreach (QString language, _locales.keys()) {
         ui.languageComboBox->addItem(language);
     }
 }
@@ -109,12 +106,11 @@ void AppearanceSettingsPage::initIconThemeComboBox()
     auto availableThemes = QtUi::instance()->availableIconThemes();
 
     ui.iconThemeComboBox->addItem(tr("Automatic"), QString{});
-    for (auto &&p : QtUi::instance()->availableIconThemes()) {
+    for (auto&& p : QtUi::instance()->availableIconThemes()) {
         ui.iconThemeComboBox->addItem(p.second, p.first);
     }
 }
 
-
 void AppearanceSettingsPage::defaults()
 {
     ui.styleComboBox->setCurrentIndex(0);
@@ -124,7 +120,6 @@ void AppearanceSettingsPage::defaults()
     widgetHasChanged();
 }
 
-
 void AppearanceSettingsPage::load()
 {
     QtUiSettings uiSettings;
@@ -143,7 +138,7 @@ void AppearanceSettingsPage::load()
     QLocale locale = uiSettings.value("Locale", QLocale::system()).value<QLocale>();
     if (locale == QLocale::system())
         ui.languageComboBox->setCurrentIndex(1);
-    else if (locale.language() == QLocale::C) // we use C for "untranslated"
+    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));
@@ -182,7 +177,6 @@ void AppearanceSettingsPage::load()
     setChangedState(false);
 }
 
-
 void AppearanceSettingsPage::save()
 {
     QtUiSettings uiSettings;
@@ -198,7 +192,7 @@ void AppearanceSettingsPage::save()
     ui.styleComboBox->setProperty("storedValue", ui.styleComboBox->currentIndex());
 
     if (ui.languageComboBox->currentIndex() == 1) {
-        uiSettings.remove("Locale"); // force the default (QLocale::system())
+        uiSettings.remove("Locale");  // force the default (QLocale::system())
     }
     else {
         uiSettings.setValue("Locale", selectedLocale());
@@ -206,7 +200,7 @@ void AppearanceSettingsPage::save()
     ui.languageComboBox->setProperty("storedValue", ui.languageComboBox->currentIndex());
 
     bool needsIconThemeRefresh = ui.iconThemeComboBox->currentIndex() != ui.iconThemeComboBox->property("storedValue").toInt()
-                              || ui.overrideSystemIconTheme->isChecked() != ui.overrideSystemIconTheme->property("storedValue").toBool();
+                                 || ui.overrideSystemIconTheme->isChecked() != ui.overrideSystemIconTheme->property("storedValue").toBool();
 
     auto iconTheme = selectedIconTheme();
     if (iconTheme.isEmpty()) {
@@ -217,9 +211,9 @@ void AppearanceSettingsPage::save()
     }
     ui.iconThemeComboBox->setProperty("storedValue", ui.iconThemeComboBox->currentIndex());
 
-    bool needsStyleReload =
-        ui.useCustomStyleSheet->isChecked() != ui.useCustomStyleSheet->property("storedValue").toBool()
-        || (ui.useCustomStyleSheet->isChecked() && ui.customStyleSheetPath->text() != ui.customStyleSheetPath->property("storedValue").toString());
+    bool needsStyleReload = ui.useCustomStyleSheet->isChecked() != ui.useCustomStyleSheet->property("storedValue").toBool()
+                            || (ui.useCustomStyleSheet->isChecked()
+                                && ui.customStyleSheetPath->text() != ui.customStyleSheetPath->property("storedValue").toString());
 
     BufferSettings bufferSettings;
     int redirectTarget = 0;
@@ -257,7 +251,6 @@ void AppearanceSettingsPage::save()
         QtUi::instance()->refreshIconTheme();
 }
 
-
 QLocale AppearanceSettingsPage::selectedLocale() const
 {
     QLocale locale;
@@ -272,13 +265,11 @@ QLocale AppearanceSettingsPage::selectedLocale() const
     return locale;
 }
 
-
 QString AppearanceSettingsPage::selectedIconTheme() const
 {
     return ui.iconThemeComboBox->itemData(ui.iconThemeComboBox->currentIndex()).toString();
 }
 
-
 void AppearanceSettingsPage::chooseStyleSheet()
 {
     QString dir = ui.customStyleSheetPath->property("storedValue").toString();
@@ -292,30 +283,40 @@ void AppearanceSettingsPage::chooseStyleSheet()
         ui.customStyleSheetPath->setText(name);
 }
 
-
 void AppearanceSettingsPage::widgetHasChanged()
 {
     setChangedState(testHasChanged());
 }
 
-
 bool AppearanceSettingsPage::testHasChanged()
 {
-    if (ui.styleComboBox->currentIndex() != ui.styleComboBox->property("storedValue").toInt()) return true;
-    if (ui.languageComboBox->currentIndex() != ui.languageComboBox->property("storedValue").toInt()) return true;
-    if (ui.iconThemeComboBox->currentIndex() != ui.iconThemeComboBox->property("storedValue").toInt()) return true;
-
-    if (SettingsPage::hasChanged(ui.userNoticesInStatusBuffer)) return true;
-    if (SettingsPage::hasChanged(ui.userNoticesInDefaultBuffer)) return true;
-    if (SettingsPage::hasChanged(ui.userNoticesInCurrentBuffer)) return true;
-
-    if (SettingsPage::hasChanged(ui.serverNoticesInStatusBuffer)) return true;
-    if (SettingsPage::hasChanged(ui.serverNoticesInDefaultBuffer)) return true;
-    if (SettingsPage::hasChanged(ui.serverNoticesInCurrentBuffer)) return true;
-
-    if (SettingsPage::hasChanged(ui.errorMsgsInStatusBuffer)) return true;
-    if (SettingsPage::hasChanged(ui.errorMsgsInDefaultBuffer)) return true;
-    if (SettingsPage::hasChanged(ui.errorMsgsInCurrentBuffer)) return true;
+    if (ui.styleComboBox->currentIndex() != ui.styleComboBox->property("storedValue").toInt())
+        return true;
+    if (ui.languageComboBox->currentIndex() != ui.languageComboBox->property("storedValue").toInt())
+        return true;
+    if (ui.iconThemeComboBox->currentIndex() != ui.iconThemeComboBox->property("storedValue").toInt())
+        return true;
+
+    if (SettingsPage::hasChanged(ui.userNoticesInStatusBuffer))
+        return true;
+    if (SettingsPage::hasChanged(ui.userNoticesInDefaultBuffer))
+        return true;
+    if (SettingsPage::hasChanged(ui.userNoticesInCurrentBuffer))
+        return true;
+
+    if (SettingsPage::hasChanged(ui.serverNoticesInStatusBuffer))
+        return true;
+    if (SettingsPage::hasChanged(ui.serverNoticesInDefaultBuffer))
+        return true;
+    if (SettingsPage::hasChanged(ui.serverNoticesInCurrentBuffer))
+        return true;
+
+    if (SettingsPage::hasChanged(ui.errorMsgsInStatusBuffer))
+        return true;
+    if (SettingsPage::hasChanged(ui.errorMsgsInDefaultBuffer))
+        return true;
+    if (SettingsPage::hasChanged(ui.errorMsgsInCurrentBuffer))
+        return true;
 
     return false;
 }