Merge branch 'master' into kf6

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

diff --git a/src/settings/dolphinsettingsdialog.cpp b/src/settings/dolphinsettingsdialog.cpp
index 8c20a91489161266916763a3e5b3912b3c4e2cf0..af3dbc865adf73d52a3dd91b978d50e2893ce83e 100644 (file)
--- a/src/settings/dolphinsettingsdialog.cpp
+++ b/src/settings/dolphinsettingsdialog.cpp
@@ -1,54 +1,47 @@
-/***************************************************************************
- *   Copyright (C) 2006 by Peter Penz                                      *
- *   peter.penz@gmx.at                                                     *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
- ***************************************************************************/
+/*
+ * SPDX-FileCopyrightText: 2006 Peter Penz <peter.penz@gmx.at>
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */

 
 #include "dolphinsettingsdialog.h"
 
 
 #include "dolphinsettingsdialog.h"
 

-#include <dolphinapplication.h>
-#include <dolphinmainwindow.h>
+#include "config-dolphin.h"
+#include "contextmenu/contextmenusettingspage.h"

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

+#include "dolphinmainwindow.h"

 #include "general/generalsettingspage.h"
 #include "navigation/navigationsettingspage.h"
 #include "general/generalsettingspage.h"
 #include "navigation/navigationsettingspage.h"

-#include "services/servicessettingspage.h"

 #include "startup/startupsettingspage.h"
 #include "startup/startupsettingspage.h"

-#include "viewmodes/viewsettingspage.h"

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

+#include "viewmodes/viewsettingspage.h"
+#if HAVE_KUSERFEEDBACK
+#include "userfeedback/dolphinfeedbackprovider.h"
+#include "userfeedback/userfeedbacksettingspage.h"
+#endif

 
 

-#include <KLocale>
+#include <KAuthorized>
+#include <KLocalizedString>

 #include <KMessageBox>
 #include <KMessageBox>

-#include <KIcon>
+#include <KWindowConfig>

 
 

+#include <kwidgetsaddons_version.h>
+
+#include <QCloseEvent>

 #include <QPushButton>
 #include <QPushButton>

-#include <QDialogButtonBox>

 
 

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

 
 {
     const QSize minSize = minimumSize();
 
 {
     const QSize minSize = minimumSize();

-    setMinimumSize(QSize(512, minSize.height()));
+    setMinimumSize(QSize(540, minSize.height()));

 
     setFaceType(List);
 
     setFaceType(List);

-    setWindowTitle(i18nc("@title:window", "Dolphin Preferences"));
-    QDialogButtonBox* box = new QDialogButtonBox(QDialogButtonBox::Ok
-            | QDialogButtonBox::Apply | QDialogButtonBox::Cancel | QDialogButtonBox::RestoreDefaults);
+    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);
     box->button(QDialogButtonBox::Apply)->setEnabled(false);
     box->button(QDialogButtonBox::Ok)->setDefault(true);
     setButtonBox(box);


@@ -57,94 +50,170 @@ DolphinSettingsDialog::DolphinSettingsDialog(const KUrl& 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("system-file-manager")));
+    connect(generalSettingsPage, &GeneralSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
+

     // Startup
     // Startup

-    StartupSettingsPage* startupSettingsPage = new StartupSettingsPage(url, this);
-    KPageWidgetItem* startupSettingsFrame = addPage(startupSettingsPage,
-                                                    i18nc("@title:group", "Startup"));
-    startupSettingsFrame->setIcon(KIcon("go-home"));
+    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
     connect(startupSettingsPage, &StartupSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
 
     // View Modes

-    ViewSettingsPage* viewSettingsPage = new ViewSettingsPage(this);
-    KPageWidgetItem* viewSettingsFrame = addPage(viewSettingsPage,
-                                                 i18nc("@title:group", "View Modes"));
-    viewSettingsFrame->setIcon(KIcon("view-choose"));
+    ViewSettingsPage *viewSettingsPage = new ViewSettingsPage(this);
+    KPageWidgetItem *viewSettingsFrame = addPage(viewSettingsPage, i18nc("@title:group", "View Modes"));
+    viewSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("preferences-desktop-icons")));

     connect(viewSettingsPage, &ViewSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
 
     // Navigation
     connect(viewSettingsPage, &ViewSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
 
     // Navigation

-    NavigationSettingsPage* navigationSettingsPage = new NavigationSettingsPage(this);
-    KPageWidgetItem* navigationSettingsFrame = addPage(navigationSettingsPage,
-                                                       i18nc("@title:group", "Navigation"));
-    navigationSettingsFrame->setIcon(KIcon("input-mouse"));
+    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);
 
     connect(navigationSettingsPage, &NavigationSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
 

-    // Services
-    ServicesSettingsPage* servicesSettingsPage = new ServicesSettingsPage(this);
-    KPageWidgetItem* servicesSettingsFrame = addPage(servicesSettingsPage,
-                                                       i18nc("@title:group", "Services"));
-    servicesSettingsFrame->setIcon(KIcon("services"));
-    connect(servicesSettingsPage, &ServicesSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
+    // 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_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
 
     // Trash

-    TrashSettingsPage* trashSettingsPage = new TrashSettingsPage(this);
-    KPageWidgetItem* trashSettingsFrame = addPage(trashSettingsPage,
-                                                   i18nc("@title:group", "Trash"));
-    trashSettingsFrame->setIcon(KIcon("user-trash"));
-    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(KIcon("system-run"));
-    connect(generalSettingsPage, &GeneralSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
+    SettingsPageBase *trashSettingsPage = nullptr;
+#ifndef Q_OS_WIN
+    trashSettingsPage = createTrashSettingsPage(this);
+#endif
+    if (trashSettingsPage) {
+        trashSettings = addPage(trashSettingsPage, i18nc("@title:group", "Trash"));
+        trashSettings->setIcon(QIcon::fromTheme(QStringLiteral("user-trash")));
+        connect(trashSettingsPage, &TrashSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
+    }

 
 

-    const KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"), "SettingsDialog");
-#pragma message("TODO: port")
-    //restoreDialogSize(dialogConfig);
+#if HAVE_KUSERFEEDBACK
+    // User Feedback
+    UserFeedbackSettingsPage *feedbackSettingsPage = nullptr;
+    if (DolphinFeedbackProvider::instance()->isEnabled()) {
+        feedbackSettingsPage = new UserFeedbackSettingsPage(this);
+        auto feedbackSettingsFrame = addPage(feedbackSettingsPage, i18nc("@title:group", "User Feedback"));
+        feedbackSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("preferences-desktop-locale")));
+        connect(feedbackSettingsPage, &UserFeedbackSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
+    }
+#endif

 
 

+    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);

-    m_pages.append(servicesSettingsPage);
-    m_pages.append(trashSettingsPage);
-    m_pages.append(generalSettingsPage);
+    m_pages.append(contextMenuSettingsPage);
+    if (trashSettingsPage) {
+        m_pages.append(trashSettingsPage);
+    }
+#if HAVE_KUSERFEEDBACK
+    if (feedbackSettingsPage) {
+        m_pages.append(feedbackSettingsPage);
+    }
+#endif
+
+    const KConfigGroup dialogConfig(KSharedConfig::openStateConfig(), "SettingsDialog");
+    KWindowConfig::restoreWindowSize(windowHandle(), dialogConfig);

 }
 
 DolphinSettingsDialog::~DolphinSettingsDialog()
 {
 }
 
 DolphinSettingsDialog::~DolphinSettingsDialog()
 {

-    KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"), "SettingsDialog");
-#pragma message("TODO: port")
-    //saveDialogSize(dialogConfig);
+    KConfigGroup dialogConfig(KSharedConfig::openStateConfig(), "SettingsDialog");
+    KWindowConfig::saveWindowSize(windowHandle(), dialogConfig);

 }
 
 void DolphinSettingsDialog::enableApply()
 {
     buttonBox()->button(QDialogButtonBox::Apply)->setEnabled(true);
 }
 
 void DolphinSettingsDialog::enableApply()
 {
     buttonBox()->button(QDialogButtonBox::Apply)->setEnabled(true);

+    m_unsavedChanges = true;

 }
 
 void DolphinSettingsDialog::applySettings()
 {
 }
 
 void DolphinSettingsDialog::applySettings()
 {

-    foreach (SettingsPageBase* page, m_pages) {
+    for (SettingsPageBase *page : qAsConst(m_pages)) {

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

-    emit settingsChanged();
+    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().
         settings->setModifiedStartupSettings(false);
     if (settings->modifiedStartupSettings()) {
         // Reset the modified startup settings hint. The changed startup settings
         // have been applied already due to emitting settingsChanged().
         settings->setModifiedStartupSettings(false);

-        settings->writeConfig();
+        settings->save();

     }
     buttonBox()->button(QDialogButtonBox::Apply)->setEnabled(false);
     }
     buttonBox()->button(QDialogButtonBox::Apply)->setEnabled(false);

+    m_unsavedChanges = false;

 }
 
 void DolphinSettingsDialog::restoreDefaults()
 {
 }
 
 void DolphinSettingsDialog::restoreDefaults()
 {

-    foreach (SettingsPageBase* page, m_pages) {
+    for (SettingsPageBase *page : qAsConst(m_pages)) {

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

+void DolphinSettingsDialog::closeEvent(QCloseEvent *event)
+{
+    if (!m_unsavedChanges) {
+        event->accept();
+        return;
+    }
+
+#if KWIDGETSADDONS_VERSION >= QT_VERSION_CHECK(5, 100, 0)
+    const auto response = KMessageBox::warningTwoActionsCancel(this,
+#else
+    const auto response = KMessageBox::warningYesNoCancel(this,
+#endif
+                                                               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) {
+#if KWIDGETSADDONS_VERSION >= QT_VERSION_CHECK(5, 100, 0)
+    case KMessageBox::PrimaryAction:
+#else
+    case KMessageBox::Yes:
+#endif
+        applySettings();
+        Q_FALLTHROUGH();
+#if KWIDGETSADDONS_VERSION >= QT_VERSION_CHECK(5, 100, 0)
+    case KMessageBox::SecondaryAction:
+#else
+    case KMessageBox::No:
+#endif
+        event->accept();
+        break;
+    case KMessageBox::Cancel:
+        event->ignore();
+        break;
+    default:
+        break;
+    }
+}
+
+SettingsPageBase *DolphinSettingsDialog::createTrashSettingsPage(QWidget *parent)
+{
+    if (!KAuthorized::authorizeControlModule(QStringLiteral("kcmtrash.desktop"))) {
+        return nullptr;
+    }
+
+    return new TrashSettingsPage(parent);
+}