X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fappearancesettingspage.cpp;h=cf3cdfc0038105b6333307ec4699990f97352ae9;hp=0b61893a226300053ff43865b49e65418635b077;hb=a113f73e5f8ce89c3df5c42d55528404fc7a2294;hpb=1cb02004ee5973b89368bd84f234d4652794690d

diff --git a/src/qtui/settingspages/appearancesettingspage.cpp b/src/qtui/settingspages/appearancesettingspage.cpp
index 0b61893a..cf3cdfc0 100644
--- a/src/qtui/settingspages/appearancesettingspage.cpp
+++ b/src/qtui/settingspages/appearancesettingspage.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2015 by the Quassel Project                        *
+ *   Copyright (C) 2005-2016 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -46,6 +46,7 @@ AppearanceSettingsPage::AppearanceSettingsPage(QWidget *parent)
     initAutoWidgets();
     initStyleComboBox();
     initLanguageComboBox();
+    initIconThemeComboBox();
 
     foreach(QComboBox *comboBox, findChildren<QComboBox *>()) {
         connect(comboBox, SIGNAL(currentIndexChanged(QString)), this, SLOT(widgetHasChanged()));
@@ -98,6 +99,25 @@ void AppearanceSettingsPage::initLanguageComboBox()
     }
 }
 
+void AppearanceSettingsPage::initIconThemeComboBox()
+{
+    // TODO Replace by runtime detection
+#if defined WITH_OXYGEN || defined WITH_BREEZE || defined WITH_BREEZE_DARK
+# if defined WITH_BREEZE
+    ui.iconthemeComboBox->addItem(tr("Breeze Light"), QVariant("breeze"));
+# endif
+# if defined WITH_BREEZE_DARK
+    ui.iconthemeComboBox->addItem(tr("Breeze Dark"), QVariant("breezedark"));
+# endif
+# if defined WITH_OXYGEN
+    ui.iconthemeComboBox->addItem(tr("Oxygen"), QVariant("oxygen"));
+# endif
+#else
+    ui.iconthemeLabel->hide();
+    ui.iconthemeComboBox->hide();
+#endif
+}
+
 
 void AppearanceSettingsPage::defaults()
 {
@@ -134,6 +154,14 @@ void AppearanceSettingsPage::load()
     ui.languageComboBox->setProperty("storedValue", ui.languageComboBox->currentIndex());
     Quassel::loadTranslation(selectedLocale());
 
+    // IconTheme
+    QString icontheme = uiSettings.value("IconTheme", QVariant("")).toString();
+    if (icontheme == "")
+        ui.iconthemeComboBox->setCurrentIndex(0);
+    else
+        ui.iconthemeComboBox->setCurrentIndex(ui.iconthemeComboBox->findData(icontheme));
+    ui.iconthemeComboBox->setProperty("storedValue", ui.iconthemeComboBox->currentIndex());
+
     // bufferSettings:
     BufferSettings bufferSettings;
     int redirectTarget = bufferSettings.userNoticesTarget();
@@ -177,6 +205,15 @@ void AppearanceSettingsPage::save()
     }
     ui.languageComboBox->setProperty("storedValue", ui.languageComboBox->currentIndex());
 
+    if (selectedIconTheme()=="") {
+        uiSettings.remove("IconTheme");
+    }
+    else {
+        uiSettings.setValue("IconTheme", selectedIconTheme());
+        QIcon::setThemeName(selectedIconTheme());
+    }
+    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());
@@ -230,6 +267,10 @@ QLocale AppearanceSettingsPage::selectedLocale() const
     return locale;
 }
 
+QString AppearanceSettingsPage::selectedIconTheme() const
+{
+    return ui.iconthemeComboBox->itemData(ui.iconthemeComboBox->currentIndex()).toString();
+}
 
 void AppearanceSettingsPage::chooseStyleSheet()
 {
@@ -255,6 +296,7 @@ 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;