When you view the context menu of a file/folder and shift is pressed (and the delete...

"Move to trash (del)" action gets replaced by the "Delete (shift del)" action and replaced back to "Move to trash (del)" when you release
shift.

BUG: 194275

svn path=/trunk/KDE/kdebase/apps/; revision=1176493

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index d76cd8d23ebd17441d18e3cad5bdd4c6e0021dcf..7d195df6694d6130763de2bcb250e479ff6c9e21 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -62,13 +62,18 @@ DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent,
     m_baseUrl(baseUrl),
     m_context(NoContext),
     m_copyToMenu(parent),
     m_baseUrl(baseUrl),
     m_context(NoContext),
     m_copyToMenu(parent),

-    m_customActions()
+    m_customActions(),
+    m_popup(new KMenu(m_mainWindow)),
+    m_showDeleteCommand(false),
+    m_shiftIsPressed(false)

 {
     // 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();
 {
     // 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_showDeleteCommand = KGlobal::config()->group("KDE").readEntry("ShowDeleteCommand", false);

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


@@ -113,16 +118,14 @@ void DolphinContextMenu::openTrashContextMenu()
 {
     Q_ASSERT(m_context & TrashContext);
 
 {
     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"));
 
     // Don't show if url is already in places
                                                   i18nc("@action:inmenu Add current folder to places", "Add to Places"));
 
     // Don't show if url is already in places


@@ -130,12 +133,12 @@ void DolphinContextMenu::openTrashContextMenu()
         addToPlacesAction->setVisible(false);
     }
 
         addToPlacesAction->setVisible(false);
     }
 

-    addCustomActions(popup);
+    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,


@@ -153,8 +156,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()


@@ -162,34 +163,29 @@ 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);

     if (m_fileInfo.isDir() && (m_selectedUrls.count() == 1)) {
         // setup 'Create New' menu
     if (m_fileInfo.isDir() && (m_selectedUrls.count() == 1)) {
         // setup 'Create New' menu

-        DolphinNewFileMenu* newFileMenu = new DolphinNewFileMenu(popup, m_mainWindow);
+        DolphinNewFileMenu* newFileMenu = new DolphinNewFileMenu(m_popup.data(), m_mainWindow);

         const DolphinView* view = m_mainWindow->activeViewContainer()->view();
         newFileMenu->setViewShowsHiddenFiles(view->showHiddenFiles());
         newFileMenu->checkUpToDate();
         const DolphinView* view = m_mainWindow->activeViewContainer()->view();
         newFileMenu->setViewShowsHiddenFiles(view->showHiddenFiles());
         newFileMenu->checkUpToDate();


@@ -199,45 +195,45 @@ void DolphinContextMenu::openItemContextMenu()
         KMenu* menu = newFileMenu->menu();
         menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New"));
         menu->setIcon(KIcon("document-new"));
         KMenu* menu = newFileMenu->menu();
         menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New"));
         menu->setIcon(KIcon("document-new"));

-        popup->addMenu(menu);
-        popup->addSeparator();
+        m_popup->addMenu(menu);
+        m_popup->addSeparator();

 
         // insert 'Open in new window' and 'Open in new tab' entries
 
         // 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();
+        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();

     }
     }

-    addShowMenubarAction(popup);
-    insertDefaultItemActions(popup);
+    addShowMenubarAction();
+    insertDefaultItemActions();

 
 

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

 
     KFileItemActions fileItemActions;
     fileItemActions.setItemListProperties(capabilities());
 
     KFileItemActions fileItemActions;
     fileItemActions.setItemListProperties(capabilities());

-    addServiceActions(popup, fileItemActions);
+    addServiceActions(fileItemActions);

 
 

-    addVersionControlActions(popup);
+    addVersionControlActions();

 
     // insert 'Copy To' and 'Move To' sub menus
     if (DolphinSettings::instance().generalSettings()->showCopyMoveMenu()) {
         m_copyToMenu.setItems(m_selectedItems);
         m_copyToMenu.setReadOnly(!capabilities().supportsWriting());
 
     // 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(popup);
-        popup->addSeparator();
+        m_copyToMenu.addActionsTo(m_popup.data());
+        m_popup->addSeparator();

     }
 
     // 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())) {
     }
 
     // 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 = popup->addAction(KIcon("bookmark-new"),
+        addToPlacesAction = m_popup->addAction(KIcon("bookmark-new"),

                                              i18nc("@action:inmenu Add selected folder to places", "Add to Places"));
     }
 
     // insert 'Properties...' entry
     QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties");
                                              i18nc("@action:inmenu Add selected folder to places", "Add to Places"));
     }
 
     // insert 'Properties...' entry
     QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties");

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

 
 

-    QAction* activatedAction = popup->exec(QCursor::pos());
+    QAction* activatedAction = m_popup->exec(QCursor::pos());

 
     if ((addToPlacesAction != 0) && (activatedAction == addToPlacesAction)) {
         const KUrl selectedUrl(m_fileInfo.url());
 
     if ((addToPlacesAction != 0) && (activatedAction == addToPlacesAction)) {
         const KUrl selectedUrl(m_fileInfo.url());


@@ -246,15 +242,11 @@ void DolphinContextMenu::openItemContextMenu()
                                                                 selectedUrl);
         }
     }
                                                                 selectedUrl);
         }
     }

-
-    popup->deleteLater();

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

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

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


@@ -262,39 +254,39 @@ void DolphinContextMenu::openViewportContextMenu()
     newFileMenu->setViewShowsHiddenFiles(view->showHiddenFiles());
     newFileMenu->checkUpToDate();
     newFileMenu->setPopupFiles(m_baseUrl);
     newFileMenu->setViewShowsHiddenFiles(view->showHiddenFiles());
     newFileMenu->checkUpToDate();
     newFileMenu->setPopupFiles(m_baseUrl);

-    popup->addMenu(newFileMenu->menu());
-    popup->addSeparator();
+    m_popup->addMenu(newFileMenu->menu());
+    m_popup->addSeparator();

 
     // insert 'Open in new window' and 'Open in new tab' entries
 
     // 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();
+    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();
 
     QAction* pasteAction = createPasteAction();

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

 
     // insert service actions
     const KFileItem item(KFileItem::Unknown, KFileItem::Unknown, m_baseUrl);
     const KFileItemListProperties baseUrlProperties(KFileItemList() << item);
     KFileItemActions fileItemActions;
     fileItemActions.setItemListProperties(baseUrlProperties);
 
     // insert service actions
     const KFileItem item(KFileItem::Unknown, KFileItem::Unknown, m_baseUrl);
     const KFileItemListProperties baseUrlProperties(KFileItemList() << item);
     KFileItemActions fileItemActions;
     fileItemActions.setItemListProperties(baseUrlProperties);

-    addServiceActions(popup, fileItemActions);
+    addServiceActions(fileItemActions);

 
 

-    addVersionControlActions(popup);
+    addVersionControlActions();

 
     // insert 'Add to Places' entry if exactly one item is selected
     QAction* addToPlacesAction = 0;
     if (!placeExists(m_mainWindow->activeViewContainer()->url())) {
 
     // insert 'Add to Places' entry if exactly one item is selected
     QAction* addToPlacesAction = 0;
     if (!placeExists(m_mainWindow->activeViewContainer()->url())) {

-        addToPlacesAction = popup->addAction(KIcon("bookmark-new"),
+        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"));
     }
 

-    addCustomActions(popup);
+    addCustomActions();

 
 

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

     propertiesAction->setIcon(KIcon("document-properties"));
     propertiesAction->setIcon(KIcon("document-properties"));

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


@@ -307,54 +299,55 @@ void DolphinContextMenu::openViewportContextMenu()
             DolphinSettings::instance().placesModel()->addPlace(placesName(url), url);
         }
     }
             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();
+    // Cut action
+    m_popup->addAction(collection->action(KStandardAction::name(KStandardAction::Cut)));
+
+    // Copy action
+    m_popup->addAction(collection->action(KStandardAction::name(KStandardAction::Copy)));

 
 

-    popup->addAction(cutAction);
-    popup->addAction(copyAction);
-    popup->addAction(pasteAction);
-    popup->addSeparator();
+    // Paste action
+    m_popup->addAction(createPasteAction());

 
 

-    // insert 'Rename'
+    m_popup->addSeparator();
+
+    // Insert 'Rename'

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

-    popup->addAction(renameAction);
+    m_popup->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);
+    // Insert move to trash and delete. We need to insert both because both can be visible.
+    m_popup->addAction(collection->action("move_to_trash"));
+    m_popup->addAction(collection->action("delete"));

 
     const KUrl& url = m_mainWindow->activeViewContainer()->url();
     if (url.isLocalFile()) {
 
     const KUrl& url = m_mainWindow->activeViewContainer()->url();
     if (url.isLocalFile()) {

-        QAction* moveToTrashAction = collection->action("move_to_trash");
-        popup->addAction(moveToTrashAction);
+        collection->action("move_to_trash")->setVisible(true);
+        collection->action("delete")->setVisible(false);

     } else {
     } else {

-        showDeleteCommand = true;
+        collection->action("delete")->setVisible(true);
+    }
+
+    if(m_showDeleteCommand) {
+        collection->action("delete")->setVisible(true);

     }
 
     }
 

-    if (showDeleteCommand) {
-        QAction* deleteAction = collection->action("delete");
-        popup->addAction(deleteAction);
+    if(m_shiftIsPressed) {
+        deleteOrTrashMenuEntry(Qt::Key_Shift, m_shiftIsPressed);

     }
     }

+

 }
 
 }
 

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

-        menu->addAction(showMenuBar);
-        menu->addSeparator();
+        m_popup->addAction(showMenuBar);
+        m_popup->addSeparator();

     }
 }
 
     }
 }
 


@@ -407,35 +400,61 @@ KFileItemListProperties& DolphinContextMenu::capabilities()
     return *m_capabilities;
 }
 
     return *m_capabilities;
 }
 

-void DolphinContextMenu::addServiceActions(KMenu* menu, KFileItemActions& fileItemActions)
+void DolphinContextMenu::addServiceActions(KFileItemActions& fileItemActions)

 {
     fileItemActions.setParentWidget(m_mainWindow);
 
     // insert 'Open With...' action or sub menu
 {
     fileItemActions.setParentWidget(m_mainWindow);
 
     // insert 'Open With...' action or sub menu

-    fileItemActions.addOpenWithActionsTo(menu, "DesktopEntryName != 'dolphin'");
+    fileItemActions.addOpenWithActionsTo(m_popup.data(), "DesktopEntryName != 'dolphin'");

 
     // insert 'Actions' sub menu
 
     // insert 'Actions' sub menu

-    if (fileItemActions.addServiceActionsTo(menu)) {
-        menu->addSeparator();
+    if (fileItemActions.addServiceActionsTo(m_popup.data())) {
+        m_popup->addSeparator();

     }
 }
 
     }
 }
 

-void DolphinContextMenu::addVersionControlActions(KMenu* menu)
+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) {
 {
     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);
+            m_popup->addAction(action);

         }
         }

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

     }
 }
 
     }
 }
 

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

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

-        menu->addAction(action);
+        m_popup->addAction(action);
+    }
+}
+
+void DolphinContextMenu::setShiftIsPressed(bool pressed)
+{
+    m_shiftIsPressed = pressed;
+}
+
+void DolphinContextMenu::deleteOrTrashMenuEntry(Qt::Key key, bool pressed)
+{
+    if(m_mainWindow->activeViewContainer()->url().isLocalFile() && !m_showDeleteCommand && key == Qt::Key_Shift) {
+
+        // Set the current size as fixed size so that the menu isn't flickering when pressing shift.
+        m_popup->setFixedSize(m_popup->size());
+        if(pressed) {
+            m_mainWindow->actionCollection()->action("delete")->setVisible(true);
+            m_mainWindow->actionCollection()->action("move_to_trash")->setVisible(false);
+        }
+        else {
+            m_mainWindow->actionCollection()->action("delete")->setVisible(false);
+            m_mainWindow->actionCollection()->action("move_to_trash")->setVisible(true);
+        }
+
+        // This sets the menu back to a dynamic size followed by a forced resize incase the newly made visible action has bigger text.
+        m_popup->setFixedSize(QSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX));
+        m_popup->resize(m_popup->sizeHint());

     }
 }
 
     }
 }
 

diff --git a/src/dolphincontextmenu.h b/src/dolphincontextmenu.h
index ae0d1c336a0c432a4c88d0ef6d60b64881353f22..052149ba382b12c55346387355bb9557a41fbb84 100644 (file)
--- a/src/dolphincontextmenu.h
+++ b/src/dolphincontextmenu.h
@@ -25,11 +25,14 @@
 #include <kservice.h>
 #include <kurl.h>
 #include <konq_copytomenu.h>
 #include <kservice.h>
 #include <kurl.h>
 #include <konq_copytomenu.h>

+#include <kmodifierkeyinfo.h>

 
 #include <QtCore/QObject>
 
 #include <QtCore/QVector>
 
 
 #include <QtCore/QObject>
 
 #include <QtCore/QVector>
 

+#include <QScopedPointer>
+

 class KMenu;
 class KFileItem;
 class QAction;
 class KMenu;
 class KFileItem;
 class QAction;


@@ -70,23 +73,27 @@ public:
     virtual ~DolphinContextMenu();
 
     void setCustomActions(const QList<QAction*>& actions);
     virtual ~DolphinContextMenu();
 
     void setCustomActions(const QList<QAction*>& actions);

+    void setShiftIsPressed(bool pressed);

 
     /** Opens the context menu model. */
     void open();
 
 
     /** Opens the context menu model. */
     void open();
 

+public slots:
+    void deleteOrTrashMenuEntry(Qt::Key key, bool pressed);
+

 private:
     void openTrashContextMenu();
     void openTrashItemContextMenu();
     void openItemContextMenu();
     void openViewportContextMenu();
 
 private:
     void openTrashContextMenu();
     void openTrashItemContextMenu();
     void openItemContextMenu();
     void openViewportContextMenu();
 

-    void insertDefaultItemActions(KMenu* popup);
+    void insertDefaultItemActions();

 
     /**
      * Adds the "Show menubar" action to the menu if the
      * menubar is hidden.
      */
 
     /**
      * Adds the "Show menubar" action to the menu if the
      * menubar is hidden.
      */

-    void addShowMenubarAction(KMenu* menu);
+    void addShowMenubarAction();

 
     /**
      * Returns a name for adding the URL \a url to the Places panel.
 
     /**
      * Returns a name for adding the URL \a url to the Places panel.


@@ -99,9 +106,9 @@ private:
 
 private:
     KFileItemListProperties& capabilities();
 
 private:
     KFileItemListProperties& capabilities();

-    void addServiceActions(KMenu* menu, KFileItemActions& fileItemActions);
-    void addVersionControlActions(KMenu* menu);
-    void addCustomActions(KMenu* menu);
+    void addServiceActions(KFileItemActions& fileItemActions);
+    void addVersionControlActions();
+    void addCustomActions();

 
 private:
     struct Entry
 
 private:
     struct Entry


@@ -130,6 +137,9 @@ private:
     int m_context;
     KonqCopyToMenu m_copyToMenu;
     QList<QAction*> m_customActions;
     int m_context;
     KonqCopyToMenu m_copyToMenu;
     QList<QAction*> m_customActions;

+    QScopedPointer<KMenu> m_popup;
+    bool m_showDeleteCommand;
+    bool m_shiftIsPressed;

 };
 
 #endif
 };
 
 #endif

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 722a90f9383a4b5883cafb7c28ba40a952f16e4c..6f407a84a5e54f154779d9ebed51776bae2b89d2 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -114,7 +114,8 @@ DolphinMainWindow::DolphinMainWindow(int id) :
     m_actionHandler(0),
     m_remoteEncoding(0),
     m_settingsDialog(0),
     m_actionHandler(0),
     m_remoteEncoding(0),
     m_settingsDialog(0),

-    m_lastHandleUrlStatJob(0)
+    m_lastHandleUrlStatJob(0),
+    m_keyInfo(new KModifierKeyInfo)

 {
     setObjectName("Dolphin#");
 
 {
     setObjectName("Dolphin#");
 


@@ -1167,6 +1168,12 @@ void DolphinMainWindow::openContextMenu(const KFileItem& item,
                                         const QList<QAction*>& customActions)
 {
     DolphinContextMenu contextMenu(this, item, url);
                                         const QList<QAction*>& customActions)
 {
     DolphinContextMenu contextMenu(this, item, url);

+
+    if(m_keyInfo.isKeyPressed(Qt::Key_Shift) || m_keyInfo.isKeyLatched(Qt::Key_Shift)) {
+        contextMenu.setShiftIsPressed(true);
+    }
+
+    connect(&m_keyInfo, SIGNAL(keyPressed(Qt::Key, bool)), &contextMenu, SLOT(deleteOrTrashMenuEntry(Qt::Key, bool)));

     contextMenu.setCustomActions(customActions);
     contextMenu.open();
 }
     contextMenu.setCustomActions(customActions);
     contextMenu.open();
 }

diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index d76cf0d5c04b3b8f5ed8b8c562dba660d67e8ef4..cb0be1431c0765f2a22a9958d72dfe320de7d67d 100644 (file)
--- a/src/dolphinmainwindow.h
+++ b/src/dolphinmainwindow.h
@@ -31,9 +31,12 @@
 #include <ksortablelist.h>
 #include <kxmlguiwindow.h>
 #include <kactionmenu.h>
 #include <ksortablelist.h>
 #include <kxmlguiwindow.h>
 #include <kactionmenu.h>

+#include <kmodifierkeyinfo.h>

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

+#include "dolphincontextmenu.h"
+

 #include <QList>
 
 typedef KIO::FileUndoManager::CommandType CommandType;
 #include <QList>
 
 typedef KIO::FileUndoManager::CommandType CommandType;


@@ -540,6 +543,8 @@ private:
     QPointer<DolphinSettingsDialog> m_settingsDialog;
 
     KJob* m_lastHandleUrlStatJob;
     QPointer<DolphinSettingsDialog> m_settingsDialog;
 
     KJob* m_lastHandleUrlStatJob;

+
+    KModifierKeyInfo m_keyInfo;

 };
 
 inline DolphinViewContainer* DolphinMainWindow::activeViewContainer() const
 };
 
 inline DolphinViewContainer* DolphinMainWindow::activeViewContainer() const