From ea7e2abd8b650feb3f0f0057d618dd3d4a14fcd7 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sun, 30 May 2010 12:07:59 +0200
Subject: Fixing fonts.. This commit changes *A LOT* rekonq behavior on fonts.
 To fix all, I had to (re)introduce some (old)new strings. Sorry!

- Adopted default KDE fonts for default & fixed settings
- calculating LogicalDpiY from font dimension (points to pixels) (This has been copied from KWebKitPart, as suggested)
- reenabled 16px as default font size

WARNING: As we are now calculating well the font size, you'll see BIG chars on clean pages.. :)
---
 src/rekonq.kcfg | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

(limited to 'src/rekonq.kcfg')

diff --git a/src/rekonq.kcfg b/src/rekonq.kcfg
index 5800121b..b934c6d5 100644
--- a/src/rekonq.kcfg
+++ b/src/rekonq.kcfg
@@ -9,6 +9,7 @@
 <include>QtWebKit</include>
 <include>QDateTime</include>
 <include>KUrl</include>
+<include>KGlobalSettings</include>
 
 <kcfgfile name="rekonqrc" />
 
@@ -100,23 +101,26 @@
 
 <!-- Fonts Settings -->
 <group name="Fonts">
-    <entry name="standardFont" type="Font">
-        <default code="true">QFont(QWebSettings::globalSettings()->fontFamily(QWebSettings::StandardFont))</default>
+    <entry name="standardFontFamily" type="String">
+        <default code="true">KGlobalSettings::generalFont().family()</default>
     </entry>
-    <entry name="fixedFont" type="Font">
-        <default code="true">QFont(QWebSettings::globalSettings()->fontFamily(QWebSettings::FixedFont))</default>
+    <entry name="fixedFontFamily" type="String">
+        <default code="true">KGlobalSettings::fixedFont().family()</default>
     </entry>
-    <entry name="serifFont" type="Font">
-        <default code="true">QFont(QWebSettings::globalSettings()->fontFamily(QWebSettings::SerifFont))</default>
+    <entry name="serifFontFamily" type="String">
+        <default code="true">QWebSettings::globalSettings()->fontFamily(QWebSettings::SerifFont)</default>
     </entry>
-    <entry name="sansSerifFont" type="Font">
-        <default code="true">QFont(QWebSettings::globalSettings()->fontFamily(QWebSettings::SansSerifFont))</default>
+    <entry name="sansSerifFontFamily" type="String">
+        <default code="true">QWebSettings::globalSettings()->fontFamily(QWebSettings::SansSerifFont)</default>
     </entry>
-    <entry name="cursiveFont" type="Font">
-        <default code="true">QFont(QWebSettings::globalSettings()->fontFamily(QWebSettings::CursiveFont))</default>
+    <entry name="cursiveFontFamily" type="String">
+        <default code="true">QWebSettings::globalSettings()->fontFamily(QWebSettings::CursiveFont)</default>
     </entry>
-    <entry name="fantasyFont" type="Font">
-        <default code="true">QFont(QWebSettings::globalSettings()->fontFamily(QWebSettings::FantasyFont))</default>
+    <entry name="fantasyFontFamily" type="String">
+        <default code="true">QWebSettings::globalSettings()->fontFamily(QWebSettings::FantasyFont)</default>
+    </entry>
+    <entry name="defaultFontSize" type="Int">
+        <default>16</default>
     </entry>
     <entry name="minFontSize" type="Int">
         <default>8</default>
-- 
cgit v1.2.1