Share actions with main window to avoid duplicating icon name and text

src/dolphinmainwindow.cpp

@@ -1069,7 +1069,7 @@ void DolphinMainWindow::editSettings()
         container->view()->writeSettings();
 
         const QUrl url = container->url();
-        DolphinSettingsDialog* settingsDialog = new DolphinSettingsDialog(url, this);
+        DolphinSettingsDialog* settingsDialog = new DolphinSettingsDialog(url, this, actionCollection());
         connect(settingsDialog, &DolphinSettingsDialog::settingsChanged, this, &DolphinMainWindow::refreshViews);
         connect(settingsDialog, &DolphinSettingsDialog::settingsChanged,
                 &DolphinUrlNavigatorsController::slotReadSettings);

src/settings/contextmenu/contextmenusettingspage.cpp

@@ -35,22 +35,19 @@ namespace
     const char VersionControlServicePrefix[] = "_version_control_";
     const char DeleteService[] = "_delete";
     const char CopyToMoveToService[] ="_copy_to_move_to";
-    const char AddToPlacesService[] = "_add_to_places";
-    const char SortByService[] = "_sort_by";
-    const char ViewModeService[] = "_view_mode";
-    const char OpenInNewTabService[] = "_open_in_new_tab";
-    const char OpenInNewWindowService[] = "_open_in_new_window";
-    const char CopyLocationService[] = "_copy_location";
-    const char DuplicateHereService[] = "_duplicate_here";
 }
 
-ContextMenuSettingsPage::ContextMenuSettingsPage(QWidget* parent) :
+ContextMenuSettingsPage::ContextMenuSettingsPage(QWidget* parent,
+                                                 KActionCollection* actions,
+                                                 QStringList actionIds) :
     SettingsPageBase(parent),
     m_initialized(false),
     m_serviceModel(nullptr),
     m_sortModel(nullptr),
     m_listView(nullptr),
-    m_enabledVcsPlugins()
+    m_enabledVcsPlugins(),
+    m_actions(actions),
+    m_actionIds(actionIds)
 {
     QVBoxLayout* topLayout = new QVBoxLayout(this);
 
@@ -107,6 +104,45 @@ ContextMenuSettingsPage::ContextMenuSettingsPage(QWidget* parent) :
 ContextMenuSettingsPage::~ContextMenuSettingsPage() {
 }
 
+bool ContextMenuSettingsPage::entryVisible(const QString& id)
+{
+    if (id == "add_to_places") {
+        return ContextMenuSettings::showAddToPlaces();
+    } else if (id == "sort") {
+        return ContextMenuSettings::showSortBy();
+    } else if (id == "view_mode") {
+        return ContextMenuSettings::showViewMode();
+    } else if (id == "open_in_new_tab") {
+        return ContextMenuSettings::showOpenInNewTab();
+    } else if (id == "open_in_new_window") {
+        return ContextMenuSettings::showOpenInNewWindow();
+    } else if (id == "copy_location") {
+        return ContextMenuSettings::showCopyLocation();
+    } else if (id == "duplicate") {
+        return ContextMenuSettings::showDuplicateHere();
+    }
+    return false;
+}
+
+void ContextMenuSettingsPage::setEntryVisible(const QString& id, bool visible)
+{
+    if (id == "add_to_places") {
+        ContextMenuSettings::setShowAddToPlaces(visible);
+    } else if (id == "sort") {
+        ContextMenuSettings::setShowSortBy(visible);
+    } else if (id == "view_mode") {
+        ContextMenuSettings::setShowViewMode(visible);
+    } else if (id == "open_in_new_tab") {
+        ContextMenuSettings::setShowOpenInNewTab(visible);
+    } else if (id == "open_in_new_window") {
+        ContextMenuSettings::setShowOpenInNewWindow(visible);
+    } else if (id == "copy_location") {
+        ContextMenuSettings::setShowCopyLocation(visible);
+    } else if (id == "duplicate") {
+        ContextMenuSettings::setShowDuplicateHere(visible);
+    }
+}
+
 void ContextMenuSettingsPage::applySettings()
 {
     if (!m_initialized) {
@@ -136,26 +172,8 @@ void ContextMenuSettingsPage::applySettings()
         } else if (service == QLatin1String(CopyToMoveToService)) {
             ContextMenuSettings::setShowCopyMoveMenu(checked);
             ContextMenuSettings::self()->save();
-        } else if (service == QLatin1String(AddToPlacesService)) {
+        } else if (m_actionIds.contains(service)) {
-            ContextMenuSettings::setShowAddToPlaces(checked);
+            setEntryVisible(service, checked);
-            ContextMenuSettings::self()->save();
-        } else if (service == QLatin1String(SortByService)) {
-            ContextMenuSettings::setShowSortBy(checked);
-            ContextMenuSettings::self()->save();
-        } else if (service == QLatin1String(ViewModeService)) {
-            ContextMenuSettings::setShowViewMode(checked);
-            ContextMenuSettings::self()->save();
-        } else if (service == QLatin1String(OpenInNewTabService)) {
-            ContextMenuSettings::setShowOpenInNewTab(checked);
-            ContextMenuSettings::self()->save();
-        } else if (service == QLatin1String(OpenInNewWindowService)) {
-            ContextMenuSettings::setShowOpenInNewWindow(checked);
-            ContextMenuSettings::self()->save();
-        } else if (service == QLatin1String(CopyLocationService)) {
-            ContextMenuSettings::setShowCopyLocation(checked);
-            ContextMenuSettings::self()->save();
-        } else if (service == QLatin1String(DuplicateHereService)) {
-            ContextMenuSettings::setShowDuplicateHere(checked);
             ContextMenuSettings::self()->save();
         } else {
             showGroup.writeEntry(service, checked);
@@ -212,34 +230,12 @@ void ContextMenuSettingsPage::showEvent(QShowEvent* event)
                ContextMenuSettings::showCopyMoveMenu());
 
         // Add other built-in actions
-        addRow(QStringLiteral("bookmark-new"),
+        for (const QString& id : m_actionIds) {
-               i18nc("@option:check", "Add to Places"),
+            QAction* action = m_actions->action(id);
-               AddToPlacesService,
+            if (action != nullptr) {
-               ContextMenuSettings::showAddToPlaces());
+                addRow(action->icon().name(), action->text(), id, entryVisible(id));
-        addRow(QStringLiteral("view-sort"),
+            }
-               i18nc("@option:check", "Sort By"),
+        }
-               SortByService,
-               ContextMenuSettings::showSortBy());
-        addRow(QStringLiteral("view-list-icons"),
-               i18nc("@option:check", "View Mode"),
-               ViewModeService,
-               ContextMenuSettings::showViewMode());
-        addRow(QStringLiteral("folder-new"),
-               i18nc("@option:check", "'Open in New Tab' and 'Open in New Tabs'"),
-               OpenInNewTabService,
-               ContextMenuSettings::showOpenInNewTab());
-        addRow(QStringLiteral("window-new"),
-               i18nc("@option:check", "Open in New Window"),
-               OpenInNewWindowService,
-               ContextMenuSettings::showOpenInNewWindow());
-        addRow(QStringLiteral("edit-copy"),
-               i18nc("@option:check", "Copy Location"),
-               CopyLocationService,
-               ContextMenuSettings::showCopyLocation());
-        addRow(QStringLiteral("edit-copy"),
-               i18nc("@option:check", "Duplicate Here"),
-               DuplicateHereService,
-               ContextMenuSettings::showDuplicateHere());
 
         m_sortModel->sort(Qt::DisplayRole);
 

src/settings/contextmenu/contextmenusettingspage.h

@@ -8,6 +8,8 @@
 
 #include "settings/settingspagebase.h"
 
+#include <KActionCollection>
+
 #include <QString>
 
 class QListView;
@@ -23,7 +25,7 @@ class ContextMenuSettingsPage : public SettingsPageBase
     Q_OBJECT
 
 public:
-    explicit ContextMenuSettingsPage(QWidget* parent);
+    explicit ContextMenuSettingsPage(QWidget* parent, KActionCollection* actions, QStringList actionIds);
     ~ContextMenuSettingsPage() override;
 
     /** @see SettingsPageBase::applySettings() */
@@ -56,6 +58,8 @@ private:
                 const QString &text,
                 const QString &value,
                 bool checked);
+    bool entryVisible(const QString& id);
+    void setEntryVisible(const QString& id, bool visible);
 
 private:
     bool m_initialized;
@@ -64,6 +68,8 @@ private:
     QListView* m_listView;
     QLineEdit *m_searchLineEdit;
     QStringList m_enabledVcsPlugins;
+    KActionCollection* m_actions;
+    QStringList m_actionIds;
 };
 
 #endif

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,15 @@ 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")
+    });
     KPageWidgetItem* contextMenuSettingsFrame = addPage(contextMenuSettingsPage,
                                                         i18nc("@title:group", "Context Menu"));
     contextMenuSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("application-menu")));

src/settings/dolphinsettingsdialog.h

@@ -8,6 +8,7 @@
 #define DOLPHINSETTINGSDIALOG_H
 
 #include <KPageDialog>
+#include <KActionCollection>
 
 class QUrl;
 class SettingsPageBase;
@@ -22,7 +23,7 @@ class DolphinSettingsDialog : public KPageDialog
     Q_OBJECT
 
 public:
-    explicit DolphinSettingsDialog(const QUrl& url, QWidget* parent = nullptr);
+    explicit DolphinSettingsDialog(const QUrl& url, QWidget* parent = nullptr, KActionCollection* actions = {});
     ~DolphinSettingsDialog() override;
 
 signals: