Merge branch 'Applications/16.04'

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

diff --git a/src/settings/dolphin_generalsettings.kcfg b/src/settings/dolphin_generalsettings.kcfg
index 2f230bf516add4595d39f8ff0b8955b477fc9bb0..12f158541187bd8d8e1359c589c1c99be6ae07a8 100644 (file)
--- a/src/settings/dolphin_generalsettings.kcfg
+++ b/src/settings/dolphin_generalsettings.kcfg
@@ -6,9 +6,9 @@
       http://www.kde.org/standards/kcfg/1.0/kcfg.xsd">
     <include>QDir</include>
     <include>QUrl</include>
-    <include>kglobalsettings.h</include>
+    <include>KCompletion</include>
     <kcfgfile name="dolphinrc"/>
-    <signal name="naturalSortingChanged" />
+    <signal name="sortingChoiceChanged" />
     <group name="General">
         <entry name="EditableUrl" type="Bool">
             <label>Should the URL be editable for the user</label>
@@ -16,7 +16,7 @@
         </entry>
         <entry name="UrlCompletionMode" type="Enum">
             <label>Text completion mode of the URL Navigator</label>
-            <default code="true">KGlobalSettings::completionMode()</default>
+            <default>KCompletion::CompletionPopup</default>
         </entry>
         <entry name="ShowFullPath" type="Bool">
             <label>Should the full path be shown inside the location bar</label>
@@ -43,7 +43,7 @@
             <default>false</default>
         </entry>
         <entry name="GlobalViewProps" type="Bool">
-            <label>Should the view properties be used for all directories</label>
+            <label>Should the view properties be used for all folders</label>
             <default>false</default>
         </entry>
         <entry name="BrowseThroughArchives" type="Bool">
@@ -93,10 +93,15 @@
             <label>Enlarge Small Previews</label>
             <default>true</default>
         </entry>
-        <entry name="NaturalSorting" type="Bool">
-            <label>Natural sorting of items</label>
-            <default>true</default>
-            <emit signal="naturalSortingChanged" />
+        <entry name="SortingChoice" type="Enum">
+            <choices>
+                <choice name="NaturalSorting" />
+                <choice name="CaseInsensitiveSorting" />
+                <choice name="CaseSensitiveSorting" />
+            </choices>
+            <label>Choose Natural, Case Sensitive, or Case Insensitive order of sorting the items</label>
+            <default>0</default>
+            <emit signal="sortingChoiceChanged" />
         </entry>
     </group>
 </kcfg>