diff options
| author | Peter Penz <[email protected]> | 2012-01-14 20:02:11 +0100 |
|---|---|---|
| committer | Peter Penz <[email protected]> | 2012-01-14 20:05:09 +0100 |
| commit | 9da248fa267f4d9e85cc12c1afbe859e4de7c233 (patch) | |
| tree | b739e2dcee7d2f346e5f9a46bcc217efe5c73c51 /src/dolphincontextmenu.h | |
| parent | 33b9c7bed55542aac579b4e982161f09d33506df (diff) | |
Fix issue when deleting items with the context menu
Thanks to Jekyll Wu for the analyses of the issue!
BUG: 290307
BUG: 269096
BUG: 290954
BUG: 264583
FIXED-IN: 4.8.0
Diffstat (limited to 'src/dolphincontextmenu.h')
| -rw-r--r-- | src/dolphincontextmenu.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/dolphincontextmenu.h b/src/dolphincontextmenu.h index 7f43de368..9e8b804cd 100644 --- a/src/dolphincontextmenu.h +++ b/src/dolphincontextmenu.h @@ -139,7 +139,7 @@ private: QAction* createPasteAction(); - KFileItemListProperties& selectedItemsProperties(); + KFileItemListProperties& selectedItemsProperties() const; /** * Returns the file item for m_baseUrl. @@ -170,10 +170,18 @@ private: /** * Updates m_removeAction to represent the 'Delete'-action if the shift-key - * has been pressed. Otherwise it represents the 'Move to Trash'-action. + * has been pressed or the selection is not local. Otherwise it represents + * the 'Move to Trash'-action. */ void updateRemoveAction(); + /** + * @return True if no shift key has been pressed and the selection represents + * only local files. + * @see updateRemoveAction(), slotRemoveActionTriggered() + */ + bool moveToTrash() const; + private: struct Entry { @@ -201,7 +209,7 @@ private: KFileItem* m_baseFileItem; /// File item for m_baseUrl KFileItemList m_selectedItems; - KFileItemListProperties* m_selectedItemsProperties; + mutable KFileItemListProperties* m_selectedItemsProperties; int m_context; KonqCopyToMenu m_copyToMenu; |
