X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/7f7bea872b58b78813d99e5ef170c376ab1cc2c7..16a3aea6a629a91aab937be5c111b64b3ed6cf86:/src/dolphincontextmenu.h diff --git a/src/dolphincontextmenu.h b/src/dolphincontextmenu.h index d6b991053..bf0cf2c97 100644 --- a/src/dolphincontextmenu.h +++ b/src/dolphincontextmenu.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006 by Peter Penz * + * Copyright (C) 2006 by Peter Penz * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -20,24 +20,17 @@ #ifndef DOLPHINCONTEXTMENU_H #define DOLPHINCONTEXTMENU_H -#include -#include -#include -#include -#include +#include +#include -#include +#include +#include -#include - -#include - -class KMenu; -class KFileItem; class QAction; class DolphinMainWindow; class KFileItemActions; class KFileItemListProperties; +class DolphinRemoveAction; /** * @brief Represents the context menu which appears when doing a right @@ -51,7 +44,7 @@ class KFileItemListProperties; * - 'Actions': Contains all actions which can be applied to the * given item. */ -class DolphinContextMenu : public QObject +class DolphinContextMenu : public QMenu { Q_OBJECT @@ -59,6 +52,7 @@ public: enum Command { None, + OpenParentFolder, OpenParentFolderInNewWindow, OpenParentFolderInNewTab }; @@ -66,6 +60,7 @@ public: /** * @parent Pointer to the main window the context menu * belongs to. + * @pos Position in screen coordinates. * @fileInfo Pointer to the file item the context menu * is applied. If 0 is passed, the context menu * is above the viewport. @@ -73,10 +68,11 @@ public: * should be opened. */ DolphinContextMenu(DolphinMainWindow* parent, + const QPoint& pos, const KFileItem& fileInfo, - const KUrl& baseUrl); + const QUrl& baseUrl); - virtual ~DolphinContextMenu(); + ~DolphinContextMenu() override; void setCustomActions(const QList& actions); @@ -90,30 +86,9 @@ public: */ Command open(); - /** - * TODO: This method is a workaround for a X11-issue in combination - * with KModifierKeyInfo: When constructing KModifierKeyInfo in the - * constructor of the context menu, the user interface might freeze. - * To bypass this, the KModifierKeyInfo is constructed in DolphinMainWindow - * directly after starting the application. Remove this method, if - * the X11-issue got fixed (contact the maintainer of KModifierKeyInfo for - * more details). - */ - static void initializeModifierKeyInfo(); - -private slots: - /** - * Is invoked if a key modifier has been pressed and updates the context - * menu to show the 'Delete' action instead of the 'Move To Trash' action - * if the shift-key has been pressed. - */ - void slotKeyModifierPressed(Qt::Key key, bool pressed); - - /** - * Triggers the 'Delete'-action if the shift-key has been pressed, otherwise - * the 'Move to Trash'-action gets triggered. - */ - void slotRemoveActionTriggered(); +protected: + void keyPressEvent(QKeyEvent *ev) override; + void keyReleaseEvent(QKeyEvent *ev) override; private: void openTrashContextMenu(); @@ -121,33 +96,40 @@ private: void openItemContextMenu(); void openViewportContextMenu(); - void insertDefaultItemActions(); + void insertDefaultItemActions(const KFileItemListProperties&); /** * Adds the "Show menubar" action to the menu if the * menubar is hidden. */ - void addShowMenubarAction(); + void addShowMenuBarAction(); + + bool placeExists(const QUrl& url) const; + + QAction* createPasteAction(); + + KFileItemListProperties& selectedItemsProperties() const; /** - * Returns a name for adding the URL \a url to the Places panel. + * Returns the file item for m_baseUrl. */ - QString placesName(const KUrl& url) const; - - bool placeExists(const KUrl& url) const; + KFileItem baseFileItem(); - QAction* createPasteAction(); + /** + * Adds "Open With" actions + */ + void addOpenWithActions(KFileItemActions& fileItemActions); - KFileItemListProperties& capabilities(); - void addServiceActions(KFileItemActions& fileItemActions); - void addVersionControlActions(); - void addCustomActions(); + /** + * Adds actions that are provided by a KVersionControlPlugin. + */ + void addVersionControlPluginActions(); /** - * Updates m_removeAction to represent the 'Delete'-action if the shift-key - * has been pressed. Otherwise it represents the 'Move to Trash'-action. + * Adds custom actions e.g. like the "[x] Expandable Folders"-action + * provided in the details view. */ - void updateRemoveAction(); + void addCustomActions(); private: struct Entry @@ -167,21 +149,24 @@ private: TrashContext = 2 }; + QPoint m_pos; DolphinMainWindow* m_mainWindow; - KFileItemListProperties* m_capabilities; + KFileItem m_fileInfo; - KUrl m_baseUrl; + + QUrl m_baseUrl; + KFileItem* m_baseFileItem; /// File item for m_baseUrl + KFileItemList m_selectedItems; - KUrl::List m_selectedUrls; + mutable KFileItemListProperties* m_selectedItemsProperties; + int m_context; - KonqCopyToMenu m_copyToMenu; + KFileCopyToMenu m_copyToMenu; QList m_customActions; - QScopedPointer m_popup; 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