The &-shortcut from another action is not set until the action has been shown at...

[dolphin.git] / src / dolphincontextmenu.cpp

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 81194e42b0dd20ea548aa2ed1049a12d0a977d93..a3d913d6a02a8c9f026ff06c19d7cf121432a691 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -21,15 +21,15 @@
 #include "dolphincontextmenu.h"
 
 #include "dolphinmainwindow.h"
 #include "dolphincontextmenu.h"
 
 #include "dolphinmainwindow.h"

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

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

-#include "fileitemcapabilities.h"

 
 #include <kactioncollection.h>
 
 #include <kactioncollection.h>

-#include <kfileplacesmodel.h>

 #include <kdesktopfile.h>
 #include <kdesktopfile.h>

+#include <kfileitemlistproperties.h>
+#include <kfileplacesmodel.h>

 #include <kglobal.h>
 #include <kiconloader.h>
 #include <kio/netaccess.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <kio/netaccess.h>


@@ -37,13 +37,13 @@
 #include <kmenubar.h>
 #include <kmessagebox.h>
 #include <kmimetypetrader.h>
 #include <kmenubar.h>
 #include <kmessagebox.h>
 #include <kmimetypetrader.h>

-#include <knewmenu.h>
+#include <kmodifierkeyinfo.h>
+#include <knewfilemenu.h>

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

-#include <konq_menuactions.h>
+#include <kfileitemactions.h>

 #include <klocale.h>
 #include <kpropertiesdialog.h>
 #include <klocale.h>
 #include <kpropertiesdialog.h>

-#include <krun.h>

 #include <kstandardaction.h>
 #include <kstandarddirs.h>
 
 #include <kstandardaction.h>
 #include <kstandarddirs.h>
 


@@ -51,6 +51,11 @@
 #include <QtGui/QClipboard>
 #include <QtCore/QDir>
 
 #include <QtGui/QClipboard>
 #include <QtCore/QDir>
 

+#include "views/dolphinview.h"
+#include "views/viewmodecontroller.h"
+
+K_GLOBAL_STATIC(KModifierKeyInfo, m_keyInfo)
+

 DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent,
                                        const KFileItem& fileInfo,
                                        const KUrl& baseUrl) :
 DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent,
                                        const KFileItem& fileInfo,
                                        const KUrl& baseUrl) :


@@ -58,13 +63,32 @@ DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent,
     m_capabilities(0),
     m_fileInfo(fileInfo),
     m_baseUrl(baseUrl),
     m_capabilities(0),
     m_fileInfo(fileInfo),
     m_baseUrl(baseUrl),

-    m_context(NoContext)
+    m_context(NoContext),
+    m_copyToMenu(parent),
+    m_customActions(),
+    m_popup(new KMenu(m_mainWindow)),
+    m_command(None),
+    m_shiftPressed(false),
+    m_removeAction(0)

 {
     // The context menu either accesses the URLs of the selected items
     // or the items itself. To increase the performance both lists are cached.
 {
     // The context menu either accesses the URLs of the selected items
     // or the items itself. To increase the performance both lists are cached.

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

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

+    foreach (const KFileItem &item, m_selectedItems) {
+        m_selectedUrls.append(item.url());
+    }
+
+    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()


@@ -73,14 +97,19 @@ DolphinContextMenu::~DolphinContextMenu()
     m_capabilities = 0;
 }
 
     m_capabilities = 0;
 }
 

-void DolphinContextMenu::open()
+void DolphinContextMenu::setCustomActions(const QList<QAction*>& actions)
+{
+    m_customActions = actions;
+}
+
+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;
     }
 

-    if (!m_fileInfo.isNull() && (m_selectedItems.count() > 0)) {
+    if (!m_fileInfo.isNull() && !m_selectedItems.isEmpty()) {

         m_context |= ItemContext;
         // TODO: handle other use cases like devices + desktop files
     }
         m_context |= ItemContext;
         // TODO: handle other use cases like devices + desktop files
     }


@@ -98,28 +127,59 @@ void DolphinContextMenu::open()
         Q_ASSERT(m_context == NoContext);
         openViewportContextMenu();
     }
         Q_ASSERT(m_context == NoContext);
         openViewportContextMenu();
     }

+
+    return m_command;
+}
+
+void DolphinContextMenu::initializeModifierKeyInfo()
+{
+    // Access m_keyInfo, so that it gets instantiated by
+    // K_GLOBAL_STATIC
+    KModifierKeyInfo* keyInfo = m_keyInfo;
+    Q_UNUSED(keyInfo);
+}
+
+void DolphinContextMenu::slotKeyModifierPressed(Qt::Key key, bool pressed)
+{
+    m_shiftPressed = (key == Qt::Key_Shift) && pressed;
+    updateRemoveAction();
+}
+
+void DolphinContextMenu::slotRemoveActionTriggered()
+{
+    const KActionCollection* collection = m_mainWindow->actionCollection();
+    if (m_shiftPressed) {
+        collection->action("delete")->trigger();
+    } else {
+        collection->action("move_to_trash")->trigger();
+    }

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

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

 
 

-    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"), m_popup.data());

     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);
+    m_popup->addAction(emptyTrashAction);

 
 

-    QAction* addToPlacesAction = popup->addAction(KIcon("bookmark-new"),
+    QAction* addToPlacesAction = m_popup->addAction(KIcon("bookmark-new"),

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

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

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

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

 
 

-    QAction *action = popup->exec(QCursor::pos());
+    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,
     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,


@@ -137,8 +197,6 @@ void DolphinContextMenu::openTrashContextMenu()
             DolphinSettings::instance().placesModel()->addPlace(i18nc("@label", "Trash"), url);
         }
     }
             DolphinSettings::instance().placesModel()->addPlace(i18nc("@label", "Trash"), url);
         }
     }

-
-    popup->deleteLater();

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


@@ -146,276 +204,202 @@ 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);
+    addShowMenubarAction();

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

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

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

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

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

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

 
 

-    if (popup->exec(QCursor::pos()) == restoreAction) {
+    if (m_popup->exec(QCursor::pos()) == restoreAction) {

         KonqOperations::restoreTrashedItems(m_selectedUrls, m_mainWindow);
     }
         KonqOperations::restoreTrashedItems(m_selectedUrls, m_mainWindow);
     }

-
-    popup->deleteLater();

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

-    KMenu* popup = new KMenu(m_mainWindow);
-    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"));
+    if (m_selectedUrls.count() == 1) {
+        if (m_fileInfo.isDir()) {
+            // 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"));
+
+            // insert 'Add to Places' entry
+            if (!placeExists(m_fileInfo.url())) {
+                addToPlacesAction = m_popup->addAction(KIcon("bookmark-new"),
+                                                       i18nc("@action:inmenu Add selected folder to places",
+                                                             "Add to Places"));
+            }
+
+            m_popup->addSeparator();
+        } else if (m_baseUrl.protocol().contains("search")) {
+            openParentInNewWindowAction = new QAction(KIcon("window-new"),
+                                                    i18nc("@action:inmenu",
+                                                          "Open Path in New Window"),
+                                                    this);
+            m_popup->addAction(openParentInNewWindowAction);
+
+            openParentInNewTabAction = new QAction(KIcon("tab-new"),
+                                                   i18nc("@action:inmenu",
+                                                         "Open Path in New Tab"),
+                                                   this);
+            m_popup->addAction(openParentInNewTabAction);
+
+            m_popup->addSeparator();
+        }

     }
 
     }
 

-    // Insert 'Open With...' sub menu
-    QVector<KService::Ptr> openWithVector;
-    const QList<QAction*> openWithActions = insertOpenWithItems(popup, openWithVector);
+    addShowMenubarAction();
+    insertDefaultItemActions();

 
 

-    // Insert 'Actions' sub menu
-    KonqMenuActions menuActions;
-    menuActions.setItems(m_selectedItems);
-    if (menuActions.addActionsTo(popup)) {
-        popup->addSeparator();
-    }
+    m_popup->addSeparator();
+
+    KFileItemActions fileItemActions;
+    fileItemActions.setItemListProperties(capabilities());
+    addServiceActions(fileItemActions);
+
+    addVersionControlActions();

 
 

-    // Insert 'Copy To' and 'Move To' sub menus
+    // insert 'Copy To' and 'Move To' sub menus

     if (DolphinSettings::instance().generalSettings()->showCopyMoveMenu()) {
         m_copyToMenu.setItems(m_selectedItems);
     if (DolphinSettings::instance().generalSettings()->showCopyMoveMenu()) {
         m_copyToMenu.setItems(m_selectedItems);

-        m_copyToMenu.setReadOnly(!capabilities().supportsMoving());
-        m_copyToMenu.addActionsTo(popup);
-        popup->addSeparator();
+        m_copyToMenu.setReadOnly(!capabilities().supportsWriting());
+        m_copyToMenu.addActionsTo(m_popup.data());

     }
 
     // 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);
-        }
-    } else if (openWithActions.contains(activatedAction)) {
-        // one of the 'Open With' items has been selected
-        if (openWithActions.last() == activatedAction) {
-            // the item 'Other...' has been selected
-            KRun::displayOpenWithDialog(m_selectedUrls, m_mainWindow);
-        } else {
-            int id = openWithActions.indexOf(activatedAction);
-            KService::Ptr servicePtr = openWithVector[id];
-            KRun::run(*servicePtr, m_selectedUrls, m_mainWindow);
+    m_popup->addAction(propertiesAction);
+
+    QAction* activatedAction = m_popup->exec(QCursor::pos());
+    if (activatedAction != 0) {
+        if (activatedAction == addToPlacesAction) {
+            const KUrl selectedUrl(m_fileInfo.url());
+            if (selectedUrl.isValid()) {
+                DolphinSettings::instance().placesModel()->addPlace(placesName(selectedUrl),
+                                                                    selectedUrl);
+            }
+        } else if (activatedAction == openParentInNewWindowAction) {
+            m_command = OpenParentFolderInNewWindow;
+        } else if (activatedAction == openParentInNewTabAction) {
+            m_command = OpenParentFolderInNewTab;

         }
     }
         }
     }

-
-    openWithVector.clear();
-    popup->deleteLater();

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

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

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

-    KNewMenu* newMenu = m_mainWindow->newMenu();
-    newMenu->slotCheckUpToDate();
-    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"));
-
-    QAction* iconsMode = m_mainWindow->actionCollection()->action("icons");
-    viewModeMenu->addAction(iconsMode);
-
-    QAction* detailsMode = m_mainWindow->actionCollection()->action("details");
-    viewModeMenu->addAction(detailsMode);
-
-    QAction* columnsMode = m_mainWindow->actionCollection()->action("columns");
-    viewModeMenu->addAction(columnsMode);
+    KNewFileMenu* newFileMenu = m_mainWindow->newFileMenu();
+    const DolphinView* view = m_mainWindow->activeViewContainer()->view();
+    newFileMenu->setViewShowsHiddenFiles(view->showHiddenFiles());
+    newFileMenu->checkUpToDate();
+    newFileMenu->setPopupFiles(m_baseUrl);
+    m_popup->addMenu(newFileMenu->menu());
+    m_popup->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.
+    m_popup->addAction(m_mainWindow->actionCollection()->action("new_window"));
+    m_popup->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 = m_popup->addAction(KIcon("bookmark-new"),
+                                             i18nc("@action:inmenu Add current folder to places", "Add to Places"));
+    }

 
 

-    QAction* previewsMode = m_mainWindow->actionCollection()->action("previews");
-    viewModeMenu->addAction(previewsMode);
+    m_popup->addSeparator();

 
 

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

 
 

-    popup->addSeparator();
+    // insert service actions
+    const KFileItem item(KFileItem::Unknown, KFileItem::Unknown, m_baseUrl);
+    const KFileItemListProperties baseUrlProperties(KFileItemList() << item);
+    KFileItemActions fileItemActions;
+    fileItemActions.setItemListProperties(baseUrlProperties);
+    addServiceActions(fileItemActions);

 
 

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

 
 

-    QAction* propertiesAction = popup->addAction(i18nc("@action:inmenu", "Properties"));
+    addCustomActions();

 
 

-    QAction* action = popup->exec(QCursor::pos());
+    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();
     if (action == propertiesAction) {
         const KUrl& url = m_mainWindow->activeViewContainer()->url();

-        KPropertiesDialog dialog(url, m_mainWindow);
-        dialog.exec();
-    } else if (action == addToPlacesAction) {
+
+        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();
         if (url.isValid()) {
             DolphinSettings::instance().placesModel()->addPlace(placesName(url), url);
         }
     }
         const KUrl& url = m_mainWindow->activeViewContainer()->url();
         if (url.isValid()) {
             DolphinSettings::instance().placesModel()->addPlace(placesName(url), url);
         }
     }

-
-    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'
+    m_popup->addAction(collection->action(KStandardAction::name(KStandardAction::Cut)));
+    m_popup->addAction(collection->action(KStandardAction::name(KStandardAction::Copy)));
+    m_popup->addAction(createPasteAction());

 
 

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

 
 

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

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

-    popup->addAction(renameAction);
-
-    // insert 'Move to Trash' and (optionally) 'Delete'
-    KConfigGroup kdeConfig(KGlobal::config(), "KDE");
-    bool showDeleteCommand = kdeConfig.readEntry("ShowDeleteCommand", false);
-    const KUrl& url = m_mainWindow->activeViewContainer()->url();
-    if (url.isLocalFile()) {
-        QAction* moveToTrashAction = collection->action("move_to_trash");
-        popup->addAction(moveToTrashAction);
-    } else {
-        showDeleteCommand = true;
-    }
-
-    if (showDeleteCommand) {
-        QAction* deleteAction = collection->action("delete");
-        popup->addAction(deleteAction);
-    }
-}
-
-QList<QAction*> DolphinContextMenu::insertOpenWithItems(KMenu* popup,
-        QVector<KService::Ptr>& openWithVector)
-{
-    // Parts of the following code have been taken
-    // from the class KonqOperations located in
-    // libqonq/konq_operations.h of Konqueror.
-    // (Copyright (C) 2000  David Faure <faure@kde.org>)
-
-    // Prepare 'Open With' sub menu. Usually a sub menu is created, where all applications
-    // are listed which are registered to open the item. As last entry "Other..." will be
-    // attached which allows to select a custom application. If no applications are registered
-    // no sub menu is created at all, only "Open With..." will be offered.
-    bool insertOpenWithItems = true;
-    const QString contextMimeType(m_fileInfo.mimetype());
-
-    QListIterator<KFileItem> mimeIt(m_selectedItems);
-    while (insertOpenWithItems && mimeIt.hasNext()) {
-        KFileItem item = mimeIt.next();
-        insertOpenWithItems = (contextMimeType == item.mimetype());
-    }
-
-    QList<QAction*> openWithActions;
-    if (insertOpenWithItems) {
-        // fill the 'Open with' sub menu with application types
-        const KMimeType::Ptr mimePtr = KMimeType::findByUrl(m_fileInfo.url());
-        KService::List offers = KMimeTypeTrader::self()->query(mimePtr->name(),
-                                "Application",
-                                "Type == 'Application'");
-        if (offers.count() > 0) {
-            KService::List::Iterator it;
-            KMenu* openWithMenu = new KMenu(i18nc("@title:menu", "Open With"));
-            for (it = offers.begin(); it != offers.end(); ++it) {
-                // The offer list from the KTrader returns duplicate
-                // application entries. Although this seems to be a configuration
-                // problem outside the scope of Dolphin, duplicated entries just
-                // will be skipped here.
-                const QString appName((*it)->name());
-                if (!containsEntry(openWithMenu, appName)) {
-                    const KIcon icon((*it)->icon());
-                    QAction* action = openWithMenu->addAction(icon, appName);
-                    openWithVector.append(*it);
-                    openWithActions << action;
-                }
-            }
+    m_popup->addAction(renameAction);

 
 

-            openWithMenu->addSeparator();
-            QAction* action = openWithMenu->addAction(i18nc("@action:inmenu Open With", "&Other..."));
-
-            openWithActions << action;
-            popup->addMenu(openWithMenu);
-        } else {
-            // No applications are registered, hence just offer
-            // a "Open With..." item instead of a sub menu containing
-            // only one entry.
-            QAction* action = popup->addAction(i18nc("@title:menu", "Open With..."));
-            openWithActions << action;
-        }
+    // 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 {
     } else {

-        // At least one of the selected items has a different MIME type. In this case
-        // just show a disabled "Open With..." entry.
-        QAction* action = popup->addAction(i18nc("@title:menu", "Open With..."));
-        action->setEnabled(false);
-    }
-
-    return openWithActions;
-}
-
-bool DolphinContextMenu::containsEntry(const KMenu* menu,
-                                       const QString& entryName) const
-{
-    Q_ASSERT(menu != 0);
-
-    const QList<QAction*> list = menu->actions();
-    const uint count = list.count();
-    for (uint i = 0; i < count; ++i) {
-        const QAction* action = list.at(i);
-        if (action->text() == entryName) {
-            return true;
-        }
+        m_popup->addAction(m_removeAction);
+        updateRemoveAction();

     }
     }

-
-    return false;

 }
 
 }
 

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

 {
     KAction* showMenuBar = m_mainWindow->showMenuBarAction();
     if (!m_mainWindow->menuBar()->isVisible()) {
 {
     KAction* showMenuBar = m_mainWindow->showMenuBarAction();
     if (!m_mainWindow->menuBar()->isVisible()) {

-        // TODO: it should not be necessary to uncheck the menu
-        // bar action, but currently the action states don't get
-        // updated if the menu is disabled
-        showMenuBar->setChecked(false);
-        menu->addAction(showMenuBar);
-        menu->addSeparator();
+        m_popup->addAction(showMenuBar);
+        m_popup->addSeparator();

     }
 }
 
     }
 }
 


@@ -428,10 +412,26 @@ QString DolphinContextMenu::placesName(const KUrl& url) const
     return name;
 }
 
     return name;
 }
 

+bool DolphinContextMenu::placeExists(const KUrl& 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;
+        }
+    }
+    return false;
+}
+

 QAction* DolphinContextMenu::createPasteAction()
 {
     QAction* action = 0;
 QAction* DolphinContextMenu::createPasteAction()
 {
     QAction* action = 0;

-    if ((m_selectedItems.count() == 1) && m_fileInfo.isDir()) {
+    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 = 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);


@@ -444,12 +444,62 @@ QAction* DolphinContextMenu::createPasteAction()
     return action;
 }
 
     return action;
 }
 

-FileItemCapabilities& DolphinContextMenu::capabilities()
+KFileItemListProperties& DolphinContextMenu::capabilities()

 {
     if (m_capabilities == 0) {
 {
     if (m_capabilities == 0) {

-        m_capabilities = new FileItemCapabilities(m_selectedItems);
+        m_capabilities = new KFileItemListProperties(m_selectedItems);

     }
     return *m_capabilities;
 }
 
     }
     return *m_capabilities;
 }
 

+void DolphinContextMenu::addServiceActions(KFileItemActions& fileItemActions)
+{
+    fileItemActions.setParentWidget(m_mainWindow);
+
+    // insert 'Open With...' action or sub menu
+    fileItemActions.addOpenWithActionsTo(m_popup.data(), "DesktopEntryName != 'dolphin'");
+
+    // insert 'Actions' sub menu
+    fileItemActions.addServiceActionsTo(m_popup.data());
+}
+
+void DolphinContextMenu::addVersionControlActions()
+{
+    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();
+    }
+}
+
+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;
+
+    // Using m_removeAction->setText(action->text()) does not apply the &-shortcut.
+    // This is only done until the original action has been shown at least once. To
+    // bypass this issue, the text and &-shortcut is applied manually.
+    const QAction* action = 0;
+    if (moveToTrash) {
+        action = collection->action("move_to_trash");
+        m_removeAction->setText(i18nc("@action:inmenu", "&Move to Trash"));
+    } else {
+        action = collection->action("delete");
+        m_removeAction->setText(i18nc("@action:inmenu", "&Delete"));
+    }
+    m_removeAction->setIcon(action->icon());
+    m_removeAction->setShortcuts(action->shortcuts());
+}
+

 #include "dolphincontextmenu.moc"
 #include "dolphincontextmenu.moc"