X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/e85afe10979ecb7e93d7371c1d51e9b7ffcee53b..edced8460b:/src/settings/dolphin_iconsmodesettings.kcfg

diff --git a/src/settings/dolphin_iconsmodesettings.kcfg b/src/settings/dolphin_iconsmodesettings.kcfg
index f50ab3ead..9b286d139 100644
--- a/src/settings/dolphin_iconsmodesettings.kcfg
+++ b/src/settings/dolphin_iconsmodesettings.kcfg
@@ -4,26 +4,21 @@
       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>
-    <include>QListView</include>
     <kcfgfile name="dolphinrc"/>
     <group name="IconsMode">
-        <entry name="Arrangement" type="Int">
-            <label>Arrangement</label>
-            <default code="true">QListView::TopToBottom</default>
-        </entry>
         <entry name="UseSystemFont" type="Bool">
             <label>Use system font</label>
             <default>true</default>
         </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>
@@ -33,38 +28,21 @@
             <label>Font weight</label>
             <default>0</default>
         </entry>
-        <entry name="ItemHeight" type="Int">
-            <label>Item height</label>
-            <!--
-                 check 'void IconsViewSettingsPage::applySettings()' as reference (iconsviewsettingspage.cpp):
-                 itemHeight += fontHeight * numberOfTextlines + 10;
-            /-->
-            <default code="true">KIconLoader::SizeMedium + QFontMetrics(KGlobalSettings::generalFont()).height() * 2 + 10</default>
-        </entry>
-        <entry name="ItemWidth" type="Int">
-            <label>Item width</label>
-            <!--
-                 check 'void IconsViewSettingsPage::applySettings()' as reference (iconsviewsettingspage.cpp):
-                 itemWidth = TopToBottomBase + textSizeIndex * TopToBottomInc;
-            /-->
-            <default>96</default>
-        </entry>
-        <entry name="GridSpacing" type="Int">
-            <label>Grid spacing</label>
-            <default>8</default>
-        </entry>
         <entry name="IconSize" type="Int">
             <label>Icon size</label>
             <default code="true">KIconLoader::SizeMedium</default>
         </entry>
-        <entry name="NumberOfTextlines" type="Int">
-            <label>Number of textlines</label>
-            <!-- don't forget adjusting the "ItemHeight" too when changing this value /-->
-            <default>2</default>
-        </entry>
         <entry name="PreviewSize" type="Int">
             <label>Preview size</label>
             <default code="true">KIconLoader::SizeHuge</default>
         </entry>
+        <entry name="TextWidthIndex" type="Int">
+            <label>Text width index</label>
+            <default>1</default>
+        </entry>
+        <entry name="MaximumTextLines" type="Int">
+            <label>Maximum textlines (0 means unlimited)</label>
+            <default>0</default>
+        </entry>
     </group>
 </kcfg>