Merge branch 'release/21.04'

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

diff --git a/src/settings/dolphinsettingsdialog.cpp b/src/settings/dolphinsettingsdialog.cpp
index 01d0ad0307d4b76c45d269faffa544f78f411c6e..281cb7ba582405e9b5f74c945582cff018cd3ee1 100644 (file)
--- a/src/settings/dolphinsettingsdialog.cpp
+++ b/src/settings/dolphinsettingsdialog.cpp
@@ -28,7 +28,7 @@
 #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)
@@ -78,7 +78,16 @@ DolphinSettingsDialog::DolphinSettingsDialog(const QUrl& url, QWidget* parent) :
     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"));
     contextMenuSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("application-menu")));
@@ -90,9 +99,9 @@ DolphinSettingsDialog::DolphinSettingsDialog(const QUrl& url, QWidget* parent) :
     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);
     }