KStandardItemList: have emblem when hovering

[dolphin.git] / src / dolphincontextmenu.cpp

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index f209633479ca0bb8b3a69ad17b4aaefed423b3b9..8372060aade9a5d30fc884eccecaafc36a770ff5 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -16,7 +16,6 @@
 #include "global.h"
 #include "trash/dolphintrash.h"
 #include "views/dolphinview.h"
 #include "global.h"
 #include "trash/dolphintrash.h"
 #include "views/dolphinview.h"

-#include "views/viewmodecontroller.h"

 
 #include <KActionCollection>
 #include <KFileItemListProperties>
 
 #include <KActionCollection>
 #include <KFileItemListProperties>


@@ -33,6 +32,7 @@
 #include <QApplication>
 #include <QClipboard>
 #include <QKeyEvent>
 #include <QApplication>
 #include <QClipboard>
 #include <QKeyEvent>

+#include <QAction>

 
 DolphinContextMenu::DolphinContextMenu(DolphinMainWindow *parent,
                                        const KFileItem &fileInfo,
 
 DolphinContextMenu::DolphinContextMenu(DolphinMainWindow *parent,
                                        const KFileItem &fileInfo,


@@ -76,6 +76,8 @@ void DolphinContextMenu::addAllActions()
         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()) {


@@ -120,11 +122,23 @@ void DolphinContextMenu::addTrashContextMenu()
 {
     Q_ASSERT(m_context & TrashContext);
 
 {
     Q_ASSERT(m_context & TrashContext);
 

-    QAction *emptyTrashAction = addAction(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]() {

         Trash::empty(m_mainWindow);
     });
     emptyTrashAction->setEnabled(!Trash::isEmpty());
 
         Trash::empty(m_mainWindow);
     });
     emptyTrashAction->setEnabled(!Trash::isEmpty());
 

+    // 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")));
+    }
+
+    addSeparator();

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


@@ -134,23 +148,37 @@ void DolphinContextMenu::addTrashItemContextMenu()
     Q_ASSERT(m_context & TrashContext);
     Q_ASSERT(m_context & ItemContext);
 
     Q_ASSERT(m_context & TrashContext);
     Q_ASSERT(m_context & ItemContext);
 

-    addAction(QIcon::fromTheme("restoration"), i18nc("@action:inmenu", "Restore"), [this]() {
-        QList<QUrl> selectedUrls;
-        selectedUrls.reserve(m_selectedItems.count());
-        for (const KFileItem &item : std::as_const(m_selectedItems)) {
-            selectedUrls.append(item.url());
-        }
+    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]() {
+                  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);
+              });

 
 

-        KIO::RestoreJob *job = KIO::restoreFromTrash(selectedUrls);
-        KJobWidgets::setWindow(job, m_mainWindow);
-        job->uiDelegate()->setAutoErrorHandlingEnabled(true);
-    });
+    addSeparator();
+
+    addAction(m_mainWindow->actionCollection()->action(KStandardAction::name(KStandardAction::Cut)));
+    addAction(m_mainWindow->actionCollection()->action(KStandardAction::name(KStandardAction::Copy)));
+
+    addSeparator();

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

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

 }
 
 void DolphinContextMenu::addDirectoryItemContextMenu()
 }
 
 void DolphinContextMenu::addDirectoryItemContextMenu()


@@ -164,11 +192,17 @@ void DolphinContextMenu::addDirectoryItemContextMenu()
         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
     addOpenWithActions();
 
     // set up 'Create New' menu
     // Insert 'Open With' entries
     addOpenWithActions();
 
     // set up 'Create New' menu

-    DolphinNewFileMenu *newFileMenu = new DolphinNewFileMenu(m_mainWindow->actionCollection()->action(QStringLiteral("create_dir")), m_mainWindow);
+    QAction *newDirAction = m_mainWindow->actionCollection()->action(QStringLiteral("create_dir"));
+    QAction *newFileAction = m_mainWindow->actionCollection()->action(QStringLiteral("create_file"));
+    DolphinNewFileMenu *newFileMenu = new DolphinNewFileMenu(newDirAction, newFileAction, m_mainWindow);

     newFileMenu->checkUpToDate();
     newFileMenu->setWorkingDirectory(m_fileInfo.url());
     newFileMenu->setEnabled(selectedItemsProps.supportsWriting());
     newFileMenu->checkUpToDate();
     newFileMenu->setWorkingDirectory(m_fileInfo.url());
     newFileMenu->setEnabled(selectedItemsProps.supportsWriting());


@@ -183,6 +217,29 @@ void DolphinContextMenu::addDirectoryItemContextMenu()
     addSeparator();
 }
 
     addSeparator();
 }
 

+void DolphinContextMenu::addOpenParentFolderActions()
+{
+    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);
+    });
+
+    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);
+    });
+
+    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);
+    });
+}
+

 void DolphinContextMenu::addItemContextMenu()
 {
     Q_ASSERT(!m_fileInfo.isNull());
 void DolphinContextMenu::addItemContextMenu()
 {
     Q_ASSERT(!m_fileInfo.isNull());


@@ -195,22 +252,10 @@ void DolphinContextMenu::addItemContextMenu()
         // single files
         if (m_fileInfo.isDir()) {
             addDirectoryItemContextMenu();
         // single files
         if (m_fileInfo.isDir()) {
             addDirectoryItemContextMenu();

-        } else if (m_context & TimelineContext || m_context & SearchContext) {
+        } else if (m_context & TimelineContext || m_context & SearchContext || m_context & RecentlyUsedContext) {

             addOpenWithActions();
 
             addOpenWithActions();
 

-            addAction(QIcon::fromTheme(QStringLiteral("document-open-folder")), i18nc("@action:inmenu", "Open Path"), [this]() {
-                m_mainWindow->changeUrl(KIO::upUrl(m_fileInfo.url()));
-                m_mainWindow->activeViewContainer()->view()->markUrlsAsSelected({m_fileInfo.url()});
-                m_mainWindow->activeViewContainer()->view()->markUrlAsCurrent(m_fileInfo.url());
-            });
-
-            addAction(QIcon::fromTheme(QStringLiteral("tab-new")), i18nc("@action:inmenu", "Open Path in New Tab"), [this]() {
-                m_mainWindow->openNewTab(KIO::upUrl(m_fileInfo.url()));
-            });
-
-            addAction(QIcon::fromTheme(QStringLiteral("window-new")), i18nc("@action:inmenu", "Open Path in New Window"), [this]() {
-                Dolphin::openNewWindow({m_fileInfo.url()}, m_mainWindow, Dolphin::OpenNewWindowFlag::Select);
-            });
+            addOpenParentFolderActions();

 
             addSeparator();
         } else {
 
             addSeparator();
         } else {


@@ -321,7 +366,7 @@ void DolphinContextMenu::insertDefaultItemActions(const KFileItemListProperties
     addAction(collection->action(KStandardAction::name(KStandardAction::Cut)));
     addAction(collection->action(KStandardAction::name(KStandardAction::Copy)));
     if (ContextMenuSettings::showCopyLocation()) {
     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);
     }


@@ -346,7 +391,7 @@ void DolphinContextMenu::insertDefaultItemActions(const KFileItemListProperties
     addSeparator();
 
     // Insert 'Move to Trash' and/or 'Delete'
     addSeparator();
 
     // Insert 'Move to Trash' and/or 'Delete'

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

     const bool showMoveToTrashAction = (properties.isLocal() && properties.supportsMoving());
 
     if (showDeleteAction && showMoveToTrashAction) {
     const bool showMoveToTrashAction = (properties.isLocal() && properties.supportsMoving());
 
     if (showDeleteAction && showMoveToTrashAction) {


@@ -369,9 +414,8 @@ bool DolphinContextMenu::placeExists(const QUrl &url) const
 {
     const KFilePlacesModel *placesModel = DolphinPlacesModelSingleton::instance().placesModel();
 
 {
     const KFilePlacesModel *placesModel = DolphinPlacesModelSingleton::instance().placesModel();
 

-    const auto &matchedPlaces = placesModel->match(placesModel->index(0, 0), KFilePlacesModel::UrlRole, url, 1, Qt::MatchExactly);
-
-    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()


@@ -428,6 +472,23 @@ void DolphinContextMenu::addOpenWithActions()
 {
     // insert 'Open With...' action or sub menu
     m_fileItemActions->insertOpenWithActionsTo(nullptr, this, QStringList{qApp->desktopFileName()});
 {
     // insert 'Open With...' action or sub menu
     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(const KFileItemListProperties &props)
 }
 
 void DolphinContextMenu::addAdditionalActions(const KFileItemListProperties &props)


@@ -443,6 +504,7 @@ void DolphinContextMenu::addAdditionalActions(const KFileItemListProperties &pro
     const DolphinView *view = m_mainWindow->activeViewContainer()->view();
     const QList<QAction *> versionControlActions = view->versionControlActions(m_selectedItems);
     if (!versionControlActions.isEmpty()) {
     const DolphinView *view = m_mainWindow->activeViewContainer()->view();
     const QList<QAction *> versionControlActions = view->versionControlActions(m_selectedItems);
     if (!versionControlActions.isEmpty()) {

+        addSeparator();

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