[Places Panel] Make use of KFilePlacesView::dragAutoActivationDelay

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

diff --git a/src/settings/dolphinsettingsdialog.cpp b/src/settings/dolphinsettingsdialog.cpp
index 01d0ad0307d4b76c45d269faffa544f78f411c6e..d699ef894bc342b236a478133557fcda80a7508b 100644 (file)
--- a/src/settings/dolphinsettingsdialog.cpp
+++ b/src/settings/dolphinsettingsdialog.cpp
@@ -28,7 +28,7 @@
 #include <QCloseEvent>
 #include <QPushButton>
 
 #include <QCloseEvent>
 #include <QPushButton>
 

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

     KPageDialog(parent),
     m_pages(),
     m_unsavedChanges(false)
     KPageDialog(parent),
     m_pages(),
     m_unsavedChanges(false)


@@ -38,7 +38,7 @@ DolphinSettingsDialog::DolphinSettingsDialog(const QUrl& url, QWidget* parent) :
     setMinimumSize(QSize(540, minSize.height()));
 
     setFaceType(List);
     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);
     QDialogButtonBox* box = new QDialogButtonBox(QDialogButtonBox::Ok
             | QDialogButtonBox::Apply | QDialogButtonBox::Cancel | QDialogButtonBox::RestoreDefaults);
     box->button(QDialogButtonBox::Apply)->setEnabled(false);


@@ -78,10 +78,19 @@ DolphinSettingsDialog::DolphinSettingsDialog(const QUrl& url, QWidget* parent) :
     connect(navigationSettingsPage, &NavigationSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
 
     // Context Menu
     connect(navigationSettingsPage, &NavigationSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
 
     // Context Menu

-    auto contextMenuSettingsPage = new ContextMenuSettingsPage(this);
+    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"));
     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
     connect(contextMenuSettingsPage, &ContextMenuSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
 
     // Trash


@@ -90,9 +99,9 @@ DolphinSettingsDialog::DolphinSettingsDialog(const QUrl& url, QWidget* parent) :
     trashSettingsPage = createTrashSettingsPage(this);
 #endif
     if (trashSettingsPage) {
     trashSettingsPage = createTrashSettingsPage(this);
 #endif
     if (trashSettingsPage) {

-        KPageWidgetItem* trashSettingsFrame = addPage(trashSettingsPage,
+        trashSettings = addPage(trashSettingsPage,

                                                      i18nc("@title:group", "Trash"));
                                                      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);
     }
 
         connect(trashSettingsPage, &TrashSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
     }
 


@@ -121,13 +130,13 @@ DolphinSettingsDialog::DolphinSettingsDialog(const QUrl& url, QWidget* parent) :
     }
 #endif
 
     }
 #endif
 

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

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

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

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