Check whether the shift key is pressed when the "Move to Trash" action is executed. If this is the case, perform the "Delete" action instead (-> works like in Konqi now, thanks to David for the hint)

CCMAIL: [email protected]

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

1 files changed, 8 insertions, 1 deletions

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 540fe5e48..361ea7e4f 100644
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -487,7 +487,14 @@ void DolphinMainWindow::rename()
 void DolphinMainWindow::moveToTrash()
 {
     clearStatusBar();
-    m_activeViewContainer->view()->trashSelectedItems();
+
+    DolphinView* view = m_activeViewContainer->view();
+
+    if (QApplication::keyboardModifiers() & Qt::ShiftModifier) {
+        view->deleteSelectedItems();
+    } else {
+        view->trashSelectedItems();
+    }
 }
 
 void DolphinMainWindow::deleteItems()