Add margins to the zoom menu entry

[dolphin.git] / src / dolphincontextmenu.cpp

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 01e1a4109ed2e3e32967bf985627170b1ebf9bf9..e1c67aad1fc53821f1d5b667fbd48e34940a0f11 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -6,21 +6,18 @@
 
 #include "dolphincontextmenu.h"
 
 
 #include "dolphincontextmenu.h"
 

-#include "dolphin_generalsettings.h"

 #include "dolphin_contextmenusettings.h"
 #include "dolphin_contextmenusettings.h"

+#include "dolphin_generalsettings.h"

 #include "dolphinmainwindow.h"
 #include "dolphinnewfilemenu.h"
 #include "dolphinplacesmodelsingleton.h"
 #include "dolphinremoveaction.h"
 #include "dolphinviewcontainer.h"
 #include "dolphinmainwindow.h"
 #include "dolphinnewfilemenu.h"
 #include "dolphinplacesmodelsingleton.h"
 #include "dolphinremoveaction.h"
 #include "dolphinviewcontainer.h"

-#include "panels/places/placesitem.h"
-#include "panels/places/placesitemmodel.h"
+#include "global.h"

 #include "trash/dolphintrash.h"
 #include "views/dolphinview.h"
 #include "trash/dolphintrash.h"
 #include "views/dolphinview.h"

-#include "views/viewmodecontroller.h"

 
 #include <KActionCollection>
 
 #include <KActionCollection>

-#include <KFileItemActions>

 #include <KFileItemListProperties>
 #include <KHamburgerMenu>
 #include <KIO/EmptyTrashJob>
 #include <KFileItemListProperties>
 #include <KHamburgerMenu>
 #include <KIO/EmptyTrashJob>


@@ -30,44 +27,33 @@
 #include <KJobWidgets>
 #include <KLocalizedString>
 #include <KNewFileMenu>
 #include <KJobWidgets>
 #include <KLocalizedString>
 #include <KNewFileMenu>

-#include <KPluginMetaData>

 #include <KStandardAction>
 #include <KStandardAction>

-#include <KToolBar>
-#include <kio_version.h>

 
 #include <QApplication>
 #include <QClipboard>
 #include <QKeyEvent>
 
 #include <QApplication>
 #include <QClipboard>
 #include <QKeyEvent>

-#include <QMenuBar>
-#include <QMimeDatabase>
-
-DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent,
-                                       const QPoint& pos,
-                                       const KFileItem& fileInfo,
-                                       const QUrl& baseUrl) :
-    QMenu(parent),
-    m_pos(pos),
-    m_mainWindow(parent),
-    m_fileInfo(fileInfo),
-    m_baseUrl(baseUrl),
-    m_baseFileItem(nullptr),
-    m_selectedItems(),
-    m_selectedItemsProperties(nullptr),
-    m_context(NoContext),
-    m_copyToMenu(parent),
-    m_customActions(),
-    m_command(None),
-    m_removeAction(nullptr)
+#include <QAction>
+
+DolphinContextMenu::DolphinContextMenu(DolphinMainWindow *parent,
+                                       const KFileItem &fileInfo,
+                                       const KFileItemList &selectedItems,
+                                       const QUrl &baseUrl,
+                                       KFileItemActions *fileItemActions)
+    : QMenu(parent)
+    , m_mainWindow(parent)
+    , m_fileInfo(fileInfo)
+    , m_baseUrl(baseUrl)
+    , m_baseFileItem(nullptr)
+    , m_selectedItems(selectedItems)
+    , m_selectedItemsProperties(nullptr)
+    , m_context(NoContext)
+    , m_copyToMenu(parent)
+    , m_removeAction(nullptr)
+    , m_fileItemActions(fileItemActions)

 {
 {

-    // The context menu either accesses the URLs of the selected items
-    // or the items itself. To increase the performance both lists are cached.
-    const DolphinView* view = m_mainWindow->activeViewContainer()->view();
-    m_selectedItems = view->selectedItems();
-

     QApplication::instance()->installEventFilter(this);
 
     QApplication::instance()->installEventFilter(this);
 

-    static_cast<KHamburgerMenu *>(m_mainWindow->actionCollection()->
-                action(QStringLiteral("hamburger_menu")))->addToMenu(this);
+    addAllActions();

 }
 
 DolphinContextMenu::~DolphinContextMenu()
 }
 
 DolphinContextMenu::~DolphinContextMenu()


@@ -78,13 +64,10 @@ DolphinContextMenu::~DolphinContextMenu()
     m_selectedItemsProperties = nullptr;
 }
 
     m_selectedItemsProperties = nullptr;
 }
 

-void DolphinContextMenu::setCustomActions(const QList<QAction*>& actions)
+void DolphinContextMenu::addAllActions()

 {
 {

-    m_customActions = actions;
-}
+    static_cast<KHamburgerMenu *>(m_mainWindow->actionCollection()->action(QStringLiteral("hamburger_menu")))->addToMenu(this);

 
 

-DolphinContextMenu::Command DolphinContextMenu::open()
-{

     // get the context information
     const auto scheme = m_baseUrl.scheme();
     if (scheme == QLatin1String("trash")) {
     // get the context information
     const auto scheme = m_baseUrl.scheme();
     if (scheme == QLatin1String("trash")) {


@@ -93,6 +76,8 @@ DolphinContextMenu::Command DolphinContextMenu::open()
         m_context |= SearchContext;
     } else if (scheme.contains(QLatin1String("timeline"))) {
         m_context |= TimelineContext;
         m_context |= SearchContext;
     } else if (scheme.contains(QLatin1String("timeline"))) {
         m_context |= TimelineContext;

+    } else if (scheme == QStringLiteral("recentlyused")) {
+        m_context |= RecentlyUsedContext;

     }
 
     if (!m_fileInfo.isNull() && !m_selectedItems.isEmpty()) {
     }
 
     if (!m_fileInfo.isNull() && !m_selectedItems.isEmpty()) {


@@ -103,25 +88,23 @@ DolphinContextMenu::Command DolphinContextMenu::open()
     // open the corresponding popup for the context
     if (m_context & TrashContext) {
         if (m_context & ItemContext) {
     // open the corresponding popup for the context
     if (m_context & TrashContext) {
         if (m_context & ItemContext) {

-            openTrashItemContextMenu();
+            addTrashItemContextMenu();

         } else {
         } else {

-            openTrashContextMenu();
+            addTrashContextMenu();

         }
     } else if (m_context & ItemContext) {
         }
     } else if (m_context & ItemContext) {

-        openItemContextMenu();
+        addItemContextMenu();

     } else {
     } else {

-        openViewportContextMenu();
+        addViewportContextMenu();

     }
     }

-
-    return m_command;

 }
 
 }
 

-bool DolphinContextMenu::eventFilter(QObject* object, QEvent* event)
+bool DolphinContextMenu::eventFilter(QObject *object, QEvent *event)

 {
     Q_UNUSED(object)
 
 {
     Q_UNUSED(object)
 

-    if(event->type() == QEvent::KeyPress || event->type() == QEvent::KeyRelease) {
-        QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);
+    if (event->type() == QEvent::KeyPress || event->type() == QEvent::KeyRelease) {
+        QKeyEvent *keyEvent = static_cast<QKeyEvent *>(event);

 
         if (m_removeAction && keyEvent->key() == Qt::Key_Shift) {
             if (event->type() == QEvent::KeyPress) {
 
         if (m_removeAction && keyEvent->key() == Qt::Key_Shift) {
             if (event->type() == QEvent::KeyPress) {


@@ -135,55 +118,74 @@ bool DolphinContextMenu::eventFilter(QObject* object, QEvent* event)
     return false;
 }
 
     return false;
 }
 

-void DolphinContextMenu::openTrashContextMenu()
+void DolphinContextMenu::addTrashContextMenu()

 {
     Q_ASSERT(m_context & TrashContext);
 
 {
     Q_ASSERT(m_context & TrashContext);
 

-    QAction* emptyTrashAction = new QAction(QIcon::fromTheme(QStringLiteral("trash-empty")), i18nc("@action:inmenu", "Empty Trash"), this);
+    QAction *emptyTrashAction = addAction(QIcon::fromTheme(QStringLiteral("edit-delete")), i18nc("@action:inmenu", "Empty Trash"), this, [this]() {
+        Trash::empty(m_mainWindow);
+    });

     emptyTrashAction->setEnabled(!Trash::isEmpty());
     emptyTrashAction->setEnabled(!Trash::isEmpty());

-    addAction(emptyTrashAction);

 
 

-    addCustomActions();
+    // Insert 'Sort By' and 'View Mode'
+    if (ContextMenuSettings::showSortBy() || ContextMenuSettings::showViewMode()) {
+        addSeparator();
+    }
+    if (ContextMenuSettings::showSortBy()) {
+        addAction(m_mainWindow->actionCollection()->action(QStringLiteral("sort")));
+    }
+    if (ContextMenuSettings::showViewMode()) {
+        addAction(m_mainWindow->actionCollection()->action(QStringLiteral("view_mode")));
+    }

 
 

-    QAction* propertiesAction = m_mainWindow->actionCollection()->action(QStringLiteral("properties"));
+    addSeparator();
+    QAction *propertiesAction = m_mainWindow->actionCollection()->action(QStringLiteral("properties"));

     addAction(propertiesAction);
     addAction(propertiesAction);

-
-    if (exec(m_pos) == emptyTrashAction) {
-        Trash::empty(m_mainWindow);
-    }

 }
 
 }
 

-void DolphinContextMenu::openTrashItemContextMenu()
+void DolphinContextMenu::addTrashItemContextMenu()

 {
     Q_ASSERT(m_context & TrashContext);
     Q_ASSERT(m_context & ItemContext);
 
 {
     Q_ASSERT(m_context & TrashContext);
     Q_ASSERT(m_context & ItemContext);
 

-    QAction* restoreAction = new QAction(QIcon::fromTheme("restoration"), i18nc("@action:inmenu", "Restore"), m_mainWindow);
-    addAction(restoreAction);
+    addAction(QIcon::fromTheme(QStringLiteral("edit-reset")),
+              i18ncp("@action:inmenu Restore the selected files that are in the trash to the place they lived at the moment they were trashed. Minimize the "
+                     "length of this string if possible.",
+                     "Restore to Former Location",
+                     "Restore to Former Locations",
+                     m_selectedItems.count()),
+              this,
+              [this]() {
+                  QList<QUrl> selectedUrls;
+                  selectedUrls.reserve(m_selectedItems.count());
+                  for (const KFileItem &item : std::as_const(m_selectedItems)) {
+                      selectedUrls.append(item.url());
+                  }
+
+                  KIO::RestoreJob *job = KIO::restoreFromTrash(selectedUrls);
+                  KJobWidgets::setWindow(job, m_mainWindow);
+                  job->uiDelegate()->setAutoErrorHandlingEnabled(true);
+              });

 
 

-    QAction* deleteAction = m_mainWindow->actionCollection()->action(KStandardAction::name(KStandardAction::DeleteFile));
-    addAction(deleteAction);
+    addSeparator();

 
 

-    QAction* propertiesAction = m_mainWindow->actionCollection()->action(QStringLiteral("properties"));
-    addAction(propertiesAction);
+    addAction(m_mainWindow->actionCollection()->action(KStandardAction::name(KStandardAction::Cut)));
+    addAction(m_mainWindow->actionCollection()->action(KStandardAction::name(KStandardAction::Copy)));

 
 

-    if (exec(m_pos) == restoreAction) {
-        QList<QUrl> selectedUrls;
-        selectedUrls.reserve(m_selectedItems.count());
-        for (const KFileItem &item : qAsConst(m_selectedItems)) {
-            selectedUrls.append(item.url());
-        }
+    addSeparator();

 
 

-        KIO::RestoreJob *job = KIO::restoreFromTrash(selectedUrls);
-        KJobWidgets::setWindow(job, m_mainWindow);
-        job->uiDelegate()->setAutoErrorHandlingEnabled(true);
-    }
+    QAction *deleteAction = m_mainWindow->actionCollection()->action(KStandardAction::name(KStandardAction::DeleteFile));
+    addAction(deleteAction);
+
+    addSeparator();
+
+    addAction(m_mainWindow->actionCollection()->action(QStringLiteral("properties")));

 }
 
 }
 

-void DolphinContextMenu::addDirectoryItemContextMenu(KFileItemActions &fileItemActions)
+void DolphinContextMenu::addDirectoryItemContextMenu()

 {
     // insert 'Open in new window' and 'Open in new tab' entries
 {
     // insert 'Open in new window' and 'Open in new tab' entries

-    const KFileItemListProperties& selectedItemsProps = selectedItemsProperties();
+    const KFileItemListProperties &selectedItemsProps = selectedItemsProperties();

     if (ContextMenuSettings::showOpenInNewTab()) {
         addAction(m_mainWindow->actionCollection()->action(QStringLiteral("open_in_new_tab")));
     }
     if (ContextMenuSettings::showOpenInNewTab()) {
         addAction(m_mainWindow->actionCollection()->action(QStringLiteral("open_in_new_tab")));
     }


@@ -191,20 +193,24 @@ void DolphinContextMenu::addDirectoryItemContextMenu(KFileItemActions &fileItemA
         addAction(m_mainWindow->actionCollection()->action(QStringLiteral("open_in_new_window")));
     }
 
         addAction(m_mainWindow->actionCollection()->action(QStringLiteral("open_in_new_window")));
     }
 

+    if (ContextMenuSettings::showOpenInSplitView()) {
+        addAction(m_mainWindow->actionCollection()->action(QStringLiteral("open_in_split_view")));
+    }
+

     // Insert 'Open With' entries
     // Insert 'Open With' entries

-    addOpenWithActions(fileItemActions);
+    addOpenWithActions();

 
     // set up 'Create New' menu
 
     // set up 'Create New' menu

-    DolphinNewFileMenu* newFileMenu = new DolphinNewFileMenu(m_mainWindow->actionCollection(), m_mainWindow);
-    const DolphinView* view = m_mainWindow->activeViewContainer()->view();
-    newFileMenu->setViewShowsHiddenFiles(view->hiddenFilesShown());
+    QAction *newDirAction = m_mainWindow->actionCollection()->action(QStringLiteral("create_dir"));
+    QAction *newFileAction = m_mainWindow->actionCollection()->action(QStringLiteral("create_file"));
+    DolphinNewFileMenu *newFileMenu = new DolphinNewFileMenu(newDirAction, newFileAction, this);

     newFileMenu->checkUpToDate();
     newFileMenu->checkUpToDate();

-    newFileMenu->setPopupFiles(QList<QUrl>() << m_fileInfo.url());
+    newFileMenu->setWorkingDirectory(m_fileInfo.url());

     newFileMenu->setEnabled(selectedItemsProps.supportsWriting());
     connect(newFileMenu, &DolphinNewFileMenu::fileCreated, newFileMenu, &DolphinNewFileMenu::deleteLater);
     connect(newFileMenu, &DolphinNewFileMenu::directoryCreated, newFileMenu, &DolphinNewFileMenu::deleteLater);
 
     newFileMenu->setEnabled(selectedItemsProps.supportsWriting());
     connect(newFileMenu, &DolphinNewFileMenu::fileCreated, newFileMenu, &DolphinNewFileMenu::deleteLater);
     connect(newFileMenu, &DolphinNewFileMenu::directoryCreated, newFileMenu, &DolphinNewFileMenu::deleteLater);
 

-    QMenu* menu = newFileMenu->menu();
+    QMenu *menu = newFileMenu->menu();

     menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New"));
     menu->setIcon(QIcon::fromTheme(QStringLiteral("list-add")));
     addMenu(menu);
     menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New"));
     menu->setIcon(QIcon::fromTheme(QStringLiteral("list-add")));
     addMenu(menu);


@@ -212,53 +218,50 @@ void DolphinContextMenu::addDirectoryItemContextMenu(KFileItemActions &fileItemA
     addSeparator();
 }
 
     addSeparator();
 }
 

-void DolphinContextMenu::openItemContextMenu()
+void DolphinContextMenu::addOpenParentFolderActions()

 {
 {

-    Q_ASSERT(!m_fileInfo.isNull());
+    addAction(QIcon::fromTheme(QStringLiteral("document-open-folder")), i18nc("@action:inmenu", "Open Path"), [this]() {
+        const QUrl url = m_fileInfo.targetUrl();
+        const QUrl parentUrl = KIO::upUrl(url);
+        m_mainWindow->changeUrl(parentUrl);
+        m_mainWindow->activeViewContainer()->view()->markUrlsAsSelected({url});
+        m_mainWindow->activeViewContainer()->view()->markUrlAsCurrent(url);
+    });

 
 

-    QAction* openParentAction = nullptr;
-    QAction* openParentInNewWindowAction = nullptr;
-    QAction* openParentInNewTabAction = nullptr;
-    const KFileItemListProperties& selectedItemsProps = selectedItemsProperties();
+    addAction(QIcon::fromTheme(QStringLiteral("tab-new")), i18nc("@action:inmenu", "Open Path in New Tab"), [this]() {
+        const QUrl url = m_fileInfo.targetUrl();
+        const QUrl parentUrl = KIO::upUrl(url);
+        DolphinTabPage *tabPage = m_mainWindow->openNewTab(parentUrl);
+        tabPage->activeViewContainer()->view()->markUrlsAsSelected({url});
+        tabPage->activeViewContainer()->view()->markUrlAsCurrent(url);
+    });

 
 

-    KFileItemActions fileItemActions;
-    fileItemActions.setParentWidget(m_mainWindow);
-#if KIO_VERSION >= QT_VERSION_CHECK(5, 82, 0)
-    connect(&fileItemActions, &KFileItemActions::error, this, [this](const QString &errorMessage) {
-        m_mainWindow->activeViewContainer()->showMessage(errorMessage, DolphinViewContainer::Error);
+    addAction(QIcon::fromTheme(QStringLiteral("window-new")), i18nc("@action:inmenu", "Open Path in New Window"), [this]() {
+        Dolphin::openNewWindow({m_fileInfo.targetUrl()}, m_mainWindow, Dolphin::OpenNewWindowFlag::Select);

     });
     });

-#endif
-    fileItemActions.setItemListProperties(selectedItemsProps);
+}
+
+void DolphinContextMenu::addItemContextMenu()
+{
+    Q_ASSERT(!m_fileInfo.isNull());
+
+    const KFileItemListProperties &selectedItemsProps = selectedItemsProperties();
+
+    m_fileItemActions->setItemListProperties(selectedItemsProps);

 
     if (m_selectedItems.count() == 1) {
         // single files
         if (m_fileInfo.isDir()) {
 
     if (m_selectedItems.count() == 1) {
         // single files
         if (m_fileInfo.isDir()) {

-            addDirectoryItemContextMenu(fileItemActions);
-        } else if (m_context & TimelineContext || m_context & SearchContext) {
-            addOpenWithActions(fileItemActions);
-
-            openParentAction = new QAction(QIcon::fromTheme(QStringLiteral("document-open-folder")),
-                                           i18nc("@action:inmenu",
-                                                 "Open Path"),
-                                           this);
-            addAction(openParentAction);
-
-            openParentInNewWindowAction = new QAction(QIcon::fromTheme(QStringLiteral("window-new")),
-                                                    i18nc("@action:inmenu",
-                                                          "Open Path in New Window"),
-                                                    this);
-            addAction(openParentInNewWindowAction);
-
-            openParentInNewTabAction = new QAction(QIcon::fromTheme(QStringLiteral("tab-new")),
-                                                   i18nc("@action:inmenu",
-                                                         "Open Path in New Tab"),
-                                                   this);
-            addAction(openParentInNewTabAction);
+            addDirectoryItemContextMenu();
+        } else if (m_context & TimelineContext || m_context & SearchContext || m_context & RecentlyUsedContext) {
+            addOpenWithActions();
+
+            addOpenParentFolderActions();

 
             addSeparator();
         } else {
             // Insert 'Open With" entries
 
             addSeparator();
         } else {
             // Insert 'Open With" entries

-            addOpenWithActions(fileItemActions);
+            addOpenWithActions();

         }
         if (m_fileInfo.isLink()) {
             addAction(m_mainWindow->actionCollection()->action(QStringLiteral("show_target")));
         }
         if (m_fileInfo.isLink()) {
             addAction(m_mainWindow->actionCollection()->action(QStringLiteral("show_target")));


@@ -267,8 +270,8 @@ void DolphinContextMenu::openItemContextMenu()
     } else {
         // multiple files
         bool selectionHasOnlyDirs = true;
     } else {
         // multiple files
         bool selectionHasOnlyDirs = true;

-        for (const auto &item : qAsConst(m_selectedItems)) {
-            const QUrl& url = DolphinView::openItemAsFolderUrl(item);
+        for (const auto &item : std::as_const(m_selectedItems)) {
+            const QUrl &url = DolphinView::openItemAsFolderUrl(item);

             if (url.isEmpty()) {
                 selectionHasOnlyDirs = false;
                 break;
             if (url.isEmpty()) {
                 selectionHasOnlyDirs = false;
                 break;


@@ -280,12 +283,12 @@ void DolphinContextMenu::openItemContextMenu()
             addAction(m_mainWindow->actionCollection()->action(QStringLiteral("open_in_new_tabs")));
         }
         // Insert 'Open With" entries
             addAction(m_mainWindow->actionCollection()->action(QStringLiteral("open_in_new_tabs")));
         }
         // Insert 'Open With" entries

-        addOpenWithActions(fileItemActions);
+        addOpenWithActions();

     }
 
     insertDefaultItemActions(selectedItemsProps);
 
     }
 
     insertDefaultItemActions(selectedItemsProps);
 

-    addAdditionalActions(fileItemActions, selectedItemsProps);
+    addAdditionalActions(selectedItemsProps);

 
     // insert 'Copy To' and 'Move To' sub menus
     if (ContextMenuSettings::showCopyMoveMenu()) {
 
     // insert 'Copy To' and 'Move To' sub menus
     if (ContextMenuSettings::showCopyMoveMenu()) {


@@ -295,56 +298,44 @@ void DolphinContextMenu::openItemContextMenu()
         m_copyToMenu.addActionsTo(this);
     }
 
         m_copyToMenu.addActionsTo(this);
     }
 

-    // insert 'Properties...' entry
-    addSeparator();
-    QAction* propertiesAction = m_mainWindow->actionCollection()->action(QStringLiteral("properties"));
-    addAction(propertiesAction);
+    if (m_mainWindow->isSplitViewEnabledInCurrentTab()) {
+        if (ContextMenuSettings::showCopyToOtherSplitView()) {
+            addAction(m_mainWindow->actionCollection()->action(QStringLiteral("copy_to_inactive_split_view")));
+        }

 
 

-    QAction* activatedAction = exec(m_pos);
-    if (activatedAction) {
-        if (activatedAction == openParentAction) {
-            m_command = OpenParentFolder;
-        } else if (activatedAction == openParentInNewWindowAction) {
-            m_command = OpenParentFolderInNewWindow;
-        } else if (activatedAction == openParentInNewTabAction) {
-            m_command = OpenParentFolderInNewTab;
+        if (ContextMenuSettings::showMoveToOtherSplitView()) {
+            addAction(m_mainWindow->actionCollection()->action(QStringLiteral("move_to_inactive_split_view")));

         }
     }
         }
     }

+
+    // insert 'Properties...' entry
+    addSeparator();
+    QAction *propertiesAction = m_mainWindow->actionCollection()->action(QStringLiteral("properties"));
+    addAction(propertiesAction);

 }
 
 }
 

-void DolphinContextMenu::openViewportContextMenu()
+void DolphinContextMenu::addViewportContextMenu()

 {
 {

-    const DolphinView* view = m_mainWindow->activeViewContainer()->view();
-

     const KFileItemListProperties baseUrlProperties(KFileItemList() << baseFileItem());
     const KFileItemListProperties baseUrlProperties(KFileItemList() << baseFileItem());

-    KFileItemActions fileItemActions;
-    fileItemActions.setParentWidget(m_mainWindow);
-#if KIO_VERSION >= QT_VERSION_CHECK(5, 82, 0)
-    connect(&fileItemActions, &KFileItemActions::error, this, [this](const QString &errorMessage) {
-        m_mainWindow->activeViewContainer()->showMessage(errorMessage, DolphinViewContainer::Error);
-    });
-#endif
-    fileItemActions.setItemListProperties(baseUrlProperties);
+    m_fileItemActions->setItemListProperties(baseUrlProperties);

 
     // Set up and insert 'Create New' menu
 
     // Set up and insert 'Create New' menu

-    KNewFileMenu* newFileMenu = m_mainWindow->newFileMenu();
-    newFileMenu->setViewShowsHiddenFiles(view->hiddenFilesShown());
+    KNewFileMenu *newFileMenu = m_mainWindow->newFileMenu();

     newFileMenu->checkUpToDate();
     newFileMenu->checkUpToDate();

-    newFileMenu->setPopupFiles(QList<QUrl>() << m_baseUrl);
+    newFileMenu->setWorkingDirectory(m_baseUrl);

     addMenu(newFileMenu->menu());
 
     // Show "open with" menu items even if the dir is empty, because there are legitimate
     // use cases for this, such as opening an empty dir in Kate or VSCode or something
     addMenu(newFileMenu->menu());
 
     // Show "open with" menu items even if the dir is empty, because there are legitimate
     // use cases for this, such as opening an empty dir in Kate or VSCode or something

-    addOpenWithActions(fileItemActions);
+    addOpenWithActions();

 
 

-    QAction* pasteAction = createPasteAction();
+    QAction *pasteAction = createPasteAction();

     if (pasteAction) {
         addAction(pasteAction);
     }
 
     // Insert 'Add to Places' entry if it's not already in the places panel
     if (pasteAction) {
         addAction(pasteAction);
     }
 
     // Insert 'Add to Places' entry if it's not already in the places panel

-    if (ContextMenuSettings::showAddToPlaces() &&
-            !placeExists(m_mainWindow->activeViewContainer()->url())) {
+    if (ContextMenuSettings::showAddToPlaces() && !placeExists(m_mainWindow->activeViewContainer()->url())) {

         addAction(m_mainWindow->actionCollection()->action(QStringLiteral("add_to_places")));
     }
     addSeparator();
         addAction(m_mainWindow->actionCollection()->action(QStringLiteral("add_to_places")));
     }
     addSeparator();


@@ -360,30 +351,27 @@ void DolphinContextMenu::openViewportContextMenu()
         addSeparator();
     }
 
         addSeparator();
     }
 

-    addAdditionalActions(fileItemActions, baseUrlProperties);
-    addCustomActions();
+    addAdditionalActions(baseUrlProperties);

 
     addSeparator();
 
 
     addSeparator();
 

-    QAction* propertiesAction = m_mainWindow->actionCollection()->action(QStringLiteral("properties"));
+    QAction *propertiesAction = m_mainWindow->actionCollection()->action(QStringLiteral("properties"));

     addAction(propertiesAction);
     addAction(propertiesAction);

-
-    exec(m_pos);

 }
 
 }
 

-void DolphinContextMenu::insertDefaultItemActions(const KFileItemListProperties& properties)
+void DolphinContextMenu::insertDefaultItemActions(const KFileItemListProperties &properties)

 {
 {

-    const KActionCollection* collection = m_mainWindow->actionCollection();
+    const KActionCollection *collection = m_mainWindow->actionCollection();

 
     // Insert 'Cut', 'Copy', 'Copy Location' and 'Paste'
     addAction(collection->action(KStandardAction::name(KStandardAction::Cut)));
     addAction(collection->action(KStandardAction::name(KStandardAction::Copy)));
     if (ContextMenuSettings::showCopyLocation()) {
 
     // Insert 'Cut', 'Copy', 'Copy Location' and 'Paste'
     addAction(collection->action(KStandardAction::name(KStandardAction::Cut)));
     addAction(collection->action(KStandardAction::name(KStandardAction::Copy)));
     if (ContextMenuSettings::showCopyLocation()) {

-        QAction* copyPathAction = collection->action(QString("copy_location"));
+        QAction *copyPathAction = collection->action(QStringLiteral("copy_location"));

         copyPathAction->setEnabled(m_selectedItems.size() == 1);
         addAction(copyPathAction);
     }
         copyPathAction->setEnabled(m_selectedItems.size() == 1);
         addAction(copyPathAction);
     }

-    QAction* pasteAction = createPasteAction();
+    QAction *pasteAction = createPasteAction();

     if (pasteAction) {
         addAction(pasteAction);
     }
     if (pasteAction) {
         addAction(pasteAction);
     }


@@ -397,20 +385,15 @@ void DolphinContextMenu::insertDefaultItemActions(const KFileItemListProperties&
     addAction(collection->action(KStandardAction::name(KStandardAction::RenameFile)));
 
     // Insert 'Add to Places' entry if appropriate
     addAction(collection->action(KStandardAction::name(KStandardAction::RenameFile)));
 
     // Insert 'Add to Places' entry if appropriate

-    if (ContextMenuSettings::showAddToPlaces() &&
-            m_selectedItems.count() == 1 &&
-            m_fileInfo.isDir() &&
-            !placeExists(m_fileInfo.url())) {
+    if (ContextMenuSettings::showAddToPlaces() && m_selectedItems.count() == 1 && m_fileInfo.isDir() && !placeExists(m_fileInfo.url())) {

         addAction(m_mainWindow->actionCollection()->action(QStringLiteral("add_to_places")));
     }
 
     addSeparator();
 
     // Insert 'Move to Trash' and/or 'Delete'
         addAction(m_mainWindow->actionCollection()->action(QStringLiteral("add_to_places")));
     }
 
     addSeparator();
 
     // Insert 'Move to Trash' and/or 'Delete'

-    const bool showDeleteAction = (KSharedConfig::openConfig()->group("KDE").readEntry("ShowDeleteCommand", false) ||
-                                    !properties.isLocal());
-    const bool showMoveToTrashAction = (properties.isLocal() &&
-                                        properties.supportsMoving());
+    const bool showDeleteAction = (KSharedConfig::openConfig()->group(QStringLiteral("KDE")).readEntry("ShowDeleteCommand", false) || !properties.isLocal());
+    const bool showMoveToTrashAction = (properties.isLocal() && properties.supportsMoving());

 
     if (showDeleteAction && showMoveToTrashAction) {
         delete m_removeAction;
 
     if (showDeleteAction && showMoveToTrashAction) {
         delete m_removeAction;


@@ -428,18 +411,17 @@ void DolphinContextMenu::insertDefaultItemActions(const KFileItemListProperties&
     }
 }
 
     }
 }
 

-bool DolphinContextMenu::placeExists(const QUrl& url) const
+bool DolphinContextMenu::placeExists(const QUrl &url) const

 {
 {

-    const KFilePlacesModel* placesModel = DolphinPlacesModelSingleton::instance().placesModel();
-
-    const auto& matchedPlaces = placesModel->match(placesModel->index(0,0), KFilePlacesModel::UrlRole, url, 1, Qt::MatchExactly);
+    const KFilePlacesModel *placesModel = DolphinPlacesModelSingleton::instance().placesModel();

 
 

-    return !matchedPlaces.isEmpty();
+    QModelIndex url_index = placesModel->closestItem(url);
+    return url_index.isValid() && placesModel->url(url_index).matches(url, QUrl::StripTrailingSlash);

 }
 
 }
 

-QAction* DolphinContextMenu::createPasteAction()
+QAction *DolphinContextMenu::createPasteAction()

 {
 {

-    QAction* action = nullptr;
+    QAction *action = nullptr;

     KFileItem destItem;
     if (!m_fileInfo.isNull() && m_selectedItems.count() <= 1) {
         destItem = m_fileInfo;
     KFileItem destItem;
     if (!m_fileInfo.isNull() && m_selectedItems.count() <= 1) {
         destItem = m_fileInfo;


@@ -465,7 +447,7 @@ QAction* DolphinContextMenu::createPasteAction()
     return action;
 }
 
     return action;
 }
 

-KFileItemListProperties& DolphinContextMenu::selectedItemsProperties() const
+KFileItemListProperties &DolphinContextMenu::selectedItemsProperties() const

 {
     if (!m_selectedItemsProperties) {
         m_selectedItemsProperties = new KFileItemListProperties(m_selectedItems);
 {
     if (!m_selectedItemsProperties) {
         m_selectedItemsProperties = new KFileItemListProperties(m_selectedItems);


@@ -476,7 +458,7 @@ KFileItemListProperties& DolphinContextMenu::selectedItemsProperties() const
 KFileItem DolphinContextMenu::baseFileItem()
 {
     if (!m_baseFileItem) {
 KFileItem DolphinContextMenu::baseFileItem()
 {
     if (!m_baseFileItem) {

-        const DolphinView* view = m_mainWindow->activeViewContainer()->view();
+        const DolphinView *view = m_mainWindow->activeViewContainer()->view();

         KFileItem baseItem = view->rootItem();
         if (baseItem.isNull() || baseItem.url() != m_baseUrl) {
             m_baseFileItem = new KFileItem(m_baseUrl);
         KFileItem baseItem = view->rootItem();
         if (baseItem.isNull() || baseItem.url() != m_baseUrl) {
             m_baseFileItem = new KFileItem(m_baseUrl);


@@ -487,32 +469,46 @@ KFileItem DolphinContextMenu::baseFileItem()
     return *m_baseFileItem;
 }
 
     return *m_baseFileItem;
 }
 

-void DolphinContextMenu::addOpenWithActions(KFileItemActions& fileItemActions)
+void DolphinContextMenu::addOpenWithActions()

 {
     // insert 'Open With...' action or sub menu
 {
     // insert 'Open With...' action or sub menu

-    fileItemActions.addOpenWithActionsTo(this, QStringLiteral("DesktopEntryName != '%1'").arg(qApp->desktopFileName()));
-}
-
-void DolphinContextMenu::addCustomActions()
-{
-    addActions(m_customActions);
+    m_fileItemActions->insertOpenWithActionsTo(nullptr, this, QStringList{qApp->desktopFileName()});
+
+    // For a single file, hint in "Open with" menu that middle-clicking would open it in the secondary app.
+    // (Unless middle-clicking would open it as a folder in a new tab (e.g. archives).)
+    const QUrl &url = DolphinView::openItemAsFolderUrl(m_fileInfo, GeneralSettings::browseThroughArchives());
+    if (m_selectedItems.count() == 1 && url.isEmpty()) {
+        if (QAction *openWithSubMenu = findChild<QAction *>(QStringLiteral("openWith_submenu"))) {
+            Q_ASSERT(openWithSubMenu->menu());
+            Q_ASSERT(!openWithSubMenu->menu()->isEmpty());
+
+            auto *secondaryApp = openWithSubMenu->menu()->actions().first();
+            // Add it like a keyboard shortcut, Qt uses \t as a separator.
+            if (!secondaryApp->text().contains(QLatin1Char('\t'))) {
+                secondaryApp->setText(secondaryApp->text() + QLatin1Char('\t')
+                                      + i18nc("@action:inmenu Shortcut, middle click to trigger menu item, keep short", "Middle Click"));
+            }
+        }
+    }

 }
 
 }
 

-void DolphinContextMenu::addAdditionalActions(KFileItemActions &fileItemActions, const KFileItemListProperties &props)
+void DolphinContextMenu::addAdditionalActions(const KFileItemListProperties &props)

 {
     addSeparator();
 
     QList<QAction *> additionalActions;
 {
     addSeparator();
 
     QList<QAction *> additionalActions;

-    if (props.isDirectory() && props.isLocal() && ContextMenuSettings::showOpenTerminal()) {
-        additionalActions << m_mainWindow->actionCollection()->action(QStringLiteral("open_terminal"));
+    if (props.isLocal() && ContextMenuSettings::showOpenTerminal()) {
+        additionalActions << m_mainWindow->actionCollection()->action(QStringLiteral("open_terminal_here"));

     }
     }

-    fileItemActions.addActionsTo(this, KFileItemActions::MenuActionSource::All, additionalActions);
+    m_fileItemActions->addActionsTo(this, KFileItemActions::MenuActionSource::All, additionalActions);

 
 

-    const DolphinView* view = m_mainWindow->activeViewContainer()->view();
-    const QList<QAction*> versionControlActions = view->versionControlActions(m_selectedItems);
+    const DolphinView *view = m_mainWindow->activeViewContainer()->view();
+    const QList<QAction *> versionControlActions = view->versionControlActions(m_selectedItems);

     if (!versionControlActions.isEmpty()) {
     if (!versionControlActions.isEmpty()) {

+        addSeparator();

         addActions(versionControlActions);
         addSeparator();
     }
 }
 
         addActions(versionControlActions);
         addSeparator();
     }
 }
 

+#include "moc_dolphincontextmenu.cpp"