[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kcalc/frameworks] /: KF5 port: KGlobalSettings:generalFont -> QFontDatabase::systemFont
From:       Christoph Feck <christoph () maxiom ! de>
Date:       2014-09-23 22:05:32
Message-ID: E1XWYDE-0007oU-Tk () scm ! kde ! org
[Download RAW message or body]

Git commit e3f05e217814fd6097510f90b5bedfb938ecf92e by Christoph Feck.
Committed on 23/09/2014 at 22:01.
Pushed by cfeck into branch 'frameworks'.

KF5 port: KGlobalSettings:generalFont -> QFontDatabase::systemFont

M  +6    -4    kcalc.kcfg
M  +1    -0    kcalcdisplay.cpp

http://commits.kde.org/kcalc/e3f05e217814fd6097510f90b5bedfb938ecf92e

diff --git a/kcalc.kcfg b/kcalc.kcfg
index 6620ebb..199a700 100644
--- a/kcalc.kcfg
+++ b/kcalc.kcfg
@@ -3,8 +3,7 @@
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
       http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
-  <include>KApplication</include>
-  <include>KGlobalSettings</include>
+  <include>QFontDatabase</include>
   <include>KColorScheme</include>
   <include>KLocalizedString</include>
   <kcfgfile name="kcalcrc"/>
@@ -50,11 +49,14 @@
   <group name="Font">
     <entry name="ButtonFont" type="Font">
       <label>The font to use for the buttons.</label>
-      <default code="true">KGlobalSettings::generalFont()</default>
+      <default code="true">QFontDatabase::systemFont(QFontDatabase::GeneralFont)</default>
     </entry>
     <entry name="DisplayFont" type="Font">
       <label>The font to use in the display.</label>
-      <default code="true">QFont(KGlobalSettings::generalFont().family(), 14, QFont::Bold)</default>
+      <code>QFont defaultDisplayFont = QFontDatabase::systemFont(QFontDatabase::GeneralFont);
+            defaultDisplayFont.setWeight(QFont::Bold);
+            defaultDisplayFont.setPointSizeF(defaultDisplayFont.pointSizeF() * 1.4);</code>
+      <default code="true">defaultDisplayFont</default>
     </entry>
   </group>
   <group name="Precision">
diff --git a/kcalcdisplay.cpp b/kcalcdisplay.cpp
index 3c27579..b4e2b3b 100644
--- a/kcalcdisplay.cpp
+++ b/kcalcdisplay.cpp
@@ -21,6 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "kcalcdisplay.h"
 
+#include <QApplication>
 #include <QClipboard>
 #include <QMouseEvent>
 #include <QPainter>
[prev in list] [next in list] [prev in thread] [next in thread]