SVN_SILENT made messages (.desktop file) - always resolve ours

[dolphin.git] / src / settings / dolphin_iconsmodesettings.kcfg

diff --git a/src/settings/dolphin_iconsmodesettings.kcfg b/src/settings/dolphin_iconsmodesettings.kcfg
index fb01a8c6517ae6d04db05474337d2733342b25f9..220dd8c4279ba9c66508c558bb9b6f73aa19bac4 100644 (file)
--- a/src/settings/dolphin_iconsmodesettings.kcfg
+++ b/src/settings/dolphin_iconsmodesettings.kcfg
@@ -4,7 +4,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>kglobalsettings.h</include>
+    <include>QFontDatabase</include>
     <include>kiconloader.h</include>
     <kcfgfile name="dolphinrc"/>
     <group name="IconsMode">
@@ -14,11 +14,11 @@
         </entry>
         <entry name="FontFamily" type="String">
             <label>Font family</label>
-            <default code="true">KGlobalSettings::generalFont().family()</default>
+            <default code="true">QFontDatabase::systemFont(QFontDatabase::GeneralFont).family()</default>
         </entry>
         <entry name="FontSize" type="Double">
             <label>Font size</label>
-            <default code="true">KGlobalSettings::generalFont().pointSizeF()</default>
+            <default code="true">QFontDatabase::systemFont(QFontDatabase::GeneralFont).pointSizeF()</default>
         </entry>
         <entry name="ItalicFont" type="Bool">
             <label>Italic</label>
@@ -40,5 +40,9 @@
             <label>Text width index</label>
             <default>1</default>
         </entry>
+        <entry name="MaximumTextLines" type="Int">
+            <label>Maximum textlines (0 means unlimited)</label>
+            <default>3</default>
+        </entry>
     </group>
 </kcfg>