X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fappearancesettingspage.cpp;h=228fe40391888a51fe6fb7ccd75179dadef16ec9;hp=e33381696877bf2405b941892e71b445e7b98a6f;hb=d7832127ff8412b09d9fa4e56570d8a890abcbbe;hpb=9fb25d34cfc4dee02159b112c72e018c6e26e63f

diff --git a/src/qtui/settingspages/appearancesettingspage.cpp b/src/qtui/settingspages/appearancesettingspage.cpp
index e3338169..228fe403 100644
--- a/src/qtui/settingspages/appearancesettingspage.cpp
+++ b/src/qtui/settingspages/appearancesettingspage.cpp
@@ -20,33 +20,22 @@
 
 #include "appearancesettingspage.h"
 
-#include "buffersettings.h"
-#include "chatviewsettings.h"
 #include "qtui.h"
 #include "qtuisettings.h"
 #include "qtuistyle.h"
-#include "util.h"
 
-#include <QDir>
+#include <QCheckBox>
 #include <QFileDialog>
-#include <QFontDialog>
-#include <QSignalMapper>
 #include <QStyleFactory>
 
 AppearanceSettingsPage::AppearanceSettingsPage(QWidget *parent)
-  : SettingsPage(tr("Appearance"), QString(), parent),
-  _fontsChanged(false)
+  : SettingsPage(tr("Interface"), QString(), parent)
 {
   ui.setupUi(this);
   initAutoWidgets();
   initStyleComboBox();
   initLanguageComboBox();
 
-#ifndef HAVE_WEBKIT
-  ui.showWebPreview->hide();
-  ui.showWebPreview->setEnabled(false);
-#endif
-
   foreach(QComboBox *comboBox, findChildren<QComboBox *>()) {
     connect(comboBox, SIGNAL(currentIndexChanged(QString)), this, SLOT(widgetHasChanged()));
   }
@@ -54,15 +43,6 @@ AppearanceSettingsPage::AppearanceSettingsPage(QWidget *parent)
     connect(checkBox, SIGNAL(clicked()), this, SLOT(widgetHasChanged()));
   }
 
-  mapper = new QSignalMapper(this);
-  connect(mapper, SIGNAL(mapped(QWidget *)), this, SLOT(chooseFont(QWidget *)));
-
-  connect(ui.chooseBufferView, SIGNAL(clicked()), mapper, SLOT(map()));
-  connect(ui.chooseInputLine, SIGNAL(clicked()), mapper, SLOT(map()));
-
-  mapper->setMapping(ui.chooseBufferView, ui.demoBufferView);
-  mapper->setMapping(ui.chooseInputLine, ui.demoInputLine);
-
   connect(ui.chooseStyleSheet, SIGNAL(clicked()), SLOT(chooseStyleSheet()));
 }
 
@@ -89,11 +69,6 @@ void AppearanceSettingsPage::initLanguageComboBox() {
 void AppearanceSettingsPage::defaults() {
   ui.styleComboBox->setCurrentIndex(0);
 
-  loadFonts(Settings::Default);
-  _fontsChanged = true;
-
-  ui.showUserStateIcons->setChecked(true);
-
   SettingsPage::defaults();
   widgetHasChanged();
 }
@@ -122,34 +97,10 @@ void AppearanceSettingsPage::load() {
   ui.languageComboBox->setProperty("storedValue", ui.languageComboBox->currentIndex());
   Quassel::loadTranslation(selectedLocale());
 
-  BufferSettings bufferSettings;
-  SettingsPage::load(ui.showUserStateIcons, bufferSettings.showUserStateIcons());
-
-  loadFonts(Settings::Custom);
-
   SettingsPage::load();
   setChangedState(false);
 }
 
-void AppearanceSettingsPage::loadFonts(Settings::Mode mode) {
-  QtUiStyleSettings s("Fonts");
-
-  QFont inputLineFont;
-  if(mode == Settings::Custom)
-    inputLineFont = s.value("InputLine", QFont()).value<QFont>();
-  setFont(ui.demoInputLine, inputLineFont);
-
-  QFont bufferViewFont;
-  if(mode == Settings::Custom)
-    bufferViewFont = s.value("BufferView", QFont()).value<QFont>();
-  setFont(ui.demoBufferView, bufferViewFont);
-
-  //QTextCharFormat chatFormat = QtUi::style()->cachedFormat(UiStyle::None, 0); // FIXME
-  //setFont(ui.demoChatView, chatFormat.font());
-
-  _fontsChanged = false;
-}
-
 void AppearanceSettingsPage::save() {
   QtUiSettings uiSettings;
 
@@ -165,29 +116,14 @@ void AppearanceSettingsPage::save() {
     uiSettings.setValue("Locale", selectedLocale());
   }
 
-  BufferSettings bufferSettings;
-  bufferSettings.enableUserStateIcons(ui.showUserStateIcons->isChecked());
-
-  // Fonts
-  QtUiStyleSettings fontSettings("Fonts");
-  if(ui.demoInputLine->font() != QApplication::font())
-    fontSettings.setValue("InputLine", ui.demoInputLine->font());
-  else
-    fontSettings.setValue("InputLine", "");
-
-  if(ui.demoBufferView->font() != QApplication::font())
-    fontSettings.setValue("BufferView", ui.demoBufferView->font());
-  else
-    fontSettings.setValue("BufferView", "");
-
-  //QTextCharFormat chatFormat = QtUi::style()->format(UiStyle::None);
-  //chatFormat.setFont(ui.demoChatView->font());
-  //QtUi::style()->setFormat(UiStyle::None, chatFormat, Settings::Custom);
-
-  _fontsChanged = false;
+  bool needsStyleReload =
+        ui.useCustomStyleSheet->isChecked() != ui.useCustomStyleSheet->property("storedValue").toBool()
+    || (ui.useCustomStyleSheet->isChecked() && ui.customStyleSheetPath->text() != ui.customStyleSheetPath->property("storedValue").toString());
 
   SettingsPage::save();
   setChangedState(false);
+  if(needsStyleReload)
+    QtUi::style()->reload();
 }
 
 QLocale AppearanceSettingsPage::selectedLocale() const {
@@ -203,26 +139,6 @@ QLocale AppearanceSettingsPage::selectedLocale() const {
   return locale;
 }
 
-void AppearanceSettingsPage::setFont(QLabel *label, const QFont &font_) {
-  QFont font = font_;
-  if(font.family().isEmpty())
-    font = QApplication::font();
-  label->setFont(font);
-  label->setText(QString("%1 %2").arg(font.family()).arg(font.pointSize()));
-  widgetHasChanged();
-}
-
-void AppearanceSettingsPage::chooseFont(QWidget *widget) {
-  QLabel *label = qobject_cast<QLabel *>(widget);
-  Q_ASSERT(label);
-  bool ok;
-  QFont font = QFontDialog::getFont(&ok, label->font());
-  if(ok) {
-    _fontsChanged = true;
-    setFont(label, font);
-  }
-}
-
 void AppearanceSettingsPage::chooseStyleSheet() {
   QString name = QFileDialog::getOpenFileName(this, tr("Please choose a stylesheet file"), QString(), "*.qss");
   if(!name.isEmpty())
@@ -234,13 +150,9 @@ void AppearanceSettingsPage::widgetHasChanged() {
 }
 
 bool AppearanceSettingsPage::testHasChanged() {
-  if(_fontsChanged) return true; // comparisons are nasty for now
-
   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.showUserStateIcons)) return true;
-
   return false;
 }