Clean up rekonq.kcfg

It was really a mess before. I also found 2 settings never used...

WARNING: This will cost users to reset some settings. Sorry for that

1 files changed, 73 insertions, 63 deletions

diff --git a/src/rekonq.kcfg b/src/rekonq.kcfg
index 08bae46b..bfaece5f 100644
--- a/src/rekonq.kcfg
+++ b/src/rekonq.kcfg
@@ -55,18 +55,12 @@
     <entry name="startupBehaviour" type="Int">
         <default>1</default>
     </entry>
-    <entry name="newTabsBehaviour" type="Int">
-        <default>0</default>
-    </entry>
-    <entry name="newTabStartPage" type="Int">
-        <default>0</default>
+    <entry name="useNewTabPage" type="Bool">
+        <default>false</default>
     </entry>
     <entry name="homePage" type="String">
         <default>http://www.kde.org/</default>
     </entry>
-    <entry name="useNewTabPage" type="Bool">
-        <default>false</default>
-    </entry>
     <entry name="downloadPath" type="Url">
         <default code="true">KGlobalSettings::downloadPath()</default>
     </entry>
@@ -79,33 +73,9 @@
     <entry name="kgetList" type="Bool">
         <default>false</default>
     </entry>
-    <entry name="searchEngine" type="Int">
-        <default>0</default>
-    </entry>
-    <entry name="smoothScrolling" type="Bool">
-        <default>true</default>
-    </entry>
     <entry name="hScrollWheelHistory" type="Bool">
         <default>false</default>
     </entry>
-    <entry name="clearHistory" type="Bool">
-        <default>true</default>
-    </entry>
-    <entry name="clearDownloads" type="Bool">
-        <default>true</default>
-    </entry>
-    <entry name="clearCookies" type="Bool">
-        <default>true</default>
-    </entry>
-    <entry name="clearCachedPages" type="Bool">
-        <default>true</default>
-    </entry>
-    <entry name="clearWebIcons" type="Bool">
-        <default>true</default>
-    </entry>
-    <entry name="clearHomePageThumbs" type="Bool">
-        <default>true</default>
-    </entry>
     <entry name="enableViShortcuts" type="Bool">
         <default>false</default>
     </entry>
@@ -114,29 +84,52 @@
 
 <!-- Tabs Settings -->
 <group name="Tabs">
-    <entry name="openTabNoWindow" type="Bool">
+    <!-- xxx -->
+    <entry name="newTabsBehaviour" type="Int">
+        <default>0</default>
+    </entry>
+    <entry name="newTabStartPage" type="Int">
+        <default>0</default>
+    </entry>
+    <!-- xxx -->
+    <entry name="hoveringTabOption" type="Int">
+        <default>0</default>
+    </entry>
+    <!-- xxx -->
+    <entry name="alwaysShowTabBar" type="Bool">
         <default>true</default>
     </entry>
+    <entry name="openLinksInNewWindow" type="Bool">
+        <default>false</default>
+    </entry>
     <entry name="openExternalLinksInNewWindow" type="Bool">
         <default>false</default>
     </entry>
     <entry name="lastTabClosesWindow" type="Bool">
         <default>false</default>
     </entry>
-    <entry name="alwaysShowTabBar" type="Bool">
+    <entry name="openNewTabsInBackground" type="Bool">
         <default>true</default>
     </entry>
-    <entry name="openTabsBack" type="Bool">
+    <entry name="openNewTabsNearCurrent" type="Bool">
+        <default>false</default>
+    </entry>
+    <entry name="closeTabSelectPrevious" type="Bool">
         <default>true</default>
     </entry>
-    <entry name="openTabsNearCurrent" type="Bool">
-        <default>false</default>
+    <entry name="animatedTabHighlighting" type="Bool">
+        <default>true</default>
     </entry>
-    <entry name="hoveringTabOption" type="Int">
-        <default>0</default>
+</group>
+
+
+<!-- Appearance Settings -->
+<group name="Appearance">
+    <entry name="userCSS" type="Url">
+        <default></default>
     </entry>
-    <entry name="closeTabSelectPrevious" type="Bool">
-        <default>false</default>
+    <entry name="smoothScrolling" type="Bool">
+        <default>true</default>
     </entry>
     <entry name="useFavicon" type="Bool">
         <default>false</default>
@@ -144,9 +137,6 @@
     <entry name="middleClickAction" type="Int">
         <default>2</default>
     </entry>
-    <entry name="animatedTabHighlighting" type="Bool">
-        <default>true</default>
-    </entry>
 </group>
 
 
@@ -187,29 +177,30 @@
     <entry name="expireHistory" type="Int">
         <default>1</default>
     </entry>
-</group>
-
-
-<!-- WebKit Settings -->
-<group name="Webkit">
-    <entry name="pluginsEnabled" type="Int">
-        <default>0</default>
+    <entry name="clearHistory" type="Bool">
+        <default>true</default>
     </entry>
-    <entry name="webGL" type="Bool">
-        <default>false</default>
+    <entry name="clearDownloads" type="Bool">
+        <default>true</default>
     </entry>
-    <entry name="spatialNavigation" type="Bool">
-        <default>false</default>
+    <entry name="clearCookies" type="Bool">
+        <default>true</default>
     </entry>
-    <entry name="frameFlattening" type="Bool">
-        <default>false</default>
+    <entry name="clearCachedPages" type="Bool">
+        <default>true</default>
     </entry>
-    <entry name="dnsPrefetch" type="Bool">
+    <entry name="clearWebIcons" type="Bool">
         <default>true</default>
     </entry>
-    <entry name="printElementBackgrounds" type="Bool">
+    <entry name="clearHomePageThumbs" type="Bool">
         <default>true</default>
     </entry>
+</group>
+
+
+<!-- WebKit Settings -->
+<group name="Webkit">
+    <!-- xxx -->
     <entry name="javascriptEnabled" type="Bool">
         <default>true</default>
     </entry>
@@ -219,9 +210,11 @@
     <entry name="javascriptCanAccessClipboard" type="Bool">
         <default>false</default>
     </entry>
-    <entry name="javaEnabled" type="Bool">
-        <default>true</default>
+    <!-- xxx -->
+    <entry name="pluginsEnabled" type="Int">
+        <default>0</default>
     </entry>
+    <!-- xxx -->
     <entry name="offlineStorageDatabaseEnabled" type="Bool">
         <default>false</default>
     </entry>
@@ -231,8 +224,24 @@
     <entry name="localStorageEnabled" type="Bool">
         <default>false</default>
     </entry>
-    <entry name="userCSS" type="Url">
-        <default></default>
+    <!-- xxx -->
+    <entry name="javaEnabled" type="Bool">
+        <default>true</default>
+    </entry>
+    <entry name="webGL" type="Bool">
+        <default>false</default>
+    </entry>
+    <entry name="spatialNavigation" type="Bool">
+        <default>false</default>
+    </entry>
+    <entry name="frameFlattening" type="Bool">
+        <default>false</default>
+    </entry>
+    <entry name="dnsPrefetch" type="Bool">
+        <default>true</default>
+    </entry>
+    <entry name="printElementBackgrounds" type="Bool">
+        <default>true</default>
     </entry>
 </group>
 
@@ -259,6 +268,7 @@
     </entry>
 </group>
 
+
 <!-- Sync Settings -->
 <group name="Sync">
     <entry name="syncEnabled" type="Bool">