Review Request: Do not delete files if the user clicks 'Move to Trash' in the context menu while Shift is pressed

[Frank Reininghaus]

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
http://git.reviewboard.kde.org/r/107509/
-----------------------------------------------------------

Review request for Dolphin, Dawit Alemayehu and David Faure.


Description
-------

The problem occurs in Konqueror and Dolphin if the 'Delete' context menu entry is enabled, and Shift is pressed while Dolphin's context menu is opened. The menu shows both "Move To Trash" and "Delete" then, but clicking "Move to Trash" will also result in a "Delete".

The reason seems to be that not only the context menu, but also DolphinViewActionHandler::slotTrashActivated(Qt::MouseButtons, Qt::KeyboardModifiers modifiers) tries to be clever, checks if 'Shift' is pressed and deletes the file then. But I do not see why this is necessary. Both Dolphin's and the DolphinPart's context menu take care of the Shift issue themselves in different ways, and I don't see why an invocation of the "Move to Trash" action should ever need to delete the file. But maybe I've overlooked something, so I thought I'd better have some more people have a look at my patch before I accidentally break something else.


This addresses bug 307254.
    http://bugs.kde.org/show_bug.cgi?id=307254


Diffs
-----

  dolphin/src/views/dolphinviewactionhandler.cpp 0249964 

Diff: http://git.reviewboard.kde.org/r/107509/diff/


Testing
-------

Tested trashing and deleting files in Dolphin and Konqueror with the context menu, the menu, Delete/Shift+Delete key presses, with the 'Delete' action enabled/disabled, and everything seems to work OK for me.


Thanks,

Frank Reininghaus

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://mail.kde.org/mailman/private/kfm-devel/attachments/20121129/7e736c20/attachment.htm>