X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/c161b895ffd8d62371ec288cf4105386350a8a3c..c74d844ec269adc63111363cd6da99e4deaaf083:/src/settings/dolphinsettingsdialog.cpp

diff --git a/src/settings/dolphinsettingsdialog.cpp b/src/settings/dolphinsettingsdialog.cpp
index 4d759c911..eed2f5155 100644
--- a/src/settings/dolphinsettingsdialog.cpp
+++ b/src/settings/dolphinsettingsdialog.cpp
@@ -14,8 +14,8 @@
 #include "startup/startupsettingspage.h"
 #include "trash/trashsettingspage.h"
 #include "viewmodes/viewsettingspage.h"
-#include "config-kuserfeedback.h"
-#ifdef HAVE_KUSERFEEDBACK
+#include "config-dolphin.h"
+#if HAVE_KUSERFEEDBACK
 #include "userfeedback/dolphinfeedbackprovider.h"
 #include "userfeedback/userfeedbacksettingspage.h"
 #endif
@@ -25,6 +25,8 @@
 #include <KWindowConfig>
 #include <KMessageBox>
 
+#include <kwidgetsaddons_version.h>
+
 #include <QCloseEvent>
 #include <QPushButton>
 
@@ -38,7 +40,7 @@ DolphinSettingsDialog::DolphinSettingsDialog(const QUrl& url, QWidget* parent, K
     setMinimumSize(QSize(540, minSize.height()));
 
     setFaceType(List);
-    setWindowTitle(i18nc("@title:window", "Dolphin Preferences"));
+    setWindowTitle(i18nc("@title:window", "Configure"));
     QDialogButtonBox* box = new QDialogButtonBox(QDialogButtonBox::Ok
             | QDialogButtonBox::Apply | QDialogButtonBox::Cancel | QDialogButtonBox::RestoreDefaults);
     box->button(QDialogButtonBox::Apply)->setEnabled(false);
@@ -85,11 +87,12 @@ DolphinSettingsDialog::DolphinSettingsDialog(const QUrl& url, QWidget* parent, K
         QStringLiteral("open_in_new_tab"),
         QStringLiteral("open_in_new_window"),
         QStringLiteral("copy_location"),
-        QStringLiteral("duplicate")
+        QStringLiteral("duplicate"),
+        QStringLiteral("open_terminal_here")
     });
     KPageWidgetItem* contextMenuSettingsFrame = addPage(contextMenuSettingsPage,
                                                         i18nc("@title:group", "Context Menu"));
-    contextMenuSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("application-menu")));
+    contextMenuSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("preferences-desktop-menu-edit")));
     connect(contextMenuSettingsPage, &ContextMenuSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
 
     // Trash
@@ -98,13 +101,13 @@ DolphinSettingsDialog::DolphinSettingsDialog(const QUrl& url, QWidget* parent, K
     trashSettingsPage = createTrashSettingsPage(this);
 #endif
     if (trashSettingsPage) {
-        KPageWidgetItem* trashSettingsFrame = addPage(trashSettingsPage,
+        trashSettings = addPage(trashSettingsPage,
                                                      i18nc("@title:group", "Trash"));
-        trashSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("user-trash")));
+        trashSettings->setIcon(QIcon::fromTheme(QStringLiteral("user-trash")));
         connect(trashSettingsPage, &TrashSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
     }
 
-#ifdef HAVE_KUSERFEEDBACK
+#if HAVE_KUSERFEEDBACK
     // User Feedback
     UserFeedbackSettingsPage* feedbackSettingsPage = nullptr;
     if (DolphinFeedbackProvider::instance()->isEnabled()) {
@@ -123,19 +126,19 @@ DolphinSettingsDialog::DolphinSettingsDialog(const QUrl& url, QWidget* parent, K
     if (trashSettingsPage) {
         m_pages.append(trashSettingsPage);
     }
-#ifdef HAVE_KUSERFEEDBACK
+#if HAVE_KUSERFEEDBACK
     if (feedbackSettingsPage) {
         m_pages.append(feedbackSettingsPage);
     }
 #endif
 
-    const KConfigGroup dialogConfig(KSharedConfig::openConfig(QStringLiteral("dolphinrc")), "SettingsDialog");
+    const KConfigGroup dialogConfig(KSharedConfig::openStateConfig(), "SettingsDialog");
     KWindowConfig::restoreWindowSize(windowHandle(), dialogConfig);
 }
 
 DolphinSettingsDialog::~DolphinSettingsDialog()
 {
-    KConfigGroup dialogConfig(KSharedConfig::openConfig(QStringLiteral("dolphinrc")), "SettingsDialog");
+    KConfigGroup dialogConfig(KSharedConfig::openStateConfig(), "SettingsDialog");
     KWindowConfig::saveWindowSize(windowHandle(), dialogConfig);
 }
 
@@ -178,17 +181,29 @@ void DolphinSettingsDialog::closeEvent(QCloseEvent* event)
         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: