From 911213f455a34daeec7267184c0042b2f7295331 Mon Sep 17 00:00:00 2001 From: Vadim Kurland Date: Thu, 3 Jul 2008 13:48:34 +0000 Subject: [PATCH] properly using default application font if none is specified in our settings instead of hard coding times 11 --- src/gui/FWBSettings.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/gui/FWBSettings.cpp b/src/gui/FWBSettings.cpp index 7a1c47918..86cbc75a5 100644 --- a/src/gui/FWBSettings.cpp +++ b/src/gui/FWBSettings.cpp @@ -193,13 +193,17 @@ void FWBSettings::init() if (!ok) setIconsInRulesSize(SIZE25X25); ok = contains(rulesFont); - if (!ok) setRulesFont(QFont("times", 11, QFont::Normal)); + if (!ok) setRulesFont(QApplication::font()); ok = contains(treeFont); - if (!ok) setTreeFont(QFont("times", 11, QFont::Normal)); + if (!ok) setTreeFont(QApplication::font()); ok = contains(uiFont); - if (!ok) setUiFont(QFont("times", 11, QFont::Normal)); + if (!ok) setUiFont(QApplication::font()); + + if (fwbdebug) + qDebug("Default application font: %s", + QApplication::font().toString().toLatin1().constData()); ok = contains(clipComment); if (!ok) setClipComment(true); @@ -625,7 +629,7 @@ QFont FWBSettings::getFontByType(const char *type) bool ok = font.fromString(value(type).toString()); if (ok) return font; - return QFont("times", 11, QFont::Normal); + return QApplication::font(); } bool FWBSettings::getClipComment()