X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fappearancesettingspage.cpp;h=91e32a010cc0ebc8cf1c2b30ba63dcdd2fd1a078;hp=1104bc34b8cd5d754308fd832999b16be7719988;hb=dcac65fc4beeb1167de8ebec5cc54608fc314fd3;hpb=335c0c0196da3ef371662b3c754f0516991906f4;ds=sidebyside

diff --git a/src/qtui/settingspages/appearancesettingspage.cpp b/src/qtui/settingspages/appearancesettingspage.cpp
index 1104bc34..91e32a01 100644
--- a/src/qtui/settingspages/appearancesettingspage.cpp
+++ b/src/qtui/settingspages/appearancesettingspage.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel IRC Team                         *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -20,6 +20,8 @@
 
 #include "appearancesettingspage.h"
 
+#include "buffersettings.h"
+#include "chatviewsettings.h"
 #include "qtui.h"
 #include "qtuisettings.h"
 #include "util.h"
@@ -28,13 +30,23 @@
 #include <QStyleFactory>
 
 AppearanceSettingsPage::AppearanceSettingsPage(QWidget *parent)
-  : SettingsPage(tr("Appearance"), tr("General"), parent) {
+  : SettingsPage(tr("Appearance"), QString(), parent)
+{
   ui.setupUi(this);
   initStyleComboBox();
   initLanguageComboBox();
 
-  connect(ui.styleComboBox, SIGNAL(currentIndexChanged(QString)), this, SLOT(widgetHasChanged()));
-  connect(ui.languageComboBox, SIGNAL(currentIndexChanged(QString)), this, SLOT(widgetHasChanged()));
+#ifndef HAVE_WEBKIT
+  ui.showWebPreview->hide();
+  ui.showWebPreview->setEnabled(false);
+#endif
+
+  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() {
@@ -46,7 +58,7 @@ void AppearanceSettingsPage::initStyleComboBox() {
 }
 
 void AppearanceSettingsPage::initLanguageComboBox() {
-  QDir i18nDir(":/i18n", "quassel_*.qm");
+  QDir i18nDir(Quassel::translationDirPath(), "quassel_*.qm");
 
   foreach(QString translationFile, i18nDir.entryList()) {
     QString localeName(translationFile.mid(8));
@@ -67,6 +79,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 +88,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);
@@ -82,7 +96,13 @@ void AppearanceSettingsPage::load() {
     ui.languageComboBox->setCurrentIndex(1);
   else
     ui.languageComboBox->setCurrentIndex(ui.languageComboBox->findText(QLocale::languageToString(locale.language()), Qt::MatchExactly));
-  loadTranslation(selectedLocale());
+  Quassel::loadTranslation(selectedLocale());
+
+  ChatViewSettings chatViewSettings;
+  SettingsPage::load(ui.showWebPreview, chatViewSettings.showWebPreview());
+
+  BufferSettings bufferSettings;
+  SettingsPage::load(ui.showUserStateIcons, bufferSettings.showUserStateIcons());
 
   setChangedState(false);
 }
@@ -102,6 +122,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 +153,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;
 }