Move General settings to the top

Summary: KDE apps generally (ha ha) have their {nav General} page at the top of the list, so it's the first thing the user sees when they open the {nav Settings} window, but Dolphin is an exception. It puts the {nav General} page //last!// This patch makes Dolphin consistent with other KDE apps by moving the {nav General} page up to the top.

Test Plan: {F5918590}

Reviewers: #dolphin, #kde_applications, elvisangelaccio, ltoscano

Reviewed By: elvisangelaccio, ltoscano

Subscribers: kde-doc-english, ltoscano, elvisangelaccio, kfm-devel

Tags: #dolphin, #documentation

Differential Revision: https://phabricator.kde.org/D13595

diff --git a/doc/index.docbook b/doc/index.docbook
index c2ed2854f480a7f6dab47ad9f3b20455e46889db..05c3e6f10fd50241571f839dd83f555558a03e3f 100644 (file)
--- a/doc/index.docbook
+++ b/doc/index.docbook
@@ -977,6 +977,137 @@ be accessed by clicking the corresponding icon on the left of the dialog.
 tab on the <guilabel>General</guilabel> page are shared with &konqueror; in filemanager mode.
 </para>
 
 tab on the <guilabel>General</guilabel> page are shared with &konqueror; in filemanager mode.
 </para>
 

+<sect2 id="preferences-dialog-general">
+<title>General</title>
+
+<para>
+This group contains settings which control the general behavior of &dolphin;.
+The group is divided further into four subgroups which can be accessed using the
+tab bar at the top.
+
+<screenshot>
+<screeninfo>Screenshot of the General settings in &dolphin;'s preferences dialog</screeninfo>
+<mediaobject>
+<imageobject>
+<imagedata fileref="preferences-general-behavior.png" format="PNG"/>
+</imageobject>
+<textobject>
+<phrase>General Settings.</phrase>
+</textobject>
+<caption><para>General Settings in &dolphin;'s Preferences Dialog.</para></caption>
+</mediaobject>
+</screenshot>
+
+</para>
+
+<sect3 id="preferences-dialog-general-behavior">
+<title>Behavior Tab</title>
+
+<para>
+
+<itemizedlist>
+
+<listitem><para>
+In the <guilabel>View</guilabel> section, you can configure whether the
+<link linkend="view-properties"> view properties</link> are stored for each
+folder or if common view properties are to be used for all folders.
+</para></listitem>
+
+<listitem><para>
+<guilabel>Sorting Mode</guilabel> controls how items are sorted in
+the view. If <guilabel>Natural sorting</guilabel> is enabled, the sort order of three example files
+will be
+<orderedlist>
+<listitem><para>File1,</para></listitem>
+<listitem><para>File2,</para></listitem>
+<listitem><para>File10.</para></listitem>
+</orderedlist>
+If this option is disabled, the normal alphabetical sorting case sensitive or case insensitive
+will be used, which leads to the sort order
+<orderedlist>
+<listitem><para>File1,</para></listitem>
+<listitem><para>File10,</para></listitem>
+<listitem><para>File2.</para></listitem>
+</orderedlist>
+</para></listitem>
+
+<listitem><para>
+When hovering over a file or folder with the mouse, a small window with relevant
+information is shown if <guilabel>Show tooltips</guilabel> is enabled.
+</para></listitem>
+
+<listitem><para>
+<guilabel>Show selection marker</guilabel> shows a small <guibutton>+</guibutton>
+or <guibutton>-</guibutton> button above an item's icon if the item is hovered over
+with the mouse. These can be used to select or deselect the item.
+</para></listitem>
+
+<listitem><para>
+Enable <guilabel>Rename inline</guilabel> to use this mode if only one item is currently selected.
+If this option is disabled or several items are selected, a dialog will be displayed for renaming.
+</para></listitem>
+
+<listitem><para><guilabel>Use tab for switching between left and right split view</guilabel>
+allows to switch without using the mouse.
+</para></listitem>
+
+</itemizedlist>
+
+</para>
+
+</sect3>
+
+<sect3 id="preferences-dialog-general-previews">
+<title>Previews Tab</title>
+
+<para>
+In this tab, you can configure for which file types previews are shown.
+Moreover, the maximum size of remote files for which previews are generated can be chosen.
+</para>
+<para>
+If previews are enabled for folders, previews of some files in the folder will
+be shown inside a folder's icon.
+</para>
+</sect3>
+
+<sect3 id="preferences-dialog-general-confirmations">
+<title>Confirmations Tab</title>
+<para>
+In the ask for confirmation section, you can enable warning dialogs that
+are shown before potentially harmful actions .
+</para>
+<warning><para>The confirmation settings for <guilabel>Moving files or folders to trash</guilabel> and
+<guilabel>Deleting files or folders</guilabel> affect file operations in &dolphin;, &konqueror;, 
+<application>Gwenview</application> and all &kde; applications using the default &kde; file dialog, 
+whereas <guilabel>Closing Dolphin windows
+with multiple tabs</guilabel> is a &dolphin; specific setting.</para></warning>
+</sect3>
+
+<sect3 id="preferences-dialog-general-statusbar">
+<title>Status Bar Tab</title>
+
+<para>
+In this tab, some additional items can be enabled for the status bar, provided
+the status bar is wide enough:
+
+<itemizedlist>
+
+<listitem><para>
+A <guilabel>zoom slider</guilabel> which can be used to change the icon size quickly.
+</para></listitem>
+
+<listitem><para>
+A bar that shows how much space is free on the current drive.
+</para></listitem>
+
+</itemizedlist>
+
+</para>
+
+</sect3>
+
+</sect2>
+

 <sect2 id="preferences-dialog-startup">
 <title>Startup</title>
 
 <sect2 id="preferences-dialog-startup">
 <title>Startup</title>
 


@@ -1267,137 +1398,6 @@ largest files can be deleted automatically.
 
 </sect2>
 
 
 </sect2>
 

-<sect2 id="preferences-dialog-general">
-<title>General</title>
-
-<para>
-This group contains settings which control the general behavior of &dolphin;.
-The group is divided further into four subgroups which can be accessed using the
-tab bar at the top.
-
-<screenshot>
-<screeninfo>Screenshot of the General settings in &dolphin;'s preferences dialog</screeninfo>
-<mediaobject>
-<imageobject>
-<imagedata fileref="preferences-general-behavior.png" format="PNG"/>
-</imageobject>
-<textobject>
-<phrase>General Settings.</phrase>
-</textobject>
-<caption><para>General Settings in &dolphin;'s Preferences Dialog.</para></caption>
-</mediaobject>
-</screenshot>
-
-</para>
-
-<sect3 id="preferences-dialog-general-behavior">
-<title>Behavior Tab</title>
-
-<para>
-
-<itemizedlist>
-
-<listitem><para>
-In the <guilabel>View</guilabel> section, you can configure whether the
-<link linkend="view-properties"> view properties</link> are stored for each
-folder or if common view properties are to be used for all folders.
-</para></listitem>
-
-<listitem><para>
-<guilabel>Sorting Mode</guilabel> controls how items are sorted in
-the view. If <guilabel>Natural sorting</guilabel> is enabled, the sort order of three example files
-will be
-<orderedlist>
-<listitem><para>File1,</para></listitem>
-<listitem><para>File2,</para></listitem>
-<listitem><para>File10.</para></listitem>
-</orderedlist>
-If this option is disabled, the normal alphabetical sorting case sensitive or case insensitive
-will be used, which leads to the sort order
-<orderedlist>
-<listitem><para>File1,</para></listitem>
-<listitem><para>File10,</para></listitem>
-<listitem><para>File2.</para></listitem>
-</orderedlist>
-</para></listitem>
-
-<listitem><para>
-When hovering over a file or folder with the mouse, a small window with relevant
-information is shown if <guilabel>Show tooltips</guilabel> is enabled.
-</para></listitem>
-
-<listitem><para>
-<guilabel>Show selection marker</guilabel> shows a small <guibutton>+</guibutton>
-or <guibutton>-</guibutton> button above an item's icon if the item is hovered over
-with the mouse. These can be used to select or deselect the item.
-</para></listitem>
-
-<listitem><para>
-Enable <guilabel>Rename inline</guilabel> to use this mode if only one item is currently selected.
-If this option is disabled or several items are selected, a dialog will be displayed for renaming.
-</para></listitem>
-
-<listitem><para><guilabel>Use tab for switching between left and right split view</guilabel>
-allows to switch without using the mouse.
-</para></listitem>
-
-</itemizedlist>
-
-</para>
-
-</sect3>
-
-<sect3 id="preferences-dialog-general-previews">
-<title>Previews Tab</title>
-
-<para>
-In this tab, you can configure for which file types previews are shown.
-Moreover, the maximum size of remote files for which previews are generated can be chosen.
-</para>
-<para>
-If previews are enabled for folders, previews of some files in the folder will
-be shown inside a folder's icon.
-</para>
-</sect3>
-
-<sect3 id="preferences-dialog-general-confirmations">
-<title>Confirmations Tab</title>
-<para>
-In the ask for confirmation section, you can enable warning dialogs that
-are shown before potentially harmful actions .
-</para>
-<warning><para>The confirmation settings for <guilabel>Moving files or folders to trash</guilabel> and
-<guilabel>Deleting files or folders</guilabel> affect file operations in &dolphin;, &konqueror;, 
-<application>Gwenview</application> and all &kde; applications using the default &kde; file dialog, 
-whereas <guilabel>Closing Dolphin windows
-with multiple tabs</guilabel> is a &dolphin; specific setting.</para></warning>
-</sect3>
-
-<sect3 id="preferences-dialog-general-statusbar">
-<title>Status Bar Tab</title>
-
-<para>
-In this tab, some additional items can be enabled for the status bar, provided
-the status bar is wide enough:
-
-<itemizedlist>
-
-<listitem><para>
-A <guilabel>zoom slider</guilabel> which can be used to change the icon size quickly.
-</para></listitem>
-
-<listitem><para>
-A bar that shows how much space is free on the current drive.
-</para></listitem>
-
-</itemizedlist>
-
-</para>
-
-</sect3>
-
-</sect2>
-

 </sect1>
 <!-- begin copy to konqueror filemanager.docbook -->
 <sect1 id="view-properties">
 </sect1>
 <!-- begin copy to konqueror filemanager.docbook -->
 <sect1 id="view-properties">

diff --git a/src/settings/dolphinsettingsdialog.cpp b/src/settings/dolphinsettingsdialog.cpp
index 5c0d43d836fc1244648cf875eb3a84bda822ea04..a79561b4ad1ab227b62508e4a33bd06298f72c1b 100644 (file)
--- a/src/settings/dolphinsettingsdialog.cpp
+++ b/src/settings/dolphinsettingsdialog.cpp
@@ -55,6 +55,13 @@ DolphinSettingsDialog::DolphinSettingsDialog(const QUrl& url, QWidget* parent) :
     connect(box->button(QDialogButtonBox::Apply), &QAbstractButton::clicked, this, &DolphinSettingsDialog::applySettings);
     connect(box->button(QDialogButtonBox::RestoreDefaults), &QAbstractButton::clicked, this, &DolphinSettingsDialog::restoreDefaults);
 
     connect(box->button(QDialogButtonBox::Apply), &QAbstractButton::clicked, this, &DolphinSettingsDialog::applySettings);
     connect(box->button(QDialogButtonBox::RestoreDefaults), &QAbstractButton::clicked, this, &DolphinSettingsDialog::restoreDefaults);
 

+    // General
+    GeneralSettingsPage* generalSettingsPage = new GeneralSettingsPage(url, this);
+    KPageWidgetItem* generalSettingsFrame = addPage(generalSettingsPage,
+                                                    i18nc("@title:group General settings", "General"));
+    generalSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("view-preview")));
+    connect(generalSettingsPage, &GeneralSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
+

     // Startup
     StartupSettingsPage* startupSettingsPage = new StartupSettingsPage(url, this);
     KPageWidgetItem* startupSettingsFrame = addPage(startupSettingsPage,
     // Startup
     StartupSettingsPage* startupSettingsPage = new StartupSettingsPage(url, this);
     KPageWidgetItem* startupSettingsFrame = addPage(startupSettingsPage,


@@ -92,13 +99,7 @@ DolphinSettingsDialog::DolphinSettingsDialog(const QUrl& url, QWidget* parent) :
         connect(trashSettingsPage, &TrashSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
     }
 
         connect(trashSettingsPage, &TrashSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
     }
 

-    // General
-    GeneralSettingsPage* generalSettingsPage = new GeneralSettingsPage(url, this);
-    KPageWidgetItem* generalSettingsFrame = addPage(generalSettingsPage,
-                                                    i18nc("@title:group General settings", "General"));
-    generalSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("view-preview")));
-    connect(generalSettingsPage, &GeneralSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
-
+    m_pages.append(generalSettingsPage);

     m_pages.append(startupSettingsPage);
     m_pages.append(viewSettingsPage);
     m_pages.append(navigationSettingsPage);
     m_pages.append(startupSettingsPage);
     m_pages.append(viewSettingsPage);
     m_pages.append(navigationSettingsPage);


@@ -106,7 +107,6 @@ DolphinSettingsDialog::DolphinSettingsDialog(const QUrl& url, QWidget* parent) :
     if (trashSettingsPage) {
         m_pages.append(trashSettingsPage);
     }
     if (trashSettingsPage) {
         m_pages.append(trashSettingsPage);
     }

-    m_pages.append(generalSettingsPage);

 
     const KConfigGroup dialogConfig(KSharedConfig::openConfig(QStringLiteral("dolphinrc")), "SettingsDialog");
     KWindowConfig::restoreWindowSize(windowHandle(), dialogConfig);
 
     const KConfigGroup dialogConfig(KSharedConfig::openConfig(QStringLiteral("dolphinrc")), "SettingsDialog");
     KWindowConfig::restoreWindowSize(windowHandle(), dialogConfig);