From fda03a10e725ba133a32a032f7f456d839e0d800 Mon Sep 17 00:00:00 2001 From: Frank Reininghaus Date: Sun, 9 Jun 2013 11:53:59 +0200 Subject: [PATCH] Do not delete files when Shift-clicking "Trash" Thanks to Dawit Alemayehu for making this fix possible with commit 8e023ae9e5051cb7b81af86a178e37c1f2c5da94 ! BUG: 307254 FIXED-IN: 4.11.0 --- dolphin/src/views/dolphinviewactionhandler.cpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/dolphin/src/views/dolphinviewactionhandler.cpp b/dolphin/src/views/dolphinviewactionhandler.cpp index 730723785e..9a9718c333 100644 --- a/dolphin/src/views/dolphinviewactionhandler.cpp +++ b/dolphin/src/views/dolphinviewactionhandler.cpp @@ -314,14 +314,7 @@ void DolphinViewActionHandler::slotRename() void DolphinViewActionHandler::slotTrashActivated(Qt::MouseButtons, Qt::KeyboardModifiers modifiers) { emit actionBeingHandled(); - // Note: kde3's konq_mainwindow.cpp used to check - // reason == KAction::PopupMenuActivation && ... - // but this isn't supported anymore - if (modifiers & Qt::ShiftModifier) { - m_currentView->deleteSelectedItems(); - } else { - m_currentView->trashSelectedItems(); - } + m_currentView->trashSelectedItems(); } void DolphinViewActionHandler::slotDeleteItems()