[KStandardItemListWidget] Avoid needless image resizing

[dolphin.git] / src / dolphincontextmenu.cpp

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index da76e56fefb9e1ce55653760aa8d804b544682c3..7d7d7a40843f4b77d741e50bb10d601fe2f58e05 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -20,78 +20,69 @@
 
 #include "dolphincontextmenu.h"
 
 
 #include "dolphincontextmenu.h"
 

+#include "dolphin_generalsettings.h"

 #include "dolphinmainwindow.h"
 #include "dolphinnewfilemenu.h"
 #include "dolphinmainwindow.h"
 #include "dolphinnewfilemenu.h"

-#include "settings/dolphinsettings.h"
+#include "dolphinremoveaction.h"

 #include "dolphinviewcontainer.h"
 #include "dolphinviewcontainer.h"

-#include "dolphin_generalsettings.h"
-
-#include <kactioncollection.h>
-#include <kdesktopfile.h>
-#include <kfileitemlistproperties.h>
-#include <kfileplacesmodel.h>
-#include <kglobal.h>
-#include <kiconloader.h>
-#include <kio/netaccess.h>
-#include <kmenu.h>
-#include <kmenubar.h>
-#include <kmessagebox.h>
-#include <kmimetypetrader.h>
-#include <kmodifierkeyinfo.h>
-#include <knewfilemenu.h>
-#include <konqmimedata.h>
-#include <konq_operations.h>
-#include <kfileitemactions.h>
-#include <klocale.h>
-#include <kpropertiesdialog.h>
-#include <kstandardaction.h>
-#include <kstandarddirs.h>
-
-#include <QtGui/QApplication>
-#include <QtGui/QClipboard>
-#include <QtCore/QDir>
-
+#include "panels/places/placesitem.h"
+#include "panels/places/placesitemmodel.h"
+#include "trash/dolphintrash.h"

 #include "views/dolphinview.h"
 #include "views/viewmodecontroller.h"
 
 #include "views/dolphinview.h"
 #include "views/viewmodecontroller.h"
 

-K_GLOBAL_STATIC(KModifierKeyInfo, m_keyInfo)
+#include <KAbstractFileItemActionPlugin>
+#include <KActionCollection>
+#include <KFileItemActions>
+#include <KFileItemListProperties>
+#include <KIO/EmptyTrashJob>
+#include <KIO/JobUiDelegate>
+#include <KIO/Paste>
+#include <KIO/RestoreJob>
+#include <KJobWidgets>
+#include <KLocalizedString>
+#include <KMimeTypeTrader>
+#include <KNewFileMenu>
+#include <KPluginMetaData>
+#include <KService>
+#include <KStandardAction>
+#include <KToolBar>
+
+#include <QApplication>
+#include <QClipboard>
+#include <QKeyEvent>
+#include <QMenu>
+#include <QMenuBar>
+#include <QMimeDatabase>

 
 DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent,
 
 DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent,

+                                       const QPoint& pos,

                                        const KFileItem& fileInfo,
                                        const KFileItem& fileInfo,

-                                       const KUrl& baseUrl) :
+                                       const QUrl& baseUrl) :
+    QMenu(parent),
+    m_pos(pos),

     m_mainWindow(parent),
     m_mainWindow(parent),

-    m_capabilities(0),

     m_fileInfo(fileInfo),
     m_baseUrl(baseUrl),
     m_fileInfo(fileInfo),
     m_baseUrl(baseUrl),

+    m_baseFileItem(nullptr),
+    m_selectedItems(),
+    m_selectedItemsProperties(nullptr),

     m_context(NoContext),
     m_copyToMenu(parent),
     m_customActions(),
     m_context(NoContext),
     m_copyToMenu(parent),
     m_customActions(),

-    m_popup(new KMenu(m_mainWindow)),
-    m_shiftPressed(false),
-    m_removeAction(0)
+    m_command(None),
+    m_removeAction(nullptr)

 {
     // 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();
 {
     // 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_selectedUrls = view->selectedUrls();

     m_selectedItems = view->selectedItems();
     m_selectedItems = view->selectedItems();

-
-    if (m_keyInfo != 0) {
-        if (m_keyInfo->isKeyPressed(Qt::Key_Shift) || m_keyInfo->isKeyLatched(Qt::Key_Shift)) {
-            m_shiftPressed = true;
-        }
-        connect(m_keyInfo, SIGNAL(keyPressed(Qt::Key, bool)),
-                this, SLOT(slotKeyModifierPressed(Qt::Key, bool)));
-    }
-
-    m_removeAction = new QAction(this);
-    connect(m_removeAction, SIGNAL(triggered()), this, SLOT(slotRemoveActionTriggered()));

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

-    delete m_capabilities;
-    m_capabilities = 0;
+    delete m_selectedItemsProperties;
+    m_selectedItemsProperties = nullptr;

 }
 
 void DolphinContextMenu::setCustomActions(const QList<QAction*>& actions)
 }
 
 void DolphinContextMenu::setCustomActions(const QList<QAction*>& actions)


@@ -99,10 +90,10 @@ void DolphinContextMenu::setCustomActions(const QList<QAction*>& actions)
     m_customActions = actions;
 }
 
     m_customActions = actions;
 }
 

-void DolphinContextMenu::open()
+DolphinContextMenu::Command DolphinContextMenu::open()

 {
     // get the context information
 {
     // get the context information

-    if (m_baseUrl.protocol() == "trash") {
+    if (m_baseUrl.scheme() == QLatin1String("trash")) {

         m_context |= TrashContext;
     }
 
         m_context |= TrashContext;
     }
 


@@ -124,73 +115,43 @@ void DolphinContextMenu::open()
         Q_ASSERT(m_context == NoContext);
         openViewportContextMenu();
     }
         Q_ASSERT(m_context == NoContext);
         openViewportContextMenu();
     }

-}

 
 

-void DolphinContextMenu::initializeModifierKeyInfo()
-{
-    // Access m_keyInfo, so that it gets instantiated by
-    // K_GLOBAL_STATIC
-    KModifierKeyInfo* keyInfo = m_keyInfo;
-    Q_UNUSED(keyInfo);
+    return m_command;

 }
 
 }
 

-void DolphinContextMenu::slotKeyModifierPressed(Qt::Key key, bool pressed)
+void DolphinContextMenu::keyPressEvent(QKeyEvent *ev)

 {
 {

-    m_shiftPressed = (key == Qt::Key_Shift) && pressed;
-    updateRemoveAction();
+    if (m_removeAction && ev->key() == Qt::Key_Shift) {
+        m_removeAction->update(DolphinRemoveAction::ShiftState::Pressed);
+    }
+    QMenu::keyPressEvent(ev);

 }
 
 }
 

-void DolphinContextMenu::slotRemoveActionTriggered()
+void DolphinContextMenu::keyReleaseEvent(QKeyEvent *ev)

 {
 {

-    const KActionCollection* collection = m_mainWindow->actionCollection();
-    if (m_shiftPressed) {
-        collection->action("delete")->trigger();
-    } else {
-        collection->action("move_to_trash")->trigger();
+    if (m_removeAction && ev->key() == Qt::Key_Shift) {
+        m_removeAction->update(DolphinRemoveAction::ShiftState::Released);

     }
     }

+    QMenu::keyReleaseEvent(ev);

 }
 
 void DolphinContextMenu::openTrashContextMenu()
 {
     Q_ASSERT(m_context & TrashContext);
 
 }
 
 void DolphinContextMenu::openTrashContextMenu()
 {
     Q_ASSERT(m_context & TrashContext);
 

-    addShowMenubarAction();
+    QAction* emptyTrashAction = new QAction(QIcon::fromTheme(QStringLiteral("trash-empty")), i18nc("@action:inmenu", "Empty Trash"), this);
+    emptyTrashAction->setEnabled(!Trash::isEmpty());
+    addAction(emptyTrashAction);

 
 

-    QAction* emptyTrashAction = new QAction(KIcon("trash-empty"), i18nc("@action:inmenu", "Empty Trash"), m_popup.data());
-    KConfig trashConfig("trashrc", KConfig::SimpleConfig);
-    emptyTrashAction->setEnabled(!trashConfig.group("Status").readEntry("Empty", true));
-    m_popup->addAction(emptyTrashAction);
+    addCustomActions();

 
 

-    QAction* addToPlacesAction = m_popup->addAction(KIcon("bookmark-new"),
-                                                  i18nc("@action:inmenu Add current folder to places", "Add to Places"));
+    QAction* propertiesAction = m_mainWindow->actionCollection()->action(QStringLiteral("properties"));
+    addAction(propertiesAction);

 
 

-    // Don't show if url is already in places
-    if (placeExists(m_mainWindow->activeViewContainer()->url())) {
-        addToPlacesAction->setVisible(false);
-    }
+    addShowMenuBarAction();

 
 

-    addCustomActions();
-
-    QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties");
-    m_popup->addAction(propertiesAction);
-
-    QAction *action = m_popup->exec(QCursor::pos());
-    if (action == emptyTrashAction) {
-        const QString text(i18nc("@info", "Do you really want to empty the Trash? All items will be deleted."));
-        const bool del = KMessageBox::warningContinueCancel(m_mainWindow,
-                                                            text,
-                                                            QString(),
-                                                            KGuiItem(i18nc("@action:button", "Empty Trash"),
-                                                                     KIcon("user-trash"))
-                                                           ) == KMessageBox::Continue;
-        if (del) {
-            KonqOperations::emptyTrash(m_mainWindow);
-        }
-    } else if (action == addToPlacesAction) {
-        const KUrl& url = m_mainWindow->activeViewContainer()->url();
-        if (url.isValid()) {
-            DolphinSettings::instance().placesModel()->addPlace(i18nc("@label", "Trash"), url);
-        }
+    if (exec(m_pos) == emptyTrashAction) {
+        Trash::empty(m_mainWindow);

     }
 }
 
     }
 }
 


@@ -199,19 +160,25 @@ void DolphinContextMenu::openTrashItemContextMenu()
     Q_ASSERT(m_context & TrashContext);
     Q_ASSERT(m_context & ItemContext);
 
     Q_ASSERT(m_context & TrashContext);
     Q_ASSERT(m_context & ItemContext);
 

-    addShowMenubarAction();
-

     QAction* restoreAction = new QAction(i18nc("@action:inmenu", "Restore"), m_mainWindow);
     QAction* restoreAction = new QAction(i18nc("@action:inmenu", "Restore"), m_mainWindow);

-    m_popup->addAction(restoreAction);
+    addAction(restoreAction);

 
 

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

 
 

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

 
 

-    if (m_popup->exec(QCursor::pos()) == restoreAction) {
-        KonqOperations::restoreTrashedItems(m_selectedUrls, m_mainWindow);
+    if (exec(m_pos) == restoreAction) {
+        QList<QUrl> selectedUrls;
+        selectedUrls.reserve(m_selectedItems.count());
+        foreach (const KFileItem &item, m_selectedItems) {
+            selectedUrls.append(item.url());
+        }
+
+        KIO::RestoreJob *job = KIO::restoreFromTrash(selectedUrls);
+        KJobWidgets::setWindow(job, m_mainWindow);
+        job->uiDelegate()->setAutoErrorHandlingEnabled(true);

     }
 }
 
     }
 }
 


@@ -219,192 +186,289 @@ void DolphinContextMenu::openItemContextMenu()
 {
     Q_ASSERT(!m_fileInfo.isNull());
 
 {
     Q_ASSERT(!m_fileInfo.isNull());
 

-    if (m_fileInfo.isDir() && (m_selectedUrls.count() == 1)) {
-        // setup 'Create New' menu
-        DolphinNewFileMenu* newFileMenu = new DolphinNewFileMenu(m_popup.data(), m_mainWindow);
-        const DolphinView* view = m_mainWindow->activeViewContainer()->view();
-        newFileMenu->setViewShowsHiddenFiles(view->showHiddenFiles());
-        newFileMenu->checkUpToDate();
-        newFileMenu->setPopupFiles(m_fileInfo.url());
-        newFileMenu->setEnabled(capabilities().supportsWriting());
-
-        KMenu* menu = newFileMenu->menu();
-        menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New"));
-        menu->setIcon(KIcon("document-new"));
-        m_popup->addMenu(menu);
-        m_popup->addSeparator();
-
-        // insert 'Open in new window' and 'Open in new tab' entries
-        m_popup->addAction(m_mainWindow->actionCollection()->action("open_in_new_window"));
-        m_popup->addAction(m_mainWindow->actionCollection()->action("open_in_new_tab"));
-        m_popup->addSeparator();
+    QAction* openParentAction = nullptr;
+    QAction* openParentInNewWindowAction = nullptr;
+    QAction* openParentInNewTabAction = nullptr;
+    QAction* addToPlacesAction = nullptr;
+    const KFileItemListProperties& selectedItemsProps = selectedItemsProperties();
+
+    KFileItemActions fileItemActions;
+    fileItemActions.setParentWidget(m_mainWindow);
+    fileItemActions.setItemListProperties(selectedItemsProps);
+
+    if (m_selectedItems.count() == 1) {
+        if (m_fileInfo.isDir()) {
+            // insert 'Open in new window' and 'Open in new tab' entries
+            addAction(m_mainWindow->actionCollection()->action(QStringLiteral("open_in_new_window")));
+            addAction(m_mainWindow->actionCollection()->action(QStringLiteral("open_in_new_tab")));
+
+            // Insert 'Open With' entries
+            addOpenWithActions(fileItemActions);
+
+            // insert 'Add to Places' entry
+            if (!placeExists(m_fileInfo.url())) {
+                addToPlacesAction = addAction(QIcon::fromTheme(QStringLiteral("bookmark-new")),
+                                                       i18nc("@action:inmenu Add selected folder to places",
+                                                             "Add to Places"));
+            }
+
+            addSeparator();
+
+            // 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());
+            newFileMenu->checkUpToDate();
+            newFileMenu->setPopupFiles(m_fileInfo.url());
+            newFileMenu->setEnabled(selectedItemsProps.supportsWriting());
+            connect(newFileMenu, &DolphinNewFileMenu::fileCreated, newFileMenu, &DolphinNewFileMenu::deleteLater);
+            connect(newFileMenu, &DolphinNewFileMenu::directoryCreated, newFileMenu, &DolphinNewFileMenu::deleteLater);
+
+            QMenu* menu = newFileMenu->menu();
+            menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New"));
+            menu->setIcon(QIcon::fromTheme(QStringLiteral("document-new")));
+            addMenu(menu);
+
+            addSeparator();
+        } else if (m_baseUrl.scheme().contains(QStringLiteral("search")) || m_baseUrl.scheme().contains(QStringLiteral("timeline"))) {
+            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);
+
+            addSeparator();
+        } else if (!DolphinView::openItemAsFolderUrl(m_fileInfo).isEmpty()) {
+            // Insert 'Open With" entries
+            addOpenWithActions(fileItemActions);
+
+            // insert 'Open in new window' and 'Open in new tab' entries
+            addAction(m_mainWindow->actionCollection()->action(QStringLiteral("open_in_new_window")));
+            addAction(m_mainWindow->actionCollection()->action(QStringLiteral("open_in_new_tab")));
+
+            addSeparator();
+        } else {
+            // Insert 'Open With" entries
+            addOpenWithActions(fileItemActions);
+        }
+        if (m_fileInfo.isLink()) {
+            addAction(m_mainWindow->actionCollection()->action(QStringLiteral("show_target")));
+            addSeparator();
+        }
+    } else {
+        bool selectionHasOnlyDirs = true;
+        foreach (const KFileItem& item, m_selectedItems) {
+            const QUrl& url = DolphinView::openItemAsFolderUrl(item);
+            if (url.isEmpty()) {
+                selectionHasOnlyDirs = false;
+                break;
+            }
+        }
+
+        if (selectionHasOnlyDirs) {
+            // insert 'Open in new tab' entry
+            addAction(m_mainWindow->actionCollection()->action(QStringLiteral("open_in_new_tabs")));
+        }
+        // Insert 'Open With" entries
+        addOpenWithActions(fileItemActions);

     }
     }

-    addShowMenubarAction();
-    insertDefaultItemActions();

 
 

-    m_popup->addSeparator();
+    insertDefaultItemActions(selectedItemsProps);

 
 

-    KFileItemActions fileItemActions;
-    fileItemActions.setItemListProperties(capabilities());
-    addServiceActions(fileItemActions);
+    addSeparator();

 
 

-    addVersionControlActions();
+    fileItemActions.addServiceActionsTo(this);
+    fileItemActions.addPluginActionsTo(this);

 
 

-    // insert 'Copy To' and 'Move To' sub menus
-    if (DolphinSettings::instance().generalSettings()->showCopyMoveMenu()) {
-        m_copyToMenu.setItems(m_selectedItems);
-        m_copyToMenu.setReadOnly(!capabilities().supportsWriting());
-        m_copyToMenu.addActionsTo(m_popup.data());
-        m_popup->addSeparator();
-    }
+    addVersionControlPluginActions();

 
 

-    // insert 'Add to Places' entry if exactly one item is selected
-    QAction* addToPlacesAction = 0;
-    if (m_fileInfo.isDir() && (m_selectedUrls.count() == 1) && !placeExists(m_fileInfo.url())) {
-        addToPlacesAction = m_popup->addAction(KIcon("bookmark-new"),
-                                             i18nc("@action:inmenu Add selected folder to places", "Add to Places"));
+    // insert 'Copy To' and 'Move To' sub menus
+    if (GeneralSettings::showCopyMoveMenu()) {
+        m_copyToMenu.setUrls(m_selectedItems.urlList());
+        m_copyToMenu.setReadOnly(!selectedItemsProps.supportsWriting());
+        m_copyToMenu.setAutoErrorHandlingEnabled(true);
+        m_copyToMenu.addActionsTo(this);

     }
 
     // insert 'Properties...' entry
     }
 
     // insert 'Properties...' entry

-    QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties");
-    m_popup->addAction(propertiesAction);
-
-    QAction* activatedAction = m_popup->exec(QCursor::pos());
-
-    if ((addToPlacesAction != 0) && (activatedAction == addToPlacesAction)) {
-        const KUrl selectedUrl(m_fileInfo.url());
-        if (selectedUrl.isValid()) {
-            DolphinSettings::instance().placesModel()->addPlace(placesName(selectedUrl),
-                                                                selectedUrl);
+    QAction* propertiesAction = m_mainWindow->actionCollection()->action(QStringLiteral("properties"));
+    addAction(propertiesAction);
+
+    QAction* activatedAction = exec(m_pos);
+    if (activatedAction) {
+        if (activatedAction == addToPlacesAction) {
+            const QUrl selectedUrl(m_fileInfo.url());
+            if (selectedUrl.isValid()) {
+                PlacesItemModel model;
+                const QString text = selectedUrl.fileName();
+                model.createPlacesItem(text, selectedUrl, KIO::iconNameForUrl(selectedUrl));
+            }
+        } else if (activatedAction == openParentAction) {
+            m_command = OpenParentFolder;
+        } else if (activatedAction == openParentInNewWindowAction) {
+            m_command = OpenParentFolderInNewWindow;
+        } else if (activatedAction == openParentInNewTabAction) {
+            m_command = OpenParentFolderInNewTab;

         }
     }
 }
 
 void DolphinContextMenu::openViewportContextMenu()
 {
         }
     }
 }
 
 void DolphinContextMenu::openViewportContextMenu()
 {

-    addShowMenubarAction();
-

     // setup 'Create New' menu
     KNewFileMenu* newFileMenu = m_mainWindow->newFileMenu();
     const DolphinView* view = m_mainWindow->activeViewContainer()->view();
     // setup 'Create New' menu
     KNewFileMenu* newFileMenu = m_mainWindow->newFileMenu();
     const DolphinView* view = m_mainWindow->activeViewContainer()->view();

-    newFileMenu->setViewShowsHiddenFiles(view->showHiddenFiles());
+    newFileMenu->setViewShowsHiddenFiles(view->hiddenFilesShown());

     newFileMenu->checkUpToDate();
     newFileMenu->setPopupFiles(m_baseUrl);
     newFileMenu->checkUpToDate();
     newFileMenu->setPopupFiles(m_baseUrl);

-    m_popup->addMenu(newFileMenu->menu());
-    m_popup->addSeparator();
-
-    // insert 'Open in new window' and 'Open in new tab' entries
-    m_popup->addAction(m_mainWindow->actionCollection()->action("open_in_new_window"));
-    m_popup->addAction(m_mainWindow->actionCollection()->action("open_in_new_tab"));
-    m_popup->addSeparator();
-
-    QAction* pasteAction = createPasteAction();
-    m_popup->addAction(pasteAction);
-    m_popup->addSeparator();
+    addMenu(newFileMenu->menu());
+    addSeparator();

 
 

-    // insert service actions
-    const KFileItem item(KFileItem::Unknown, KFileItem::Unknown, m_baseUrl);
-    const KFileItemListProperties baseUrlProperties(KFileItemList() << item);
+    // Insert 'Open With' entries
+    const KFileItemListProperties baseUrlProperties(KFileItemList() << baseFileItem());

     KFileItemActions fileItemActions;
     KFileItemActions fileItemActions;

+    fileItemActions.setParentWidget(m_mainWindow);

     fileItemActions.setItemListProperties(baseUrlProperties);
     fileItemActions.setItemListProperties(baseUrlProperties);

-    addServiceActions(fileItemActions);
+    addOpenWithActions(fileItemActions);

 
 

-    addVersionControlActions();
+    // Insert 'New Window' and 'New Tab' entries. Don't use "open_in_new_window" and
+    // "open_in_new_tab" here, as the current selection should get ignored.
+    addAction(m_mainWindow->actionCollection()->action(QStringLiteral("file_new")));
+    addAction(m_mainWindow->actionCollection()->action(QStringLiteral("new_tab")));

 
 

-    // insert 'Add to Places' entry if exactly one item is selected
-    QAction* addToPlacesAction = 0;
+    // Insert 'Add to Places' entry if exactly one item is selected
+    QAction* addToPlacesAction = nullptr;

     if (!placeExists(m_mainWindow->activeViewContainer()->url())) {
     if (!placeExists(m_mainWindow->activeViewContainer()->url())) {

-        addToPlacesAction = m_popup->addAction(KIcon("bookmark-new"),
+        addToPlacesAction = addAction(QIcon::fromTheme(QStringLiteral("bookmark-new")),

                                              i18nc("@action:inmenu Add current folder to places", "Add to Places"));
     }
 
                                              i18nc("@action:inmenu Add current folder to places", "Add to Places"));
     }
 

+    addSeparator();
+
+    QAction* pasteAction = createPasteAction();
+    addAction(pasteAction);
+    addSeparator();
+
+    // Insert 'Sort By' and 'View Mode'
+    addAction(m_mainWindow->actionCollection()->action(QStringLiteral("sort")));
+    addAction(m_mainWindow->actionCollection()->action(QStringLiteral("view_mode")));
+
+    addSeparator();
+
+    // Insert service actions
+    fileItemActions.addServiceActionsTo(this);
+    fileItemActions.addPluginActionsTo(this);
+
+    addVersionControlPluginActions();
+

     addCustomActions();
 
     addCustomActions();
 

-    QAction* propertiesAction = m_popup->addAction(i18nc("@action:inmenu", "Properties"));
-    propertiesAction->setIcon(KIcon("document-properties"));
-    QAction* action = m_popup->exec(QCursor::pos());
-    if (action == propertiesAction) {
-        const KUrl& url = m_mainWindow->activeViewContainer()->url();
-
-        KPropertiesDialog* dialog = new KPropertiesDialog(url, m_mainWindow);
-        dialog->setAttribute(Qt::WA_DeleteOnClose);
-        dialog->show();
-    } else if ((addToPlacesAction != 0) && (action == addToPlacesAction)) {
-        const KUrl& url = m_mainWindow->activeViewContainer()->url();
+    QAction* propertiesAction = m_mainWindow->actionCollection()->action(QStringLiteral("properties"));
+    addAction(propertiesAction);
+
+    addShowMenuBarAction();
+
+    QAction* action = exec(m_pos);
+    if (addToPlacesAction && (action == addToPlacesAction)) {
+        const DolphinViewContainer* container =  m_mainWindow->activeViewContainer();
+        const QUrl url = container->url();

         if (url.isValid()) {
         if (url.isValid()) {

-            DolphinSettings::instance().placesModel()->addPlace(placesName(url), url);
+            PlacesItemModel model;
+            QString icon;
+            if (container->isSearchModeEnabled()) {
+                icon = QStringLiteral("folder-saved-search-symbolic");
+            } else {
+                icon = KIO::iconNameForUrl(url);
+            }
+            model.createPlacesItem(container->placesText(), url, icon);

         }
     }
 }
 
         }
     }
 }
 

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

 {
     const KActionCollection* collection = m_mainWindow->actionCollection();
 
     // Insert 'Cut', 'Copy' and 'Paste'
 {
     const KActionCollection* collection = m_mainWindow->actionCollection();
 
     // Insert 'Cut', 'Copy' and 'Paste'

-    m_popup->addAction(collection->action(KStandardAction::name(KStandardAction::Cut)));
-    m_popup->addAction(collection->action(KStandardAction::name(KStandardAction::Copy)));
-    m_popup->addAction(createPasteAction());
+    addAction(collection->action(KStandardAction::name(KStandardAction::Cut)));
+    addAction(collection->action(KStandardAction::name(KStandardAction::Copy)));
+    addAction(createPasteAction());

 
 

-    m_popup->addSeparator();
+    addSeparator();

 
     // Insert 'Rename'
 
     // Insert 'Rename'

-    QAction* renameAction = collection->action("rename");
-    m_popup->addAction(renameAction);
+    addAction(collection->action(KStandardAction::name(KStandardAction::RenameFile)));

 
     // Insert 'Move to Trash' and/or 'Delete'
 
     // Insert 'Move to Trash' and/or 'Delete'

-    if (KGlobal::config()->group("KDE").readEntry("ShowDeleteCommand", false)) {
-        m_popup->addAction(collection->action("move_to_trash"));
-        m_popup->addAction(collection->action("delete"));
-    } else {
-        m_popup->addAction(m_removeAction);
-        updateRemoveAction();
-    }
-}
-
-void DolphinContextMenu::addShowMenubarAction()
-{
-    KAction* showMenuBar = m_mainWindow->showMenuBarAction();
-    if (!m_mainWindow->menuBar()->isVisible()) {
-        m_popup->addAction(showMenuBar);
-        m_popup->addSeparator();
+    if (properties.supportsDeleting()) {
+        const bool showDeleteAction = (KSharedConfig::openConfig()->group("KDE").readEntry("ShowDeleteCommand", false) ||
+                                       !properties.isLocal());
+        const bool showMoveToTrashAction = (properties.isLocal() &&
+                                            properties.supportsMoving());
+
+        if (showDeleteAction && showMoveToTrashAction) {
+            delete m_removeAction;
+            m_removeAction = nullptr;
+            addAction(m_mainWindow->actionCollection()->action(KStandardAction::name(KStandardAction::MoveToTrash)));
+            addAction(m_mainWindow->actionCollection()->action(KStandardAction::name(KStandardAction::DeleteFile)));
+        } else if (showDeleteAction && !showMoveToTrashAction) {
+            addAction(m_mainWindow->actionCollection()->action(KStandardAction::name(KStandardAction::DeleteFile)));
+        } else {
+            if (!m_removeAction) {
+                m_removeAction = new DolphinRemoveAction(this, m_mainWindow->actionCollection());
+            }
+            addAction(m_removeAction);
+            m_removeAction->update();
+        }

     }
 }
 
     }
 }
 

-QString DolphinContextMenu::placesName(const KUrl& url) const
+void DolphinContextMenu::addShowMenuBarAction()

 {
 {

-    QString name = url.fileName();
-    if (name.isEmpty()) {
-        name = url.host();
+    const KActionCollection* ac = m_mainWindow->actionCollection();
+    QAction* showMenuBar = ac->action(KStandardAction::name(KStandardAction::ShowMenubar));
+    if (!m_mainWindow->menuBar()->isVisible() && !m_mainWindow->toolBar()->isVisible()) {
+        addSeparator();
+        addAction(showMenuBar);

     }
     }

-    return name;

 }
 
 }
 

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

 {
 {

-    const KFilePlacesModel* placesModel = DolphinSettings::instance().placesModel();
-    const int count = placesModel->rowCount();
-
-    for (int i = 0; i < count; ++i) {
-        const QModelIndex index = placesModel->index(i, 0);
-
-        if (url.equals(placesModel->url(index), KUrl::CompareWithoutTrailingSlash)) {
-            return true;
-        }
-    }
+    Q_UNUSED(url)
+    // Creating up a PlacesItemModel to find out if 'url' is one of the Places
+    // can be expensive because the model asks Solid for the devices which are
+    // available, which can take some time.
+    // TODO: Consider restoring this check if the handling of Places and devices
+    // will be decoupled in the future.

     return false;
 }
 
 QAction* DolphinContextMenu::createPasteAction()
 {
     return false;
 }
 
 QAction* DolphinContextMenu::createPasteAction()
 {

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

     const bool isDir = !m_fileInfo.isNull() && m_fileInfo.isDir();
     if (isDir && (m_selectedItems.count() == 1)) {
     const bool isDir = !m_fileInfo.isNull() && m_fileInfo.isDir();
     if (isDir && (m_selectedItems.count() == 1)) {

-        action = new QAction(KIcon("edit-paste"), i18nc("@action:inmenu", "Paste Into Folder"), this);
-        const QMimeData* mimeData = QApplication::clipboard()->mimeData();
-        const KUrl::List pasteData = KUrl::List::fromMimeData(mimeData);
-        action->setEnabled(!pasteData.isEmpty() && capabilities().supportsWriting());
-        connect(action, SIGNAL(triggered()), m_mainWindow, SLOT(pasteIntoFolder()));
+        const QMimeData *mimeData = QApplication::clipboard()->mimeData();
+        bool canPaste;
+        const QString text = KIO::pasteActionText(mimeData, &canPaste, m_fileInfo);
+        action = new QAction(QIcon::fromTheme(QStringLiteral("edit-paste")), text, this);
+        action->setEnabled(canPaste);
+        connect(action, &QAction::triggered, m_mainWindow, &DolphinMainWindow::pasteIntoFolder);

     } else {
         action = m_mainWindow->actionCollection()->action(KStandardAction::name(KStandardAction::Paste));
     }
     } else {
         action = m_mainWindow->actionCollection()->action(KStandardAction::name(KStandardAction::Paste));
     }


@@ -412,54 +476,40 @@ QAction* DolphinContextMenu::createPasteAction()
     return action;
 }
 
     return action;
 }
 

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

 {
 {

-    if (m_capabilities == 0) {
-        m_capabilities = new KFileItemListProperties(m_selectedItems);
+    if (!m_selectedItemsProperties) {
+        m_selectedItemsProperties = new KFileItemListProperties(m_selectedItems);

     }
     }

-    return *m_capabilities;
+    return *m_selectedItemsProperties;

 }
 
 }
 

-void DolphinContextMenu::addServiceActions(KFileItemActions& fileItemActions)
+KFileItem DolphinContextMenu::baseFileItem()

 {
 {

-    fileItemActions.setParentWidget(m_mainWindow);
+    if (!m_baseFileItem) {
+        m_baseFileItem = new KFileItem(m_baseUrl);
+    }
+    return *m_baseFileItem;
+}

 
 

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

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

-    fileItemActions.addOpenWithActionsTo(m_popup.data(), "DesktopEntryName != 'dolphin'");
-
-    // insert 'Actions' sub menu
-    if (fileItemActions.addServiceActionsTo(m_popup.data())) {
-        m_popup->addSeparator();
-    }
+    fileItemActions.addOpenWithActionsTo(this, QStringLiteral("DesktopEntryName != '%1'").arg(qApp->desktopFileName()));

 }
 
 }
 

-void DolphinContextMenu::addVersionControlActions()
+void DolphinContextMenu::addVersionControlPluginActions()

 {
     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()) {

-        foreach (QAction* action, versionControlActions) {
-            m_popup->addAction(action);
-        }
-        m_popup->addSeparator();
+        addActions(versionControlActions);
+        addSeparator();

     }
 }
 
 void DolphinContextMenu::addCustomActions()
 {
     }
 }
 
 void DolphinContextMenu::addCustomActions()
 {

-    foreach (QAction* action, m_customActions) {
-        m_popup->addAction(action);
-    }
-}
-
-void DolphinContextMenu::updateRemoveAction()
-{
-    const KActionCollection* collection = m_mainWindow->actionCollection();
-    const bool moveToTrash = capabilities().isLocal() && !m_shiftPressed;
-    const QAction* action = moveToTrash ? collection->action("move_to_trash") : collection->action("delete");
-    m_removeAction->setText(action->text());
-    m_removeAction->setIcon(action->icon());
-    m_removeAction->setShortcuts(action->shortcuts());
+    addActions(m_customActions);

 }
 
 }
 

-#include "dolphincontextmenu.moc"