From 7a0cbf257323176be420ea5d29f0d466cd682193 Mon Sep 17 00:00:00 2001
From: Christoph Feck <christoph@maxiom.de>
Date: Wed, 3 Feb 2010 10:55:13 +0000
Subject: Respect floating point font sizes

BUG: 220632

svn path=/trunk/KDE/kdebase/apps/; revision=1084629
---
 src/settings/columnviewsettingspage.cpp       | 2 +-
 src/settings/detailsviewsettingspage.cpp      | 2 +-
 src/settings/dolphin_columnmodesettings.kcfg  | 4 ++--
 src/settings/dolphin_detailsmodesettings.kcfg | 4 ++--
 src/settings/dolphin_iconsmodesettings.kcfg   | 4 ++--
 src/settings/iconsviewsettingspage.cpp        | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/settings')

diff --git a/src/settings/columnviewsettingspage.cpp b/src/settings/columnviewsettingspage.cpp
index 4dfb0a78f..a935d4e93 100644
--- a/src/settings/columnviewsettingspage.cpp
+++ b/src/settings/columnviewsettingspage.cpp
@@ -110,7 +110,7 @@ void ColumnViewSettingsPage::applySettings()
     const QFont font = m_fontRequester->font();
     settings->setUseSystemFont(m_fontRequester->mode() == DolphinFontRequester::SystemFont);
     settings->setFontFamily(font.family());
-    settings->setFontSize(font.pointSize());
+    settings->setFontSize(font.pointSizeF());
     settings->setItalicFont(font.italic());
     settings->setFontWeight(font.weight());
 
diff --git a/src/settings/detailsviewsettingspage.cpp b/src/settings/detailsviewsettingspage.cpp
index ee89ba68c..56646e8c4 100644
--- a/src/settings/detailsviewsettingspage.cpp
+++ b/src/settings/detailsviewsettingspage.cpp
@@ -104,7 +104,7 @@ void DetailsViewSettingsPage::applySettings()
     const QFont font = m_fontRequester->font();
     settings->setUseSystemFont(m_fontRequester->mode() == DolphinFontRequester::SystemFont);
     settings->setFontFamily(font.family());
-    settings->setFontSize(font.pointSize());
+    settings->setFontSize(font.pointSizeF());
     settings->setItalicFont(font.italic());
     settings->setFontWeight(font.weight());
 
diff --git a/src/settings/dolphin_columnmodesettings.kcfg b/src/settings/dolphin_columnmodesettings.kcfg
index 498671efa..29d86f16d 100644
--- a/src/settings/dolphin_columnmodesettings.kcfg
+++ b/src/settings/dolphin_columnmodesettings.kcfg
@@ -13,9 +13,9 @@
             <label>Use system font</label>
             <default>true</default>
         </entry>
-        <entry name="FontSize" type="Int">
+        <entry name="FontSize" type="Double">
             <label>Font size</label>
-            <default code="true">KGlobalSettings::generalFont().pointSize()</default>
+            <default code="true">KGlobalSettings::generalFont().pointSizeF()</default>
         </entry>
         <entry name="ItalicFont" type="Bool">
             <label>Italic</label>
diff --git a/src/settings/dolphin_detailsmodesettings.kcfg b/src/settings/dolphin_detailsmodesettings.kcfg
index 74f05edb6..49eced3e6 100644
--- a/src/settings/dolphin_detailsmodesettings.kcfg
+++ b/src/settings/dolphin_detailsmodesettings.kcfg
@@ -13,9 +13,9 @@
             <label>Use system font</label>
             <default>true</default>
         </entry>
-        <entry name="FontSize" type="Int">
+        <entry name="FontSize" type="Double">
             <label>Font size</label>
-            <default code="true">KGlobalSettings::generalFont().pointSize()</default>
+            <default code="true">KGlobalSettings::generalFont().pointSizeF()</default>
         </entry>
         <entry name="ItalicFont" type="Bool">
             <label>Italic</label>
diff --git a/src/settings/dolphin_iconsmodesettings.kcfg b/src/settings/dolphin_iconsmodesettings.kcfg
index 8bd1ef325..634167b18 100644
--- a/src/settings/dolphin_iconsmodesettings.kcfg
+++ b/src/settings/dolphin_iconsmodesettings.kcfg
@@ -18,9 +18,9 @@
             <label>Font family</label>
             <default code="true">KGlobalSettings::generalFont().family()</default>
         </entry>
-        <entry name="FontSize" type="Int">
+        <entry name="FontSize" type="Double">
             <label>Font size</label>
-            <default code="true">KGlobalSettings::generalFont().pointSize()</default>
+            <default code="true">KGlobalSettings::generalFont().pointSizeF()</default>
         </entry>
         <entry name="ItalicFont" type="Bool">
             <label>Italic</label>
diff --git a/src/settings/iconsviewsettingspage.cpp b/src/settings/iconsviewsettingspage.cpp
index 78e9adf7a..dc3586c49 100644
--- a/src/settings/iconsviewsettingspage.cpp
+++ b/src/settings/iconsviewsettingspage.cpp
@@ -173,7 +173,7 @@ void IconsViewSettingsPage::applySettings()
 
     settings->setUseSystemFont(m_fontRequester->mode() == DolphinFontRequester::SystemFont);
     settings->setFontFamily(font.family());
-    settings->setFontSize(font.pointSize());
+    settings->setFontSize(font.pointSizeF());
     settings->setItalicFont(font.italic());
     settings->setFontWeight(font.weight());
 
-- 
cgit v1.3