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

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

diff --git a/src/settings/dolphin_detailsmodesettings.kcfg b/src/settings/dolphin_detailsmodesettings.kcfg
index d58e038092d6274256468900924d2b01be978044..2a70cc1ff0850e5ebd394e3dc0fc9bab6144f035 100644 (file)
--- a/src/settings/dolphin_detailsmodesettings.kcfg
+++ b/src/settings/dolphin_detailsmodesettings.kcfg
@@ -5,12 +5,12 @@
       xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
       http://www.kde.org/standards/kcfg/1.0/kcfg.xsd">
     <include>kiconloader.h</include>
-    <include>kglobalsettings.h</include>
+    <include>QFontDatabase</include>
     <kcfgfile name="dolphinrc"/>
     <group name="DetailsMode">
         <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="UseSystemFont" type="Bool">
             <label>Use system font</label>
@@ -18,7 +18,7 @@
         </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>
@@ -36,13 +36,29 @@
             <label>Preview size</label>
             <default code="true">KIconLoader::SizeLarge</default>
         </entry>
-        <entry name="ExpandableFolders" type="Bool">
-            <label>Expandable folders</label>
-            <default>false</default>
-        </entry>
         <entry name="ColumnPositions" type="IntList">
             <label>Position of columns</label>
             <default>0,1,2,3,4,5,6,7,8</default>
         </entry>
+        <entry name="LeadingPadding" type="UInt">
+            <label>Leading Column Padding</label>
+            <default>20</default>
+        </entry>
+        <entry name="ExpandableFolders" type="Bool">
+            <label>Expandable folders</label>
+            <default>true</default>
+        </entry>
+        <entry name="DirectorySizeCount" type="Bool">
+            <label>Whether or not content count is used as directory size</label>
+            <default>true</default>
+        </entry>
+        <entry name="RecursiveDirectorySizeLimit" type="UInt">
+            <label>Recursive directory size limit</label>
+            <default>10</default>
+        </entry>
+        <entry name="UseShortRelativeDates" type="Bool">
+            <label>if true we use short relative dates, if not short dates</label>
+            <default>true</default>
+        </entry>
     </group>
 </kcfg>