X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/cad78cdfcf1f3b76acaadc7e9394df3ef466d770..a46121dc510f987f2d164b43eaf5f84ea8c83cb8:/src/dolphincontextmenu.h diff --git a/src/dolphincontextmenu.h b/src/dolphincontextmenu.h index 1c65fab13..180f91787 100644 --- a/src/dolphincontextmenu.h +++ b/src/dolphincontextmenu.h @@ -36,6 +36,7 @@ class QAction; class DolphinMainWindow; class KFileItemActions; class KFileItemListProperties; +class DolphinRemoveAction; /** * @brief Represents the context menu which appears when doing a right @@ -94,20 +95,13 @@ protected: virtual void keyPressEvent(QKeyEvent *ev); virtual void keyReleaseEvent(QKeyEvent *ev); -private slots: - /** - * Triggers the 'Delete'-action if the shift-key has been pressed, otherwise - * the 'Move to Trash'-action gets triggered. - */ - void slotRemoveActionTriggered(); - private: void openTrashContextMenu(); void openTrashItemContextMenu(); void openItemContextMenu(); void openViewportContextMenu(); - void insertDefaultItemActions(); + void insertDefaultItemActions(const KFileItemListProperties&); /** * Adds the "Show menubar" action to the menu if the @@ -148,20 +142,6 @@ private: */ void addCustomActions(); - /** - * Updates m_removeAction to represent the 'Delete'-action if the shift-key - * has been pressed or the selection is not local. Otherwise it represents - * the 'Move to Trash'-action. - */ - void updateRemoveAction(); - - /** - * @return True if a moving to the trash should be done instead of - * deleting the selected items. - * @see updateRemoveAction(), slotRemoveActionTriggered() - */ - bool moveToTrash() const; - private: struct Entry { @@ -197,8 +177,7 @@ private: Command m_command; - bool m_shiftPressed; - QAction* m_removeAction; // Action that represents either 'Move To Trash' or 'Delete' + DolphinRemoveAction* m_removeAction; // Action that represents either 'Move To Trash' or 'Delete' }; #endif