From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Tue, 8 Sep 2009 21:55:44 +0000 (+0200)
Subject: Fix fonts configuration for the input widget, too
X-Git-Tag: 0.5-rc2~80
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=1e0bc6a99db648fe68a9aab398d18f041bb17b7f

Fix fonts configuration for the input widget, too

Disabling the custom font wouldn't always take effect.
---

diff --git a/src/qtui/inputwidget.cpp b/src/qtui/inputwidget.cpp
index 22e0602b..2cff583b 100644
--- a/src/qtui/inputwidget.cpp
+++ b/src/qtui/inputwidget.cpp
@@ -59,8 +59,10 @@ InputWidget::InputWidget(QWidget *parent)
   new TabCompleter(ui.inputEdit);
 
   UiStyleSettings fs("Fonts");
+  fs.notify("UseCustomInputWidgetFont", this, SLOT(setUseCustomFont(QVariant)));
   fs.notify("InputWidget", this, SLOT(setCustomFont(QVariant)));
-  setCustomFont(fs.value("InputWidget", QFont()));
+  if(fs.value("UseCustomInputWidgetFont", false).toBool())
+    setCustomFont(fs.value("InputWidget", QFont()));
 
   UiSettings s("InputWidget");
 
@@ -92,6 +94,14 @@ InputWidget::InputWidget(QWidget *parent)
 InputWidget::~InputWidget() {
 }
 
+void InputWidget::setUseCustomFont(const QVariant &v) {
+  if(v.toBool()) {
+    UiStyleSettings fs("Fonts");
+    setCustomFont(fs.value("InputWidget"));
+  } else
+    setCustomFont(QFont());
+}
+
 void InputWidget::setCustomFont(const QVariant &v) {
   QFont font = v.value<QFont>();
   if(font.family().isEmpty())
diff --git a/src/qtui/inputwidget.h b/src/qtui/inputwidget.h
index 6e785095..7b6be7b0 100644
--- a/src/qtui/inputwidget.h
+++ b/src/qtui/inputwidget.h
@@ -52,6 +52,7 @@ protected slots:
 
 private slots:
   void setCustomFont(const QVariant &font);
+  void setUseCustomFont(const QVariant &);
   void setEnableSpellCheck(const QVariant &);
   void setShowNickSelector(const QVariant &);
   void setMaxLines(const QVariant &);