projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix fontchange notification in InputWidget
[quassel.git]
/
src
/
qtui
/
inputwidget.cpp
diff --git
a/src/qtui/inputwidget.cpp
b/src/qtui/inputwidget.cpp
index
cd48764
..
7d10969
100644
(file)
--- a/
src/qtui/inputwidget.cpp
+++ b/
src/qtui/inputwidget.cpp
@@
-44,11
+44,9
@@
InputWidget::InputWidget(QWidget *parent)
ui.ownNick->installEventFilter(new MouseWheelFilter(this));
ui.inputEdit->installEventFilter(new JumpKeyHandler(this));
ui.ownNick->installEventFilter(new MouseWheelFilter(this));
ui.inputEdit->installEventFilter(new JumpKeyHandler(this));
- QtUiSettings s;
- bool useInputLineFont = s.value("UseInputLineFont", QVariant(false)).toBool();
- if(useInputLineFont) {
- ui.inputEdit->setFont(s.value("InputLineFont").value<QFont>());
- }
+ QtUiStyleSettings s("Fonts");
+ s.notify("InputLine", this, SLOT(setCustomFont(QVariant)));
+ setCustomFont(s.value("InputLine", QFont()));
ActionCollection *coll = QtUi::actionCollection();
ActionCollection *coll = QtUi::actionCollection();
@@
-61,6
+59,13
@@
InputWidget::InputWidget(QWidget *parent)
InputWidget::~InputWidget() {
}
InputWidget::~InputWidget() {
}
+void InputWidget::setCustomFont(const QVariant &v) {
+ QFont font = v.value<QFont>();
+ if(font.family().isEmpty())
+ font = QApplication::font();
+ ui.inputEdit->setFont(font);
+}
+
void InputWidget::currentChanged(const QModelIndex ¤t, const QModelIndex &previous) {
Q_UNUSED(previous)
NetworkId networkId = current.data(NetworkModel::NetworkIdRole).value<NetworkId>();
void InputWidget::currentChanged(const QModelIndex ¤t, const QModelIndex &previous) {
Q_UNUSED(previous)
NetworkId networkId = current.data(NetworkModel::NetworkIdRole).value<NetworkId>();