Check whether the shift key is pressed when the "Move to Trash" action is executed...

CCMAIL: faure@kde.org

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

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 540fe5e4847ec8ada4bd9a31a3fd7b00278a4583..361ea7e4fd3924a378a9d2e244c95dfa25839e28 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -487,7 +487,14 @@ void DolphinMainWindow::rename()
 void DolphinMainWindow::moveToTrash()
 {
     clearStatusBar();
 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()
 }
 
 void DolphinMainWindow::deleteItems()