X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/09e1cc4d7726b649710fe5ce49741ae736ce4d06..c8d8556950005dfd96ebdb41d2f43ad90356367c:/src/dolphincontextmenu.h diff --git a/src/dolphincontextmenu.h b/src/dolphincontextmenu.h index ae0d1c336..7f43de368 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,15 +20,16 @@ #ifndef DOLPHINCONTEXTMENU_H #define DOLPHINCONTEXTMENU_H -#include -#include -#include -#include +#include +#include +#include #include -#include +#include -#include +#include + +#include class KMenu; class KFileItem; @@ -54,9 +55,17 @@ class DolphinContextMenu : public QObject Q_OBJECT public: + enum Command + { + None, + OpenParentFolderInNewWindow, + OpenParentFolderInNewTab + }; + /** * @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. @@ -64,6 +73,7 @@ public: * should be opened. */ DolphinContextMenu(DolphinMainWindow* parent, + const QPoint& pos, const KFileItem& fileInfo, const KUrl& baseUrl); @@ -71,8 +81,40 @@ public: void setCustomActions(const QList& actions); - /** Opens the context menu model. */ - void open(); + /** + * Opens the context menu model and returns the requested + * command, that should be triggered by the caller. If + * Command::None has been returned, either the context-menu + * had been closed without executing an action or an + * already available action from the main-window has been + * executed. + */ + 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(); private: void openTrashContextMenu(); @@ -80,13 +122,13 @@ private: void openItemContextMenu(); void openViewportContextMenu(); - void insertDefaultItemActions(KMenu* popup); + void insertDefaultItemActions(); /** * Adds the "Show menubar" action to the menu if the * menubar is hidden. */ - void addShowMenubarAction(KMenu* menu); + void addShowMenuBarAction(); /** * Returns a name for adding the URL \a url to the Places panel. @@ -97,11 +139,40 @@ private: QAction* createPasteAction(); -private: - KFileItemListProperties& capabilities(); - void addServiceActions(KMenu* menu, KFileItemActions& fileItemActions); - void addVersionControlActions(KMenu* menu); - void addCustomActions(KMenu* menu); + KFileItemListProperties& selectedItemsProperties(); + + /** + * Returns the file item for m_baseUrl. + */ + KFileItem baseFileItem(); + + /** + * Adds actions that have been installed as service-menu. + * (see http://techbase.kde.org/index.php?title=Development/Tutorials/Creating_Konqueror_Service_Menus) + */ + void addServiceActions(KFileItemActions& fileItemActions); + + /** + * Adds actions that are provided by a KFileItemActionPlugin. + */ + void addFileItemPluginActions(); + + /** + * Adds actions that are provided by a KVersionControlPlugin. + */ + void addVersionControlPluginActions(); + + /** + * Adds custom actions e.g. like the "[x] Expandable Folders"-action + * provided in the details view. + */ + void addCustomActions(); + + /** + * Updates m_removeAction to represent the 'Delete'-action if the shift-key + * has been pressed. Otherwise it represents the 'Move to Trash'-action. + */ + void updateRemoveAction(); private: struct Entry @@ -121,15 +192,26 @@ private: TrashContext = 2 }; + QPoint m_pos; DolphinMainWindow* m_mainWindow; - KFileItemListProperties* m_capabilities; + KFileItem m_fileInfo; + KUrl m_baseUrl; + KFileItem* m_baseFileItem; /// File item for m_baseUrl + KFileItemList m_selectedItems; - KUrl::List m_selectedUrls; + KFileItemListProperties* m_selectedItemsProperties; + int m_context; KonqCopyToMenu m_copyToMenu; QList m_customActions; + KMenu* m_popup; + + Command m_command; + + bool m_shiftPressed; + QAction* m_removeAction; // Action that represents either 'Move To Trash' or 'Delete' }; #endif