X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fappearancesettingspage.cpp;h=fc4674fdbc42050c80d06bb2ad7a4e3848301d64;hp=4fcaa0d84a5a9edbe8e91046afdef5ef653b745d;hb=731ec69d4608ba95e3ae4f154b8ca1852e1db2e5;hpb=665faa937a52fc6175741292737c4a52875b4f75

diff --git a/src/qtui/settingspages/appearancesettingspage.cpp b/src/qtui/settingspages/appearancesettingspage.cpp
index 4fcaa0d8..fc4674fd 100644
--- a/src/qtui/settingspages/appearancesettingspage.cpp
+++ b/src/qtui/settingspages/appearancesettingspage.cpp
@@ -20,8 +20,10 @@
 
 #include "appearancesettingspage.h"
 
+#include "buffersettings.h"
+#include "chatviewsettings.h"
 #include "qtui.h"
-#include "uisettings.h"
+#include "qtuisettings.h"
 #include "util.h"
 
 #include <QDir>
@@ -33,13 +35,17 @@ 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() {
   QStringList styleList = QStyleFactory::keys();
-  ui.styleComboBox->addItem("<default>");
+  ui.styleComboBox->addItem(tr("<System Default>"));
   foreach(QString style, styleList) {
     ui.styleComboBox->addItem(style);
   }
@@ -65,8 +71,9 @@ void AppearanceSettingsPage::defaults() {
 }
 
 void AppearanceSettingsPage::load() {
-  UiSettings uiSettings;
+  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,11 +92,17 @@ 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);
 }
 
 void AppearanceSettingsPage::save() {
-  UiSettings uiSettings;
+  QtUiSettings uiSettings;
 
   if(ui.styleComboBox->currentIndex() < 1) {
     uiSettings.setValue("Style", QString(""));
@@ -101,7 +115,13 @@ void AppearanceSettingsPage::save() {
   } else {
     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;
 }