X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=inline;f=src%2Fqtui%2Fsettingspages%2Fappearancesettingspage.cpp;h=3346eeb3fd4b827a2270099cbef4be912122bad3;hb=ec2b99363141d3cad003b8533b5462a313ade3c1;hp=c6a8b455948b53d1d6a4636918779e99a284c3f3;hpb=c14a00f37179e49f034dc64b4da0c86b51caed5d;p=quassel.git

diff --git a/src/qtui/settingspages/appearancesettingspage.cpp b/src/qtui/settingspages/appearancesettingspage.cpp
index c6a8b455..3346eeb3 100644
--- a/src/qtui/settingspages/appearancesettingspage.cpp
+++ b/src/qtui/settingspages/appearancesettingspage.cpp
@@ -33,7 +33,8 @@
 #include <QStyleFactory>
 
 AppearanceSettingsPage::AppearanceSettingsPage(QWidget *parent)
-  : SettingsPage(tr("Appearance"), QString(), parent)
+  : SettingsPage(tr("Appearance"), QString(), parent),
+  _fontsChanged(false)
 {
   ui.setupUi(this);
   initStyleComboBox();
@@ -88,6 +89,10 @@ void AppearanceSettingsPage::defaults() {
 
   loadFonts(Settings::Default);
   _fontsChanged = true;
+
+  ui.showWebPreview->setChecked(true);
+  ui.showUserStateIcons->setChecked(true);
+
   widgetHasChanged();
 }
 
@@ -95,13 +100,14 @@ void AppearanceSettingsPage::load() {
   QtUiSettings uiSettings;
 
   // Gui Style
-  settings["Style"] = uiSettings.value("Style", QString(""));
-  if(settings["Style"].toString() == "") {
+  QString style = uiSettings.value("Style", QString("")).toString();
+  if(style.isEmpty()) {
     ui.styleComboBox->setCurrentIndex(0);
   } else {
-    ui.styleComboBox->setCurrentIndex(ui.styleComboBox->findText(settings["Style"].toString(), Qt::MatchExactly));
-    QApplication::setStyle(settings["Style"].toString());
+    ui.styleComboBox->setCurrentIndex(ui.styleComboBox->findText(style, Qt::MatchExactly));
+    QApplication::setStyle(style);
   }
+  ui.styleComboBox->setProperty("storedValue", ui.styleComboBox->currentIndex());
 
   // Language
   QLocale locale = uiSettings.value("Locale", QLocale::system()).value<QLocale>();
@@ -111,6 +117,7 @@ void AppearanceSettingsPage::load() {
     ui.languageComboBox->setCurrentIndex(1);
   else
     ui.languageComboBox->setCurrentIndex(ui.languageComboBox->findText(QLocale::languageToString(locale.language()), Qt::MatchExactly));
+  ui.languageComboBox->setProperty("storedValue", ui.languageComboBox->currentIndex());
   Quassel::loadTranslation(selectedLocale());
 
   ChatViewSettings chatViewSettings;
@@ -137,8 +144,8 @@ void AppearanceSettingsPage::loadFonts(Settings::Mode mode) {
     bufferViewFont = s.value("BufferView", QFont()).value<QFont>();
   setFont(ui.demoBufferView, bufferViewFont);
 
-  QTextCharFormat chatFormat = QtUi::style()->format(UiStyle::None, mode);
-  setFont(ui.demoChatView, chatFormat.font());
+  //QTextCharFormat chatFormat = QtUi::style()->cachedFormat(UiStyle::None, 0); // FIXME
+  //setFont(ui.demoChatView, chatFormat.font());
 
   _fontsChanged = false;
 }
@@ -176,9 +183,9 @@ void AppearanceSettingsPage::save() {
   else
     fontSettings.setValue("BufferView", "");
 
-  QTextCharFormat chatFormat = QtUi::style()->format(UiStyle::None);
-  chatFormat.setFont(ui.demoChatView->font());
-  QtUi::style()->setFormat(UiStyle::None, chatFormat, Settings::Custom);
+  //QTextCharFormat chatFormat = QtUi::style()->format(UiStyle::None);
+  //chatFormat.setFont(ui.demoChatView->font());
+  //QtUi::style()->setFormat(UiStyle::None, chatFormat, Settings::Custom);
 
   _fontsChanged = false;
 
@@ -214,8 +221,8 @@ void AppearanceSettingsPage::chooseFont(QWidget *widget) {
   bool ok;
   QFont font = QFontDialog::getFont(&ok, label->font());
   if(ok) {
-    setFont(label, font);
     _fontsChanged = true;
+    setFont(label, font);
   }
 }
 
@@ -226,7 +233,8 @@ void AppearanceSettingsPage::widgetHasChanged() {
 bool AppearanceSettingsPage::testHasChanged() {
   if(_fontsChanged) return true; // comparisons are nasty for now
 
-  if(settings["Style"].toString() != ui.styleComboBox->currentText()) return true;
+  if(ui.styleComboBox->currentIndex() != ui.styleComboBox->property("storedValue").toInt()) return true;
+
   if(selectedLocale() != QLocale()) return true; // QLocale() returns the default locale (manipulated via loadTranslation())
 
   if(SettingsPage::hasChanged(ui.showWebPreview)) return true;