diff options
| author | Emmanuel Pescosta <[email protected]> | 2015-02-27 11:30:27 +0100 |
|---|---|---|
| committer | Emmanuel Pescosta <[email protected]> | 2015-02-27 11:30:27 +0100 |
| commit | 9aee5d22513f0367febab54b38b3a7dc58d120bb (patch) | |
| tree | 99cf391070ac5d4650a3f1b309c3ec2e814f1ac6 /src/settings/dolphin_generalsettings.kcfg | |
| parent | f025aeb63aa2a38e91c43d99ba9955793d3adf1e (diff) | |
| parent | b701b7e4edefb628d6f8b14146b2e299bd0ce5fc (diff) | |
Merge branch 'frameworks'
Diffstat (limited to 'src/settings/dolphin_generalsettings.kcfg')
| -rw-r--r-- | src/settings/dolphin_generalsettings.kcfg | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/settings/dolphin_generalsettings.kcfg b/src/settings/dolphin_generalsettings.kcfg index 849a9c75c..9ff14d1f7 100644 --- a/src/settings/dolphin_generalsettings.kcfg +++ b/src/settings/dolphin_generalsettings.kcfg @@ -5,9 +5,10 @@ xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 http://www.kde.org/standards/kcfg/1.0/kcfg.xsd"> <include>QDir</include> - <include>KUrl</include> - <include>kglobalsettings.h</include> + <include>QUrl</include> + <include>KCompletion</include> <kcfgfile name="dolphinrc"/> + <signal name="naturalSortingChanged" /> <group name="General"> <entry name="EditableUrl" type="Bool"> <label>Should the URL be editable for the user</label> @@ -15,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> @@ -31,7 +32,7 @@ </entry> <entry name="HomeUrl" type="String"> <label>Home URL</label> - <default code="true">KUrl(QDir::homePath()).prettyUrl()</default> + <default code="true">QUrl::fromLocalFile(QDir::homePath()).toDisplayString(QUrl::PreferLocalFile)</default> </entry> <entry name="SplitView" type="Bool"> <label>Split the view into two panes</label> @@ -82,7 +83,7 @@ </entry> <entry name="ShowSpaceInfo" type="Bool"> <label>Show the space information in the statusbar</label> - <default>false</default> + <default>true</default> </entry> <entry name="LockPanels" type="Bool"> <label>Lock the layout of the panels</label> @@ -92,5 +93,10 @@ <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> </group> </kcfg> |