X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fappearancesettingspage.cpp;h=c6a8b455948b53d1d6a4636918779e99a284c3f3;hp=91e32a010cc0ebc8cf1c2b30ba63dcdd2fd1a078;hb=c14a00f37179e49f034dc64b4da0c86b51caed5d;hpb=55c127eea871373f770f0155a73df013d2307276

diff --git a/src/qtui/settingspages/appearancesettingspage.cpp b/src/qtui/settingspages/appearancesettingspage.cpp
index 91e32a01..c6a8b455 100644
--- a/src/qtui/settingspages/appearancesettingspage.cpp
+++ b/src/qtui/settingspages/appearancesettingspage.cpp
@@ -24,9 +24,12 @@
 #include "chatviewsettings.h"
 #include "qtui.h"
 #include "qtuisettings.h"
+#include "qtuistyle.h"
 #include "util.h"
 
 #include <QDir>
+#include <QFontDialog>
+#include <QSignalMapper>
 #include <QStyleFactory>
 
 AppearanceSettingsPage::AppearanceSettingsPage(QWidget *parent)
@@ -47,6 +50,17 @@ AppearanceSettingsPage::AppearanceSettingsPage(QWidget *parent)
   foreach(QCheckBox *checkBox, findChildren<QCheckBox *>()) {
     connect(checkBox, SIGNAL(clicked()), this, SLOT(widgetHasChanged()));
   }
+
+  mapper = new QSignalMapper(this);
+  connect(mapper, SIGNAL(mapped(QWidget *)), this, SLOT(chooseFont(QWidget *)));
+
+  connect(ui.chooseChatView, SIGNAL(clicked()), mapper, SLOT(map()));
+  connect(ui.chooseBufferView, SIGNAL(clicked()), mapper, SLOT(map()));
+  connect(ui.chooseInputLine, SIGNAL(clicked()), mapper, SLOT(map()));
+
+  mapper->setMapping(ui.chooseChatView, ui.demoChatView);
+  mapper->setMapping(ui.chooseBufferView, ui.demoBufferView);
+  mapper->setMapping(ui.chooseInputLine, ui.demoInputLine);
 }
 
 void AppearanceSettingsPage::initStyleComboBox() {
@@ -67,12 +81,13 @@ void AppearanceSettingsPage::initLanguageComboBox() {
     _locales << locale;
     ui.languageComboBox->addItem(QLocale::languageToString(locale.language()));
   }
-
 }
 
 void AppearanceSettingsPage::defaults() {
   ui.styleComboBox->setCurrentIndex(0);
 
+  loadFonts(Settings::Default);
+  _fontsChanged = true;
   widgetHasChanged();
 }
 
@@ -104,9 +119,30 @@ void AppearanceSettingsPage::load() {
   BufferSettings bufferSettings;
   SettingsPage::load(ui.showUserStateIcons, bufferSettings.showUserStateIcons());
 
+  loadFonts(Settings::Custom);
+
   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()->format(UiStyle::None, mode);
+  setFont(ui.demoChatView, chatFormat.font());
+
+  _fontsChanged = false;
+}
+
 void AppearanceSettingsPage::save() {
   QtUiSettings uiSettings;
 
@@ -128,6 +164,24 @@ void AppearanceSettingsPage::save() {
   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;
+
   load();
   setChangedState(false);
 }
@@ -145,11 +199,33 @@ 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) {
+    setFont(label, font);
+    _fontsChanged = true;
+  }
+}
+
 void AppearanceSettingsPage::widgetHasChanged() {
   setChangedState(testHasChanged());
 }
 
 bool AppearanceSettingsPage::testHasChanged() {
+  if(_fontsChanged) return true; // comparisons are nasty for now
+
   if(settings["Style"].toString() != ui.styleComboBox->currentText()) return true;
   if(selectedLocale() != QLocale()) return true; // QLocale() returns the default locale (manipulated via loadTranslation())
 
@@ -158,7 +234,3 @@ bool AppearanceSettingsPage::testHasChanged() {
 
   return false;
 }
-
-
-
-