diff --git a/doc/index.docbook b/doc/index.docbook
--- a/doc/index.docbook
+++ b/doc/index.docbook
@@ -977,6 +977,137 @@
tab on the General page are shared with &konqueror; in filemanager mode.
+
+General
+
+
+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 of the General settings in &dolphin;'s preferences dialog
+
+
+
+
+
+General Settings.
+
+
General Settings in &dolphin;'s Preferences Dialog.
+
+
+
+
+
+
+Behavior Tab
+
+
+
+
+
+
+In the View section, you can configure whether the
+ view properties are stored for each
+folder or if common view properties are to be used for all folders.
+
+
+
+Sorting Mode controls how items are sorted in
+the view. If Natural sorting is enabled, the sort order of three example files
+will be
+
+File1,
+File2,
+File10.
+
+If this option is disabled, the normal alphabetical sorting case sensitive or case insensitive
+will be used, which leads to the sort order
+
+File1,
+File10,
+File2.
+
+
+
+
+When hovering over a file or folder with the mouse, a small window with relevant
+information is shown if Show tooltips is enabled.
+
+
+
+Show selection marker shows a small +
+or - 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.
+
+
+
+Enable Rename inline 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.
+
+
+Use tab for switching between left and right split view
+allows to switch without using the mouse.
+
+
+
+
+
+
+
+
+
+Previews Tab
+
+
+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.
+
+
+If previews are enabled for folders, previews of some files in the folder will
+be shown inside a folder's icon.
+
+
+
+
+Confirmations Tab
+
+In the ask for confirmation section, you can enable warning dialogs that
+are shown before potentially harmful actions .
+
+The confirmation settings for Moving files or folders to trash and
+Deleting files or folders affect file operations in &dolphin;, &konqueror;,
+Gwenview and all &kde; applications using the default &kde; file dialog,
+whereas Closing Dolphin windows
+with multiple tabs is a &dolphin; specific setting.
+
+
+
+Status Bar Tab
+
+
+In this tab, some additional items can be enabled for the status bar, provided
+the status bar is wide enough:
+
+
+
+
+A zoom slider which can be used to change the icon size quickly.
+
+
+
+A bar that shows how much space is free on the current drive.
+
+
+
+
+
+
+
+
+
+
Startup
@@ -1267,137 +1398,6 @@
-
-General
-
-
-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 of the General settings in &dolphin;'s preferences dialog
-
-
-
-
-
-General Settings.
-
-
General Settings in &dolphin;'s Preferences Dialog.
-
-
-
-
-
-
-Behavior Tab
-
-
-
-
-
-
-In the View section, you can configure whether the
- view properties are stored for each
-folder or if common view properties are to be used for all folders.
-
-
-
-Sorting Mode controls how items are sorted in
-the view. If Natural sorting is enabled, the sort order of three example files
-will be
-
-File1,
-File2,
-File10.
-
-If this option is disabled, the normal alphabetical sorting case sensitive or case insensitive
-will be used, which leads to the sort order
-
-File1,
-File10,
-File2.
-
-
-
-
-When hovering over a file or folder with the mouse, a small window with relevant
-information is shown if Show tooltips is enabled.
-
-
-
-Show selection marker shows a small +
-or - 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.
-
-
-
-Enable Rename inline 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.
-
-
-Use tab for switching between left and right split view
-allows to switch without using the mouse.
-
-
-
-
-
-
-
-
-
-Previews Tab
-
-
-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.
-
-
-If previews are enabled for folders, previews of some files in the folder will
-be shown inside a folder's icon.
-
-
-
-
-Confirmations Tab
-
-In the ask for confirmation section, you can enable warning dialogs that
-are shown before potentially harmful actions .
-
-The confirmation settings for Moving files or folders to trash and
-Deleting files or folders affect file operations in &dolphin;, &konqueror;,
-Gwenview and all &kde; applications using the default &kde; file dialog,
-whereas Closing Dolphin windows
-with multiple tabs is a &dolphin; specific setting.
-
-
-
-Status Bar Tab
-
-
-In this tab, some additional items can be enabled for the status bar, provided
-the status bar is wide enough:
-
-
-
-
-A zoom slider which can be used to change the icon size quickly.
-
-
-
-A bar that shows how much space is free on the current drive.
-
-
-
-
-
-
-
-
-
-
diff --git a/src/settings/dolphinsettingsdialog.cpp b/src/settings/dolphinsettingsdialog.cpp
--- a/src/settings/dolphinsettingsdialog.cpp
+++ b/src/settings/dolphinsettingsdialog.cpp
@@ -55,6 +55,13 @@
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,
@@ -92,21 +99,14 @@
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(servicesSettingsPage);
if (trashSettingsPage) {
m_pages.append(trashSettingsPage);
}
- m_pages.append(generalSettingsPage);
const KConfigGroup dialogConfig(KSharedConfig::openConfig(QStringLiteral("dolphinrc")), "SettingsDialog");
KWindowConfig::restoreWindowSize(windowHandle(), dialogConfig);