X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/2b1906eeeabaf91b856d46e72390ae811747ec39..47f1287472044d67a1cd40ec013979ab2eda9b3f:/src/dolphincontextmenu.cpp

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 68f6dbd21..413ab96a0 100644
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -126,6 +126,18 @@ void DolphinContextMenu::addTrashContextMenu()
     });
     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);
 }
@@ -135,23 +147,36 @@ void DolphinContextMenu::addTrashItemContextMenu()
     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);
-    });
+    QAction *propertiesAction = m_mainWindow->actionCollection()->action(QStringLiteral("properties"));
+    addAction(propertiesAction);
+
+    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 *propertiesAction = m_mainWindow->actionCollection()->action(QStringLiteral("properties"));
-    addAction(propertiesAction);
 }
 
 void DolphinContextMenu::addDirectoryItemContextMenu()
@@ -199,7 +224,11 @@ void DolphinContextMenu::addOpenParentFolderActions()
     });
 
     addAction(QIcon::fromTheme(QStringLiteral("tab-new")), i18nc("@action:inmenu", "Open Path in New Tab"), [this]() {
-        m_mainWindow->openNewTab(KIO::upUrl(m_fileInfo.targetUrl()));
+        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]() {
@@ -333,7 +362,7 @@ void DolphinContextMenu::insertDefaultItemActions(const KFileItemListProperties
     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);
     }
@@ -381,9 +410,8 @@ 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);
-
-    return !matchedPlaces.isEmpty();
+    QModelIndex url_index = placesModel->closestItem(url);
+    return url_index.isValid() && placesModel->url(url_index).matches(url, QUrl::StripTrailingSlash);
 }
 
 QAction *DolphinContextMenu::createPasteAction()