From 7f7bea872b58b78813d99e5ef170c376ab1cc2c7 Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Wed, 22 Sep 2010 20:24:49 +0000 Subject: If the context-menu is opened for a file shown as search result, offer the actions "Open Parent Folder in New Window" and "Open Parent Folder in New Tab" svn path=/trunk/KDE/kdebase/apps/; revision=1178362 --- src/dolphincontextmenu.h | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'src/dolphincontextmenu.h') diff --git a/src/dolphincontextmenu.h b/src/dolphincontextmenu.h index 2913114ac..d6b991053 100644 --- a/src/dolphincontextmenu.h +++ b/src/dolphincontextmenu.h @@ -56,6 +56,13 @@ class DolphinContextMenu : public QObject Q_OBJECT public: + enum Command + { + None, + OpenParentFolderInNewWindow, + OpenParentFolderInNewTab + }; + /** * @parent Pointer to the main window the context menu * belongs to. @@ -73,8 +80,15 @@ 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 @@ -164,6 +178,8 @@ private: QList m_customActions; QScopedPointer m_popup; + Command m_command; + bool m_shiftPressed; QAction* m_removeAction; // Action that represents either 'Move To Trash' or 'Delete' }; -- cgit v1.3