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 2f4defa926a067ec27c8033acbcb6ae904c56797..12f158541187bd8d8e1359c589c1c99be6ae07a8 100644 (file)
--- a/src/settings/dolphin_generalsettings.kcfg
+++ b/src/settings/dolphin_generalsettings.kcfg
@@ -1,71 +1,107 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE kcfg SYSTEM "http://www.kde.org/standards/kcfg/1.0/kcfg.dtd">
-<kcfg>
-    <kcfgfile name="dolphinrc"/>
+<kcfg xmlns="http://www.kde.org/standards/kcfg/1.0"
+      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>QDir</include>
+    <include>QUrl</include>
+    <include>KCompletion</include>
+    <kcfgfile name="dolphinrc"/>
+    <signal name="sortingChoiceChanged" />
     <group name="General">
         <entry name="EditableUrl" type="Bool">
-            <label context="@label">Should the URL be editable for the user</label>
+            <label>Should the URL be editable for the user</label>
             <default>false</default>
         </entry>
+        <entry name="UrlCompletionMode" type="Enum">
+            <label>Text completion mode of the URL Navigator</label>
+            <default>KCompletion::CompletionPopup</default>
+        </entry>
         <entry name="ShowFullPath" type="Bool">
-            <label context="@label">Should the full path be shown inside the location bar</label>
+            <label>Should the full path be shown inside the location bar</label>
             <default>false</default>
         </entry>
-        <entry name="FirstRun" type="Bool">
-            <label context="@label">Is the application started the first time</label>
-            <default>true</default>
+        <entry name="Version" type="Int">
+            <label>Internal version of Dolphin, containing 3 digits for major, minor, bugfix</label>
+            <default>0</default>
+        </entry>
+        <entry name="ModifiedStartupSettings" type="Bool">
+            <label>Have the startup settings been modified (internal setting not shown in the UI)</label>
+            <default>false</default>
         </entry>
         <entry name="HomeUrl" type="String">
-            <label context="@label">Home URL</label>
-            <default code="true">QDir::homePath()</default>
+            <label>Home URL</label>
+            <default code="true">QUrl::fromLocalFile(QDir::homePath()).toDisplayString(QUrl::PreferLocalFile)</default>
         </entry>
         <entry name="SplitView" type="Bool">
-            <label context="@label">Split the view into two panes</label>
+            <label>Split the view into two panes</label>
             <default>false</default>
         </entry>
         <entry name="FilterBar" type="Bool">
-            <label context="@label">Should the filter bar be shown</label>
+            <label>Should the filter bar be shown</label>
             <default>false</default>
         </entry>
         <entry name="GlobalViewProps" type="Bool">
-            <label context="@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">
-            <label context="@label">Browse through archives</label>
+            <label>Browse through archives</label>
             <default>false</default>
         </entry>
+        <entry name="ConfirmClosingMultipleTabs" type="Bool">
+            <label>Ask for confirmation when closing windows with multiple tabs.</label>
+            <default>true</default>
+        </entry>
         <entry name="RenameInline" type="Bool">
-            <label context="@label">Rename inline</label>
-            <default>false</default>
+            <label>Rename inline</label>
+            <default>true</default>
         </entry>
         <entry name="ShowSelectionToggle" type="Bool">
-            <label context="@label">Show selection toggle</label>
+            <label>Show selection toggle</label>
             <default>true</default>
         </entry>
         <entry name="ShowToolTips" type="Bool">
-            <label context="@label">Show tooltips</label>
+            <label>Show tooltips</label>
             <default>false</default>
         </entry>
         <entry name="ShowCopyMoveMenu" type="Bool">
-            <label context="@label">Show 'Copy To' and 'Move To' commands in context menu</label>
+            <label>Show 'Copy To' and 'Move To' commands in context menu</label>
             <default>false</default>
         </entry>
         <entry name="ViewPropsTimestamp" type="DateTime" >
-            <label context="@label">Timestamp since when the view properties are valid</label>
+            <label>Timestamp since when the view properties are valid</label>
         </entry>
         <entry name="AutoExpandFolders" type="Bool">
-            <label context="@label">Use auto-expanding folders for all view types</label>
+            <label>Use auto-expanding folders for all view types</label>
             <default>false</default>
         </entry>
         <entry name="ShowZoomSlider" type="Bool">
-            <label context="@label">Show zoom slider in the statusbar</label>
+            <label>Show zoom slider in the statusbar</label>
             <default>true</default>
         </entry>
         <entry name="ShowSpaceInfo" type="Bool">
-            <label context="@label">Show the space information in the statusbar</label>
-            <default>false</default>
+            <label>Show the space information in the statusbar</label>
+            <default>true</default>
+        </entry>
+        <entry name="LockPanels" type="Bool">
+            <label>Lock the layout of the panels</label>
+            <default>true</default>
+        </entry>
+        <entry name="EnlargeSmallPreviews" type="Bool">
+            <label>Enlarge Small Previews</label>
+            <default>true</default>
+        </entry>
+        <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>