X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/fdb5c0d33e38e9d5fedc821c586bbb5ca8a0d2a5..3bf471e0:/src/settings/dolphin_generalsettings.kcfg

diff --git a/src/settings/dolphin_generalsettings.kcfg b/src/settings/dolphin_generalsettings.kcfg
index 2f230bf51..08f01d72c 100644
--- a/src/settings/dolphin_generalsettings.kcfg
+++ b/src/settings/dolphin_generalsettings.kcfg
@@ -6,9 +6,10 @@
       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" />
+    <signal name="splitViewChanged" />
     <group name="General">
         <entry name="EditableUrl" type="Bool">
             <label>Should the URL be editable for the user</label>
@@ -16,12 +17,20 @@
         </entry>
         <entry name="UrlCompletionMode" type="Enum">
             <label>Text completion mode of the URL Navigator</label>
-            <default code="true">KGlobalSettings::completionMode()</default>
+            <default>KCompletion::CompletionPopupAuto</default>
         </entry>
         <entry name="ShowFullPath" type="Bool">
             <label>Should the full path be shown inside the location bar</label>
             <default>false</default>
         </entry>
+        <entry name="ShowFullPathInTitlebar" type="Bool">
+            <label>Should the full path be shown in the title bar</label>
+            <default>false</default>
+        </entry>
+        <entry name="OpenExternallyCalledFolderInNewTab" type="Bool">
+            <label>Should an externally called folder open in a new tab in an existing Dolphin instance</label>
+            <default>true</default>
+        </entry>
         <entry name="Version" type="Int">
             <label>Internal version of Dolphin, containing 3 digits for major, minor, bugfix</label>
             <default>0</default>
@@ -34,17 +43,22 @@
             <label>Home URL</label>
             <default code="true">QUrl::fromLocalFile(QDir::homePath()).toDisplayString(QUrl::PreferLocalFile)</default>
         </entry>
+        <entry name="RememberOpenedTabs" type="Bool">
+            <label>Remember open folders and tabs</label>
+            <default>true</default>
+        </entry>
         <entry name="SplitView" type="Bool">
             <label>Split the view into two panes</label>
             <default>false</default>
+            <emit signal="splitViewChanged" />
         </entry>
         <entry name="FilterBar" type="Bool">
             <label>Should the filter bar be shown</label>
             <default>false</default>
         </entry>
         <entry name="GlobalViewProps" type="Bool">
-            <label>Should the view properties be used for all directories</label>
-            <default>false</default>
+            <label>Should the view properties be used for all folders</label>
+            <default>true</default>
         </entry>
         <entry name="BrowseThroughArchives" type="Bool">
             <label>Browse through archives</label>
@@ -54,6 +68,10 @@
             <label>Ask for confirmation when closing windows with multiple tabs.</label>
             <default>true</default>
         </entry>
+        <entry name="ConfirmClosingTerminalRunningProgram" type="Bool">
+            <label>Ask for confirmation when closing windows with a program that is still running in the Terminal panel.</label>
+            <default>true</default>
+        </entry>
         <entry name="RenameInline" type="Bool">
             <label>Rename inline</label>
             <default>true</default>
@@ -62,12 +80,20 @@
             <label>Show selection toggle</label>
             <default>true</default>
         </entry>
-        <entry name="ShowToolTips" type="Bool">
-            <label>Show tooltips</label>
+        <entry name="UseTabForSwitchingSplitView" type="Bool">
+            <label>Use tab for switching between right and left split</label>
             <default>false</default>
         </entry>
-        <entry name="ShowCopyMoveMenu" type="Bool">
-            <label>Show 'Copy To' and 'Move To' commands in context menu</label>
+        <entry name="CloseActiveSplitView" type="Bool">
+            <label>Close active pane when toggling off split view</label>
+            <default>true</default>
+        </entry>
+        <entry name="OpenNewTabAfterLastTab" type="Bool">
+            <label>New tab will be open after last one</label>
+            <default>false</default>
+        </entry>
+        <entry name="ShowToolTips" type="Bool">
+            <label>Show tooltips</label>
             <default>false</default>
         </entry>
         <entry name="ViewPropsTimestamp" type="DateTime" >
@@ -77,6 +103,10 @@
             <label>Use auto-expanding folders for all view types</label>
             <default>false</default>
         </entry>
+        <entry name="ShowStatusBar" type="Bool">
+            <label>Show the statusbar</label>
+            <default>true</default>
+        </entry>
         <entry name="ShowZoomSlider" type="Bool">
             <label>Show zoom slider in the statusbar</label>
             <default>true</default>
@@ -93,10 +123,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>