Merge remote-tracking branch 'fork/work/zakharafoniam/useful-groups'

[dolphin.git] / src / settings / dolphinsettingsdialog.cpp

diff --git a/src/settings/dolphinsettingsdialog.cpp b/src/settings/dolphinsettingsdialog.cpp
index 39ea306eb7c48f3e7c80d6f2b3c0f99b943ee1eb..1c8178651abdbdee5ff7505e7cc8e38d6c6d3cd2 100644 (file)
--- a/src/settings/dolphinsettingsdialog.cpp
+++ b/src/settings/dolphinsettingsdialog.cpp
@@ -6,108 +6,86 @@
 
 #include "dolphinsettingsdialog.h"
 
 
 #include "dolphinsettingsdialog.h"
 

+#include "config-dolphin.h"
+#include "contextmenu/contextmenusettingspage.h"

 #include "dolphin_generalsettings.h"
 #include "dolphinmainwindow.h"
 #include "dolphin_generalsettings.h"
 #include "dolphinmainwindow.h"

-#include "general/generalsettingspage.h"
-#include "navigation/navigationsettingspage.h"
-#include "contextmenu/contextmenusettingspage.h"
-#include "startup/startupsettingspage.h"
+#include "interface/interfacesettingspage.h"

 #include "trash/trashsettingspage.h"
 #include "viewmodes/viewsettingspage.h"
 #include "trash/trashsettingspage.h"
 #include "viewmodes/viewsettingspage.h"

-#include "config-kuserfeedback.h"
-#ifdef HAVE_KUSERFEEDBACK
+#if HAVE_KUSERFEEDBACK

 #include "userfeedback/dolphinfeedbackprovider.h"
 #include "userfeedback/userfeedbacksettingspage.h"
 #endif
 
 #include <KAuthorized>
 #include <KLocalizedString>
 #include "userfeedback/dolphinfeedbackprovider.h"
 #include "userfeedback/userfeedbacksettingspage.h"
 #endif
 
 #include <KAuthorized>
 #include <KLocalizedString>

-#include <KWindowConfig>

 #include <KMessageBox>
 #include <KMessageBox>

+#include <KRuntimePlatform>
+#include <KWindowConfig>
+
+#include <kwidgetsaddons_version.h>

 
 #include <QCloseEvent>
 #include <QPushButton>
 
 
 #include <QCloseEvent>
 #include <QPushButton>
 

-DolphinSettingsDialog::DolphinSettingsDialog(const QUrl& url, QWidget* parent, KActionCollection* actions) :
-    KPageDialog(parent),
-    m_pages(),
-    m_unsavedChanges(false)
+DolphinSettingsDialog::DolphinSettingsDialog(const QUrl &url, QWidget *parent, KActionCollection *actions)
+    : KPageDialog(parent)
+    , m_pages()
+    , m_unsavedChanges(false)

 
 {
     const QSize minSize = minimumSize();
     setMinimumSize(QSize(540, minSize.height()));
 
 
 {
     const QSize minSize = minimumSize();
     setMinimumSize(QSize(540, minSize.height()));
 

-    setFaceType(List);
+    setFaceType(KRuntimePlatform::runtimePlatform().contains(QLatin1String("phone")) ? Tabbed : List);

     setWindowTitle(i18nc("@title:window", "Configure"));
     setWindowTitle(i18nc("@title:window", "Configure"));

-    QDialogButtonBox* box = new QDialogButtonBox(QDialogButtonBox::Ok
-            | QDialogButtonBox::Apply | QDialogButtonBox::Cancel | QDialogButtonBox::RestoreDefaults);
-    box->button(QDialogButtonBox::Apply)->setEnabled(false);
-    box->button(QDialogButtonBox::Ok)->setDefault(true);
-    setButtonBox(box);

 
 

-    connect(box->button(QDialogButtonBox::Ok), &QAbstractButton::clicked, this, &DolphinSettingsDialog::applySettings);
-    connect(box->button(QDialogButtonBox::Apply), &QAbstractButton::clicked, this, &DolphinSettingsDialog::applySettings);
-    connect(box->button(QDialogButtonBox::RestoreDefaults), &QAbstractButton::clicked, this, &DolphinSettingsDialog::restoreDefaults);
+    // Interface
+    InterfaceSettingsPage *interfaceSettingsPage = new InterfaceSettingsPage(this);
+    KPageWidgetItem *interfaceSettingsFrame = addPage(interfaceSettingsPage, i18nc("@title:group Interface settings", "Interface"));
+    interfaceSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("org.kde.dolphin")));
+    connect(interfaceSettingsPage, &InterfaceSettingsPage::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("system-file-manager")));
-    connect(generalSettingsPage, &GeneralSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
-
-    // Startup
-    StartupSettingsPage* startupSettingsPage = new StartupSettingsPage(url, this);
-    KPageWidgetItem* startupSettingsFrame = addPage(startupSettingsPage,
-                                                    i18nc("@title:group", "Startup"));
-    startupSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("preferences-desktop-launch-feedback")));
-    connect(startupSettingsPage, &StartupSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
-
-    // View Modes
-    ViewSettingsPage* viewSettingsPage = new ViewSettingsPage(this);
-    KPageWidgetItem* viewSettingsFrame = addPage(viewSettingsPage,
-                                                 i18nc("@title:group", "View Modes"));
+    // View
+    ViewSettingsPage *viewSettingsPage = new ViewSettingsPage(url, this);
+    KPageWidgetItem *viewSettingsFrame = addPage(viewSettingsPage, i18nc("@title:group", "View"));

     viewSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("preferences-desktop-icons")));
     connect(viewSettingsPage, &ViewSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
 
     viewSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("preferences-desktop-icons")));
     connect(viewSettingsPage, &ViewSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
 

-    // Navigation
-    NavigationSettingsPage* navigationSettingsPage = new NavigationSettingsPage(this);
-    KPageWidgetItem* navigationSettingsFrame = addPage(navigationSettingsPage,
-                                                       i18nc("@title:group", "Navigation"));
-    navigationSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("preferences-desktop-navigation")));
-    connect(navigationSettingsPage, &NavigationSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
-

     // Context Menu
     // Context Menu

-    auto contextMenuSettingsPage = new ContextMenuSettingsPage(this, actions, {
-        QStringLiteral("add_to_places"),
-        QStringLiteral("sort"),
-        QStringLiteral("view_mode"),
-        QStringLiteral("open_in_new_tab"),
-        QStringLiteral("open_in_new_window"),
-        QStringLiteral("copy_location"),
-        QStringLiteral("duplicate"),
-        QStringLiteral("open_terminal"),
-    });
-    KPageWidgetItem* contextMenuSettingsFrame = addPage(contextMenuSettingsPage,
-                                                        i18nc("@title:group", "Context Menu"));
-    contextMenuSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("application-menu")));
+    auto contextMenuSettingsPage = new ContextMenuSettingsPage(this,
+                                                               actions,
+                                                               {QStringLiteral("add_to_places"),
+                                                                QStringLiteral("sort"),
+                                                                QStringLiteral("group"),
+                                                                QStringLiteral("view_mode"),
+                                                                QStringLiteral("open_in_new_tab"),
+                                                                QStringLiteral("open_in_new_window"),
+                                                                QStringLiteral("open_in_split_view"),
+                                                                QStringLiteral("copy_location"),
+                                                                QStringLiteral("duplicate"),
+                                                                QStringLiteral("open_terminal_here"),
+                                                                QStringLiteral("copy_to_inactive_split_view"),
+                                                                QStringLiteral("move_to_inactive_split_view")});
+    KPageWidgetItem *contextMenuSettingsFrame = addPage(contextMenuSettingsPage, i18nc("@title:group", "Context Menu"));
+    contextMenuSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("preferences-desktop-menu-edit")));

     connect(contextMenuSettingsPage, &ContextMenuSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
 
     // Trash
     connect(contextMenuSettingsPage, &ContextMenuSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
 
     // Trash

-    SettingsPageBase* trashSettingsPage = nullptr;
+    SettingsPageBase *trashSettingsPage = nullptr;

 #ifndef Q_OS_WIN
     trashSettingsPage = createTrashSettingsPage(this);
 #endif
     if (trashSettingsPage) {
 #ifndef Q_OS_WIN
     trashSettingsPage = createTrashSettingsPage(this);
 #endif
     if (trashSettingsPage) {

-        trashSettings = addPage(trashSettingsPage,
-                                                     i18nc("@title:group", "Trash"));
+        trashSettings = addPage(trashSettingsPage, i18nc("@title:group", "Trash"));

         trashSettings->setIcon(QIcon::fromTheme(QStringLiteral("user-trash")));
         connect(trashSettingsPage, &TrashSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
     }
 
         trashSettings->setIcon(QIcon::fromTheme(QStringLiteral("user-trash")));
         connect(trashSettingsPage, &TrashSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
     }
 

-#ifdef HAVE_KUSERFEEDBACK
+#if HAVE_KUSERFEEDBACK

     // User Feedback
     // User Feedback

-    UserFeedbackSettingsPage* feedbackSettingsPage = nullptr;
+    UserFeedbackSettingsPage *feedbackSettingsPage = nullptr;

     if (DolphinFeedbackProvider::instance()->isEnabled()) {
         feedbackSettingsPage = new UserFeedbackSettingsPage(this);
         auto feedbackSettingsFrame = addPage(feedbackSettingsPage, i18nc("@title:group", "User Feedback"));
     if (DolphinFeedbackProvider::instance()->isEnabled()) {
         feedbackSettingsPage = new UserFeedbackSettingsPage(this);
         auto feedbackSettingsFrame = addPage(feedbackSettingsPage, i18nc("@title:group", "User Feedback"));


@@ -116,27 +94,35 @@ DolphinSettingsDialog::DolphinSettingsDialog(const QUrl& url, QWidget* parent, K
     }
 #endif
 
     }
 #endif
 

-    m_pages.append(generalSettingsPage);
-    m_pages.append(startupSettingsPage);
+    m_pages.append(interfaceSettingsPage);

     m_pages.append(viewSettingsPage);
     m_pages.append(viewSettingsPage);

-    m_pages.append(navigationSettingsPage);

     m_pages.append(contextMenuSettingsPage);
     if (trashSettingsPage) {
         m_pages.append(trashSettingsPage);
     }
     m_pages.append(contextMenuSettingsPage);
     if (trashSettingsPage) {
         m_pages.append(trashSettingsPage);
     }

-#ifdef HAVE_KUSERFEEDBACK
+#if HAVE_KUSERFEEDBACK

     if (feedbackSettingsPage) {
         m_pages.append(feedbackSettingsPage);
     }
 #endif
 
     if (feedbackSettingsPage) {
         m_pages.append(feedbackSettingsPage);
     }
 #endif
 

-    const KConfigGroup dialogConfig(KSharedConfig::openConfig(QStringLiteral("dolphinrc")), "SettingsDialog");
+    // Create the buttons last so they are also last in the keyboard Tab focus order.
+    QDialogButtonBox *box = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Apply | QDialogButtonBox::Cancel | QDialogButtonBox::RestoreDefaults);
+    box->button(QDialogButtonBox::Apply)->setEnabled(false);
+    box->button(QDialogButtonBox::Ok)->setDefault(true);
+    setButtonBox(box);
+
+    connect(box->button(QDialogButtonBox::Ok), &QAbstractButton::clicked, this, &DolphinSettingsDialog::applySettings);
+    connect(box->button(QDialogButtonBox::Apply), &QAbstractButton::clicked, this, &DolphinSettingsDialog::applySettings);
+    connect(box->button(QDialogButtonBox::RestoreDefaults), &QAbstractButton::clicked, this, &DolphinSettingsDialog::restoreDefaults);
+
+    const KConfigGroup dialogConfig(KSharedConfig::openStateConfig(), QStringLiteral("SettingsDialog"));

     KWindowConfig::restoreWindowSize(windowHandle(), dialogConfig);
 }
 
 DolphinSettingsDialog::~DolphinSettingsDialog()
 {
     KWindowConfig::restoreWindowSize(windowHandle(), dialogConfig);
 }
 
 DolphinSettingsDialog::~DolphinSettingsDialog()
 {

-    KConfigGroup dialogConfig(KSharedConfig::openConfig(QStringLiteral("dolphinrc")), "SettingsDialog");
+    KConfigGroup dialogConfig(KSharedConfig::openStateConfig(), QStringLiteral("SettingsDialog"));

     KWindowConfig::saveWindowSize(windowHandle(), dialogConfig);
 }
 
     KWindowConfig::saveWindowSize(windowHandle(), dialogConfig);
 }
 


@@ -148,13 +134,13 @@ void DolphinSettingsDialog::enableApply()
 
 void DolphinSettingsDialog::applySettings()
 {
 
 void DolphinSettingsDialog::applySettings()
 {

-    for (SettingsPageBase* page : qAsConst(m_pages)) {
+    for (SettingsPageBase *page : std::as_const(m_pages)) {

         page->applySettings();
     }
 
     Q_EMIT settingsChanged();
 
         page->applySettings();
     }
 
     Q_EMIT settingsChanged();
 

-    GeneralSettings* settings = GeneralSettings::self();
+    GeneralSettings *settings = GeneralSettings::self();

     if (settings->modifiedStartupSettings()) {
         // Reset the modified startup settings hint. The changed startup settings
         // have been applied already due to emitting settingsChanged().
     if (settings->modifiedStartupSettings()) {
         // Reset the modified startup settings hint. The changed startup settings
         // have been applied already due to emitting settingsChanged().


@@ -167,40 +153,39 @@ void DolphinSettingsDialog::applySettings()
 
 void DolphinSettingsDialog::restoreDefaults()
 {
 
 void DolphinSettingsDialog::restoreDefaults()
 {

-    for (SettingsPageBase* page : qAsConst(m_pages)) {
+    for (SettingsPageBase *page : std::as_const(m_pages)) {

         page->restoreDefaults();
     }
 }
 
         page->restoreDefaults();
     }
 }
 

-void DolphinSettingsDialog::closeEvent(QCloseEvent* event)
+void DolphinSettingsDialog::closeEvent(QCloseEvent *event)

 {
     if (!m_unsavedChanges) {
         event->accept();
         return;
     }
 
 {
     if (!m_unsavedChanges) {
         event->accept();
         return;
     }
 

-    const auto response = KMessageBox::warningYesNoCancel(this,
-                                        i18n("You have unsaved changes. Do you want to apply the changes or discard them?"),
-                                        i18n("Warning"),
-                                        KStandardGuiItem::save(),
-                                        KStandardGuiItem::discard(),
-                                        KStandardGuiItem::cancel());
+    const auto response = KMessageBox::warningTwoActionsCancel(this,
+                                                               i18n("You have unsaved changes. Do you want to apply the changes or discard them?"),
+                                                               i18n("Warning"),
+                                                               KStandardGuiItem::save(),
+                                                               KStandardGuiItem::discard(),
+                                                               KStandardGuiItem::cancel());

     switch (response) {
     switch (response) {

-        case KMessageBox::Yes:
-            applySettings();
-            Q_FALLTHROUGH();
-        case KMessageBox::No:
-            event->accept();
-            break;
-        case KMessageBox::Cancel:
-            event->ignore();
-            break;
-        default:
-            break;
+    case KMessageBox::PrimaryAction:
+        applySettings();
+        Q_FALLTHROUGH();
+    case KMessageBox::SecondaryAction:
+        event->accept();
+        break;
+    case KMessageBox::Cancel:
+        event->ignore();
+        break;
+    default:
+        break;

     }
 }
 
     }
 }
 

-

 SettingsPageBase *DolphinSettingsDialog::createTrashSettingsPage(QWidget *parent)
 {
     if (!KAuthorized::authorizeControlModule(QStringLiteral("kcmtrash.desktop"))) {
 SettingsPageBase *DolphinSettingsDialog::createTrashSettingsPage(QWidget *parent)
 {
     if (!KAuthorized::authorizeControlModule(QStringLiteral("kcmtrash.desktop"))) {


@@ -209,3 +194,5 @@ SettingsPageBase *DolphinSettingsDialog::createTrashSettingsPage(QWidget *parent
 
     return new TrashSettingsPage(parent);
 }
 
     return new TrashSettingsPage(parent);
 }

+
+#include "moc_dolphinsettingsdialog.cpp"