From a0115f912a9dbfe101b996bbe773bf5db81d2987 Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Sat, 14 Jan 2012 20:02:11 +0100 Subject: 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 --- src/dolphincontextmenu.h | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'src/dolphincontextmenu.h') 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; -- cgit v1.3