Merge remote-tracking branch 'origin/KDE/4.10'

[dolphin.git] / src / dolphincontextmenu.cpp

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 9b49f7c89fa0bfadf1e0b4e9351cf1e10679b279..f66847334621f0d0deab3776ccb0c779ca3cabb9 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -21,59 +21,73 @@
 #include "dolphincontextmenu.h"
 
 #include "dolphinmainwindow.h"
 #include "dolphincontextmenu.h"
 
 #include "dolphinmainwindow.h"

-#include "dolphinnewmenu.h"
-#include "settings/dolphinsettings.h"
-#include "dolphinview.h"
+#include "dolphinnewfilemenu.h"

 #include "dolphinviewcontainer.h"
 #include "dolphin_generalsettings.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 <knewmenu.h>
+#include "dolphinremoveaction.h"
+
+#include <KActionCollection>
+#include <KDesktopFile>
+#include <kfileitemactionplugin.h>
+#include <kabstractfileitemactionplugin.h>
+#include <KFileItemActions>
+#include <KFileItemListProperties>
+#include <KGlobal>
+#include <KIconLoader>
+#include <KIO/NetAccess>
+#include <KMenu>
+#include <KMenuBar>
+#include <KMessageBox>
+#include <KMimeTypeTrader>
+#include <KNewFileMenu>

 #include <konqmimedata.h>
 #include <konq_operations.h>
 #include <konqmimedata.h>
 #include <konq_operations.h>

-#include <kfileitemactions.h>
-#include <klocale.h>
-#include <kpropertiesdialog.h>
-#include <krun.h>
-#include <kstandardaction.h>
-#include <kstandarddirs.h>
+#include <KService>
+#include <KLocale>
+#include <KPropertiesDialog>
+#include <KStandardAction>
+#include <KStandardDirs>
+#include <KToolBar>
+
+#include <panels/places/placesitem.h>
+#include <panels/places/placesitemmodel.h>
+
+#include <QApplication>
+#include <QClipboard>
+#include <QDir>

 
 

-#include <QtGui/QApplication>
-#include <QtGui/QClipboard>
-#include <QtCore/QDir>
+#include "views/dolphinview.h"
+#include "views/viewmodecontroller.h"

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

+                                       const QPoint& pos,

                                        const KFileItem& fileInfo,
                                        const KUrl& baseUrl) :
                                        const KFileItem& fileInfo,
                                        const KUrl& baseUrl) :

+    KMenu(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(0),
+    m_selectedItems(),
+    m_selectedItemsProperties(0),

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

-    m_customActions()
+    m_customActions(),
+    m_command(None)

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

+
+    m_removeAction = new DolphinRemoveAction(this, m_mainWindow->actionCollection());

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

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

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


@@ -81,10 +95,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.protocol() == QLatin1String("trash")) {

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


@@ -106,54 +120,45 @@ void DolphinContextMenu::open()
         Q_ASSERT(m_context == NoContext);
         openViewportContextMenu();
     }
         Q_ASSERT(m_context == NoContext);
         openViewportContextMenu();
     }

+
+    return m_command;

 }
 
 }
 

-void DolphinContextMenu::openTrashContextMenu()
+void DolphinContextMenu::keyPressEvent(QKeyEvent *ev)

 {
 {

-    Q_ASSERT(m_context & TrashContext);
+    if (ev->key() == Qt::Key_Shift) {
+        m_removeAction->update();
+    }
+    KMenu::keyPressEvent(ev);
+}

 
 

-    KMenu* popup = new KMenu(m_mainWindow);
+void DolphinContextMenu::keyReleaseEvent(QKeyEvent *ev)
+{
+    if (ev->key() == Qt::Key_Shift) {
+        m_removeAction->update();
+    }
+    KMenu::keyReleaseEvent(ev);
+}

 
 

-    addShowMenubarAction(popup);
+void DolphinContextMenu::openTrashContextMenu()
+{
+    Q_ASSERT(m_context & TrashContext);

 
 

-    QAction* emptyTrashAction = new QAction(KIcon("trash-empty"), i18nc("@action:inmenu", "Empty Trash"), popup);
+    QAction* emptyTrashAction = new QAction(KIcon("trash-empty"), i18nc("@action:inmenu", "Empty Trash"), this);

     KConfig trashConfig("trashrc", KConfig::SimpleConfig);
     emptyTrashAction->setEnabled(!trashConfig.group("Status").readEntry("Empty", true));
     KConfig trashConfig("trashrc", KConfig::SimpleConfig);
     emptyTrashAction->setEnabled(!trashConfig.group("Status").readEntry("Empty", true));

-    popup->addAction(emptyTrashAction);
+    addAction(emptyTrashAction);

 
 

-    QAction* addToPlacesAction = popup->addAction(KIcon("bookmark-new"),
-                                                  i18nc("@action:inmenu Add current folder to places", "Add to Places"));
+    addCustomActions();

 
 

-    // Don't show if url is already in places
-    if (placeExists(m_mainWindow->activeViewContainer()->url())) {
-        addToPlacesAction->setVisible(false);
-    }
+    QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties");
+    addAction(propertiesAction);

 
 

-    addCustomActions(popup);
+    addShowMenuBarAction();

 
 

-    QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties");
-    popup->addAction(propertiesAction);
-
-    QAction *action = 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) {
+        KonqOperations::emptyTrash(m_mainWindow);

     }
     }

-
-    popup->deleteLater();

 }
 
 void DolphinContextMenu::openTrashItemContextMenu()
 }
 
 void DolphinContextMenu::openTrashItemContextMenu()


@@ -161,240 +166,246 @@ void DolphinContextMenu::openTrashItemContextMenu()
     Q_ASSERT(m_context & TrashContext);
     Q_ASSERT(m_context & ItemContext);
 
     Q_ASSERT(m_context & TrashContext);
     Q_ASSERT(m_context & ItemContext);
 

-    KMenu* popup = new KMenu(m_mainWindow);
-
-    addShowMenubarAction(popup);
-

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

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

 
     QAction* deleteAction = m_mainWindow->actionCollection()->action("delete");
 
     QAction* deleteAction = m_mainWindow->actionCollection()->action("delete");

-    popup->addAction(deleteAction);
+    addAction(deleteAction);

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

-    popup->addAction(propertiesAction);
+    addAction(propertiesAction);

 
 

-    if (popup->exec(QCursor::pos()) == restoreAction) {
-        KonqOperations::restoreTrashedItems(m_selectedUrls, m_mainWindow);
-    }
+    if (exec(m_pos) == restoreAction) {
+        KUrl::List selectedUrls;
+        foreach (const KFileItem &item, m_selectedItems) {
+            selectedUrls.append(item.url());
+        }

 
 

-    popup->deleteLater();
+        KonqOperations::restoreTrashedItems(selectedUrls, m_mainWindow);
+    }

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

-    KMenu* popup = new KMenu(m_mainWindow);
-    if (m_fileInfo.isDir() && (m_selectedUrls.count() == 1)) {
-        // setup 'Create New' menu
-        DolphinNewMenu* newMenu = new DolphinNewMenu(popup, m_mainWindow);
-        const DolphinView* view = m_mainWindow->activeViewContainer()->view();
-        newMenu->setViewShowsHiddenFiles(view->showHiddenFiles());
-        newMenu->checkUpToDate();
-        newMenu->setPopupFiles(m_fileInfo.url());
-        newMenu->setEnabled(capabilities().supportsWriting());
-
-        KMenu* menu = newMenu->menu();
-        menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New"));
-        menu->setIcon(KIcon("document-new"));
-        popup->addMenu(newMenu->menu());
-        popup->addSeparator();
-
-        // insert 'Open in new window' and 'Open in new tab' entries
-        popup->addAction(m_mainWindow->actionCollection()->action("open_in_new_window"));
-        popup->addAction(m_mainWindow->actionCollection()->action("open_in_new_tab"));
-        popup->addSeparator();
-    }
-    addShowMenubarAction(popup);
-    insertDefaultItemActions(popup);
-
-    popup->addSeparator();
-
-    // insert 'Bookmark This Folder' entry if exactly one item is selected
+    QAction* openParentInNewWindowAction = 0;
+    QAction* openParentInNewTabAction = 0;

     QAction* addToPlacesAction = 0;
     QAction* addToPlacesAction = 0;

-    if (m_fileInfo.isDir() && (m_selectedUrls.count() == 1)) {
-        addToPlacesAction = popup->addAction(KIcon("bookmark-new"),
-                                             i18nc("@action:inmenu Add selected folder to places", "Add to Places"));
-        // Don't show if url is already in places
-        if (placeExists(m_fileInfo.url())) {
-            addToPlacesAction->setVisible(false);
+    if (m_selectedItems.count() == 1) {
+        if (m_fileInfo.isDir()) {
+            // setup 'Create New' menu
+            DolphinNewFileMenu* newFileMenu = new DolphinNewFileMenu(m_mainWindow);
+            const DolphinView* view = m_mainWindow->activeViewContainer()->view();
+            newFileMenu->setViewShowsHiddenFiles(view->hiddenFilesShown());
+            newFileMenu->checkUpToDate();
+            newFileMenu->setPopupFiles(m_fileInfo.url());
+            newFileMenu->setEnabled(selectedItemsProperties().supportsWriting());
+            connect(newFileMenu, SIGNAL(fileCreated(KUrl)), newFileMenu, SLOT(deleteLater()));
+            connect(newFileMenu, SIGNAL(directoryCreated(KUrl)), newFileMenu, SLOT(deleteLater()));
+
+            KMenu* menu = newFileMenu->menu();
+            menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New"));
+            menu->setIcon(KIcon("document-new"));
+            addMenu(menu);
+            addSeparator();
+
+            // insert 'Open in new window' and 'Open in new tab' entries
+            addAction(m_mainWindow->actionCollection()->action("open_in_new_window"));
+            addAction(m_mainWindow->actionCollection()->action("open_in_new_tab"));
+
+            // insert 'Add to Places' entry
+            if (!placeExists(m_fileInfo.url())) {
+                addToPlacesAction = addAction(KIcon("bookmark-new"),
+                                                       i18nc("@action:inmenu Add selected folder to places",
+                                                             "Add to Places"));
+            }
+
+            addSeparator();
+        } else if (m_baseUrl.protocol().contains("search")) {
+            openParentInNewWindowAction = new QAction(KIcon("window-new"),
+                                                    i18nc("@action:inmenu",
+                                                          "Open Path in New Window"),
+                                                    this);
+            addAction(openParentInNewWindowAction);
+
+            openParentInNewTabAction = new QAction(KIcon("tab-new"),
+                                                   i18nc("@action:inmenu",
+                                                         "Open Path in New Tab"),
+                                                   this);
+            addAction(openParentInNewTabAction);
+
+            addSeparator();
+        } else if (!DolphinView::openItemAsFolderUrl(m_fileInfo).isEmpty()) {
+            // insert 'Open in new window' and 'Open in new tab' entries
+            addAction(m_mainWindow->actionCollection()->action("open_in_new_window"));
+            addAction(m_mainWindow->actionCollection()->action("open_in_new_tab"));
+
+            addSeparator();
+        }
+    } else {
+        bool selectionHasOnlyDirs = true;
+        foreach (const KFileItem& item, m_selectedItems) {
+            const KUrl& url = DolphinView::openItemAsFolderUrl(item);
+            if (url.isEmpty()) {
+                selectionHasOnlyDirs = false;
+                break;
+            }
+        }
+
+        if (selectionHasOnlyDirs) {
+            // insert 'Open in new tab' entry
+            addAction(m_mainWindow->actionCollection()->action("open_in_new_tabs"));
+            addSeparator();

         }
     }
 
         }
     }
 

-    KFileItemActions menuActions;
-    menuActions.setParentWidget(m_mainWindow);
-    menuActions.setItemListProperties(m_selectedItems);
+    insertDefaultItemActions();

 
 

-    // insert 'Open With...' action or sub menu
-    menuActions.addOpenWithActionsTo(popup, "DesktopEntryName != 'dolphin'");
+    addSeparator();

 
 

-    // insert 'Actions' sub menu
-    if (menuActions.addServiceActionsTo(popup)) {
-        popup->addSeparator();
-    }
+    KFileItemActions fileItemActions;
+    fileItemActions.setItemListProperties(selectedItemsProperties());
+    addServiceActions(fileItemActions);
+
+    addFileItemPluginActions();

 
 

-    // insert version control actions
-    addVersionControlActions(popup);
+    addVersionControlPluginActions();

 
     // insert 'Copy To' and 'Move To' sub menus
 
     // insert 'Copy To' and 'Move To' sub menus

-    if (DolphinSettings::instance().generalSettings()->showCopyMoveMenu()) {
+    if (GeneralSettings::showCopyMoveMenu()) {

         m_copyToMenu.setItems(m_selectedItems);
         m_copyToMenu.setItems(m_selectedItems);

-        m_copyToMenu.setReadOnly(!capabilities().supportsWriting());
-        m_copyToMenu.addActionsTo(popup);
-        popup->addSeparator();
+        m_copyToMenu.setReadOnly(!selectedItemsProperties().supportsWriting());
+        m_copyToMenu.addActionsTo(this);

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

-    popup->addAction(propertiesAction);
-
-    QAction* activatedAction = 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);
+    addAction(propertiesAction);
+
+    QAction* activatedAction = exec(m_pos);
+    if (activatedAction) {
+        if (activatedAction == addToPlacesAction) {
+            const KUrl selectedUrl(m_fileInfo.url());
+            if (selectedUrl.isValid()) {
+                PlacesItemModel model;
+                const QString text = selectedUrl.fileName();
+                PlacesItem* item = model.createPlacesItem(text, selectedUrl);
+                model.appendItemToGroup(item);
+            }
+        } else if (activatedAction == openParentInNewWindowAction) {
+            m_command = OpenParentFolderInNewWindow;
+        } else if (activatedAction == openParentInNewTabAction) {
+            m_command = OpenParentFolderInNewTab;

         }
     }
         }
     }

-
-    popup->deleteLater();

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

-    KMenu* popup = new KMenu(m_mainWindow);
-
-    addShowMenubarAction(popup);
-

     // setup 'Create New' menu
     // setup 'Create New' menu

-    KNewFileMenu* newMenu = m_mainWindow->newMenu();
+    KNewFileMenu* newFileMenu = m_mainWindow->newFileMenu();

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

-    newMenu->setViewShowsHiddenFiles(view->showHiddenFiles());
-    newMenu->checkUpToDate();
-    newMenu->setPopupFiles(m_baseUrl);
-    popup->addMenu(newMenu->menu());
-    popup->addSeparator();
-
-    QAction* pasteAction = createPasteAction();
-    popup->addAction(pasteAction);
-
-    // setup 'View Mode' menu
-    KMenu* viewModeMenu = new KMenu(i18nc("@title:menu", "View Mode"), popup);
-
-    QAction* iconsMode = m_mainWindow->actionCollection()->action("icons");
-    viewModeMenu->addAction(iconsMode);
-
-    QAction* detailsMode = m_mainWindow->actionCollection()->action("details");
-    viewModeMenu->addAction(detailsMode);
+    newFileMenu->setViewShowsHiddenFiles(view->hiddenFilesShown());
+    newFileMenu->checkUpToDate();
+    newFileMenu->setPopupFiles(m_baseUrl);
+    addMenu(newFileMenu->menu());
+    addSeparator();
+
+    // 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("new_window"));
+    addAction(m_mainWindow->actionCollection()->action("new_tab"));
+
+    // Insert 'Add to Places' entry if exactly one item is selected
+    QAction* addToPlacesAction = 0;
+    if (!placeExists(m_mainWindow->activeViewContainer()->url())) {
+        addToPlacesAction = addAction(KIcon("bookmark-new"),
+                                             i18nc("@action:inmenu Add current folder to places", "Add to Places"));
+    }

 
 

-    QAction* columnsMode = m_mainWindow->actionCollection()->action("columns");
-    viewModeMenu->addAction(columnsMode);
+    addSeparator();

 
 

-    popup->addMenu(viewModeMenu);
+    QAction* pasteAction = createPasteAction();
+    addAction(pasteAction);
+    addSeparator();

 
 

-    popup->addSeparator();
+    // Insert service actions
+    const KFileItemListProperties baseUrlProperties(KFileItemList() << baseFileItem());
+    KFileItemActions fileItemActions;
+    fileItemActions.setItemListProperties(baseUrlProperties);
+    addServiceActions(fileItemActions);

 
 

-    addVersionControlActions(popup);
+    addFileItemPluginActions();

 
 

-    QAction* addToPlacesAction = popup->addAction(KIcon("bookmark-new"),
-                                                  i18nc("@action:inmenu Add current folder to places", "Add to Places"));
+    addVersionControlPluginActions();

 
 

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

 
 

-    addCustomActions(popup);
-
-    QAction* propertiesAction = popup->addAction(i18nc("@action:inmenu", "Properties"));
-    propertiesAction->setIcon(KIcon("document-properties"));
-    QAction* action = 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 (action == addToPlacesAction) {
-        const KUrl& url = m_mainWindow->activeViewContainer()->url();
-        if (url.isValid()) {
-            DolphinSettings::instance().placesModel()->addPlace(placesName(url), url);
+    QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties");
+    addAction(propertiesAction);
+
+    addShowMenuBarAction();
+
+    QAction* action = exec(m_pos);
+    if (addToPlacesAction && (action == addToPlacesAction)) {
+        const DolphinViewContainer* container =  m_mainWindow->activeViewContainer();
+        if (container->url().isValid()) {
+            PlacesItemModel model;
+            PlacesItem* item = model.createPlacesItem(container->placesText(),
+                                                      container->url());
+            model.appendItemToGroup(item);

         }
     }
         }
     }

-
-    popup->deleteLater();

 }
 
 }
 

-void DolphinContextMenu::insertDefaultItemActions(KMenu* popup)
+void DolphinContextMenu::insertDefaultItemActions()

 {
 {

-    Q_ASSERT(popup != 0);

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

-    // insert 'Cut', 'Copy' and 'Paste'
-    QAction* cutAction = collection->action(KStandardAction::name(KStandardAction::Cut));
-    QAction* copyAction  = collection->action(KStandardAction::name(KStandardAction::Copy));
-    QAction* pasteAction = createPasteAction();
+    // Insert 'Cut', 'Copy' and 'Paste'
+    addAction(collection->action(KStandardAction::name(KStandardAction::Cut)));
+    addAction(collection->action(KStandardAction::name(KStandardAction::Copy)));
+    addAction(createPasteAction());

 
 

-    popup->addAction(cutAction);
-    popup->addAction(copyAction);
-    popup->addAction(pasteAction);
-    popup->addSeparator();
+    addSeparator();

 
 

-    // insert 'Rename'
+    // Insert 'Rename'

     QAction* renameAction = collection->action("rename");
     QAction* renameAction = collection->action("rename");

-    popup->addAction(renameAction);
+    addAction(renameAction);

 
 

-    // insert 'Move to Trash' and (optionally) 'Delete'
-    KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::IncludeGlobals);
-    KConfigGroup configGroup(globalConfig, "KDE");
-    bool showDeleteCommand = configGroup.readEntry("ShowDeleteCommand", false);
-
-    const KUrl& url = m_mainWindow->activeViewContainer()->url();
-    if (url.isLocalFile()) {
-        QAction* moveToTrashAction = collection->action("move_to_trash");
-        popup->addAction(moveToTrashAction);
+    // Insert 'Move to Trash' and/or 'Delete'
+    if (KGlobal::config()->group("KDE").readEntry("ShowDeleteCommand", false)) {
+        addAction(collection->action("move_to_trash"));
+        addAction(collection->action("delete"));

     } else {
     } else {

-        showDeleteCommand = true;
-    }
-
-    if (showDeleteCommand) {
-        QAction* deleteAction = collection->action("delete");
-        popup->addAction(deleteAction);
-    }
-}
-
-void DolphinContextMenu::addShowMenubarAction(KMenu* menu)
-{
-    KAction* showMenuBar = m_mainWindow->showMenuBarAction();
-    if (!m_mainWindow->menuBar()->isVisible()) {
-        menu->addAction(showMenuBar);
-        menu->addSeparator();
+        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 KUrl& url) const
 {

-    const KFilePlacesModel* placesModel = DolphinSettings::instance().placesModel();
-    const int count = placesModel->rowCount();
+    PlacesItemModel model;

 
 

+    const int count = model.count();

     for (int i = 0; i < count; ++i) {
     for (int i = 0; i < count; ++i) {

-        const QModelIndex index = placesModel->index(i, 0);
-
-        if (url.equals(placesModel->url(index), KUrl::CompareWithoutTrailingSlash)) {
+        const KUrl placeUrl = model.placesItem(i)->url();
+        if (placeUrl.equals(url, KUrl::CompareWithoutTrailingSlash)) {

             return true;
         }
     }
             return true;
         }
     }

+

     return false;
 }
 
     return false;
 }
 


@@ -406,7 +417,7 @@ QAction* DolphinContextMenu::createPasteAction()
         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 = 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());
+        action->setEnabled(!pasteData.isEmpty() && selectedItemsProperties().supportsWriting());

         connect(action, SIGNAL(triggered()), m_mainWindow, SLOT(pasteIntoFolder()));
     } else {
         action = m_mainWindow->actionCollection()->action(KStandardAction::name(KStandardAction::Paste));
         connect(action, SIGNAL(triggered()), m_mainWindow, SLOT(pasteIntoFolder()));
     } else {
         action = m_mainWindow->actionCollection()->action(KStandardAction::name(KStandardAction::Paste));


@@ -415,30 +426,97 @@ QAction* DolphinContextMenu::createPasteAction()
     return action;
 }
 
     return action;
 }
 

-KFileItemListProperties& DolphinContextMenu::capabilities()
+KFileItemListProperties& DolphinContextMenu::selectedItemsProperties() const
+{
+    if (!m_selectedItemsProperties) {
+        m_selectedItemsProperties = new KFileItemListProperties(m_selectedItems);
+    }
+    return *m_selectedItemsProperties;
+}
+
+KFileItem DolphinContextMenu::baseFileItem()

 {
 {

-    if (m_capabilities == 0) {
-        m_capabilities = new KFileItemListProperties(m_selectedItems);
+    if (!m_baseFileItem) {
+        m_baseFileItem = new KFileItem(KFileItem::Unknown, KFileItem::Unknown, m_baseUrl);
+    }
+    return *m_baseFileItem;
+}
+
+void DolphinContextMenu::addServiceActions(KFileItemActions& fileItemActions)
+{
+    fileItemActions.setParentWidget(m_mainWindow);
+
+    // insert 'Open With...' action or sub menu
+    fileItemActions.addOpenWithActionsTo(this, "DesktopEntryName != 'dolphin'");
+
+    // insert 'Actions' sub menu
+    fileItemActions.addServiceActionsTo(this);
+}
+
+void DolphinContextMenu::addFileItemPluginActions()
+{
+    KFileItemListProperties props;
+    if (m_selectedItems.isEmpty()) {
+        props.setItems(KFileItemList() << baseFileItem());
+    } else {
+        props = selectedItemsProperties();
+    }
+
+    QString commonMimeType = props.mimeType();
+    if (commonMimeType.isEmpty()) {
+        commonMimeType = QLatin1String("application/octet-stream");
+    }
+
+    const KService::List pluginServices = KMimeTypeTrader::self()->query(commonMimeType, "KFileItemAction/Plugin", "exist Library");
+    if (pluginServices.isEmpty()) {
+        return;
+    }
+
+    const KConfig config("kservicemenurc", KConfig::NoGlobals);
+    const KConfigGroup showGroup = config.group("Show");
+
+    foreach (const KSharedPtr<KService>& service, pluginServices) {
+        // Old API (kdelibs-4.6.0 only)
+        KFileItemActionPlugin* plugin = service->createInstance<KFileItemActionPlugin>();
+        if (plugin) {
+            if (!showGroup.readEntry(service->desktopEntryName(), true)) {
+                // The plugin has been disabled
+                continue;
+            }
+
+            plugin->setParent(this);
+            addActions(plugin->actions(props, m_mainWindow));
+        }
+        // New API (kdelibs >= 4.6.1)
+        KAbstractFileItemActionPlugin* abstractPlugin = service->createInstance<KAbstractFileItemActionPlugin>();
+        if (abstractPlugin) {
+            if (!showGroup.readEntry(service->desktopEntryName(), abstractPlugin->enabledByDefault())) {
+                // The plugin has been disabled
+                continue;
+            }
+
+            abstractPlugin->setParent(this);
+            addActions(abstractPlugin->actions(props, m_mainWindow));
+        }

     }
     }

-    return *m_capabilities;

 }
 
 }
 

-void DolphinContextMenu::addVersionControlActions(KMenu* menu)
+void DolphinContextMenu::addVersionControlPluginActions()

 {
     const DolphinView* view = m_mainWindow->activeViewContainer()->view();
     const QList<QAction*> versionControlActions = view->versionControlActions(m_selectedItems);
     if (!versionControlActions.isEmpty()) {
         foreach (QAction* action, versionControlActions) {
 {
     const DolphinView* view = m_mainWindow->activeViewContainer()->view();
     const QList<QAction*> versionControlActions = view->versionControlActions(m_selectedItems);
     if (!versionControlActions.isEmpty()) {
         foreach (QAction* action, versionControlActions) {

-            menu->addAction(action);
+            addAction(action);

         }
         }

-        menu->addSeparator();
+        addSeparator();

     }
 }
 
     }
 }
 

-void DolphinContextMenu::addCustomActions(KMenu* menu)
+void DolphinContextMenu::addCustomActions()

 {
     foreach (QAction* action, m_customActions) {
 {
     foreach (QAction* action, m_customActions) {

-        menu->addAction(action);
+        addAction(action);

     }
 }
 
     }
 }