From d7d403379d7b9593b89c32bd9434f1cd875fbf78 Mon Sep 17 00:00:00 2001 From: Nathaniel Graham Date: Mon, 18 Jun 2018 17:09:21 -0600 Subject: 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 --- src/settings/dolphinsettingsdialog.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/settings/dolphinsettingsdialog.cpp') diff --git a/src/settings/dolphinsettingsdialog.cpp b/src/settings/dolphinsettingsdialog.cpp index 5c0d43d83..a79561b4a 100644 --- 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); + // 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,13 +99,7 @@ DolphinSettingsDialog::DolphinSettingsDialog(const QUrl& url, QWidget* parent) : 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); @@ -106,7 +107,6 @@ DolphinSettingsDialog::DolphinSettingsDialog(const QUrl& url, QWidget* parent) : if (trashSettingsPage) { m_pages.append(trashSettingsPage); } - m_pages.append(generalSettingsPage); const KConfigGroup dialogConfig(KSharedConfig::openConfig(QStringLiteral("dolphinrc")), "SettingsDialog"); KWindowConfig::restoreWindowSize(windowHandle(), dialogConfig); -- cgit v1.3