X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fappearancesettingspage.cpp;h=fc4674fdbc42050c80d06bb2ad7a4e3848301d64;hp=1104bc34b8cd5d754308fd832999b16be7719988;hb=9996d2489e5e5ca23b0750f39f64d8d4b5990029;hpb=3e8c20eed6bdc729a3eac2946fad70b8e03c1d2a

diff --git a/src/qtui/settingspages/appearancesettingspage.cpp b/src/qtui/settingspages/appearancesettingspage.cpp
index 1104bc34..fc4674fd 100644
--- a/src/qtui/settingspages/appearancesettingspage.cpp
+++ b/src/qtui/settingspages/appearancesettingspage.cpp
@@ -20,6 +20,8 @@
 
 #include "appearancesettingspage.h"
 
+#include "buffersettings.h"
+#include "chatviewsettings.h"
 #include "qtui.h"
 #include "qtuisettings.h"
 #include "util.h"
@@ -33,8 +35,12 @@ AppearanceSettingsPage::AppearanceSettingsPage(QWidget *parent)
   initStyleComboBox();
   initLanguageComboBox();
 
-  connect(ui.styleComboBox, SIGNAL(currentIndexChanged(QString)), this, SLOT(widgetHasChanged()));
-  connect(ui.languageComboBox, SIGNAL(currentIndexChanged(QString)), this, SLOT(widgetHasChanged()));
+  foreach(QComboBox *comboBox, findChildren<QComboBox *>()) {
+    connect(comboBox, SIGNAL(currentIndexChanged(QString)), this, SLOT(widgetHasChanged()));
+  }
+  foreach(QCheckBox *checkBox, findChildren<QCheckBox *>()) {
+    connect(checkBox, SIGNAL(clicked()), this, SLOT(widgetHasChanged()));
+  }
 }
 
 void AppearanceSettingsPage::initStyleComboBox() {
@@ -67,6 +73,7 @@ void AppearanceSettingsPage::defaults() {
 void AppearanceSettingsPage::load() {
   QtUiSettings uiSettings;
 
+  // Gui Style
   settings["Style"] = uiSettings.value("Style", QString(""));
   if(settings["Style"].toString() == "") {
     ui.styleComboBox->setCurrentIndex(0);
@@ -75,6 +82,7 @@ void AppearanceSettingsPage::load() {
     QApplication::setStyle(settings["Style"].toString());
   }
 
+  // Language
   QLocale locale = uiSettings.value("Locale", QLocale::system()).value<QLocale>();
   if(locale == QLocale::system())
     ui.languageComboBox->setCurrentIndex(0);
@@ -84,6 +92,12 @@ void AppearanceSettingsPage::load() {
     ui.languageComboBox->setCurrentIndex(ui.languageComboBox->findText(QLocale::languageToString(locale.language()), Qt::MatchExactly));
   loadTranslation(selectedLocale());
 
+  ChatViewSettings chatViewSettings;
+  SettingsPage::load(ui.showWebPreview, chatViewSettings.showWebPreview());
+
+  BufferSettings bufferSettings;
+  SettingsPage::load(ui.showUserStateIcons, bufferSettings.showUserStateIcons());
+
   setChangedState(false);
 }
 
@@ -102,6 +116,12 @@ void AppearanceSettingsPage::save() {
     uiSettings.setValue("Locale", selectedLocale());
   }
 
+  ChatViewSettings chatViewSettings;
+  chatViewSettings.enableWebPreview(ui.showWebPreview->isChecked());
+
+  BufferSettings bufferSettings;
+  bufferSettings.enableUserStateIcons(ui.showUserStateIcons->isChecked());
+
   load();
   setChangedState(false);
 }
@@ -127,6 +147,9 @@ bool AppearanceSettingsPage::testHasChanged() {
   if(settings["Style"].toString() != ui.styleComboBox->currentText()) return true;
   if(selectedLocale() != QLocale()) return true; // QLocale() returns the default locale (manipulated via loadTranslation())
 
+  if(SettingsPage::hasChanged(ui.showWebPreview)) return true;
+  if(SettingsPage::hasChanged(ui.showUserStateIcons)) return true;
+
   return false;
 }