Do not delete files when Shift-clicking "Trash"

Thanks to Dawit Alemayehu for making this fix possible with commit
8e023ae9e5 !

BUG: 307254
FIXED-IN: 4.11.0
This commit is contained in:
Frank Reininghaus 2013-06-09 11:53:59 +02:00
parent 122404e71c
commit fda03a10e7

View file

@ -314,14 +314,7 @@ void DolphinViewActionHandler::slotRename()
void DolphinViewActionHandler::slotTrashActivated(Qt::MouseButtons, Qt::KeyboardModifiers modifiers) void DolphinViewActionHandler::slotTrashActivated(Qt::MouseButtons, Qt::KeyboardModifiers modifiers)
{ {
emit actionBeingHandled(); emit actionBeingHandled();
// Note: kde3's konq_mainwindow.cpp used to check m_currentView->trashSelectedItems();
// reason == KAction::PopupMenuActivation && ...
// but this isn't supported anymore
if (modifiers & Qt::ShiftModifier) {
m_currentView->deleteSelectedItems();
} else {
m_currentView->trashSelectedItems();
}
} }
void DolphinViewActionHandler::slotDeleteItems() void DolphinViewActionHandler::slotDeleteItems()