┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src/dolphincontextmenu.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/dolphincontextmenu.h')
-rw-r--r--src/dolphincontextmenu.h20
1 files changed, 18 insertions, 2 deletions
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<QAction*>& 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<QAction*> m_customActions;
QScopedPointer<KMenu> m_popup;
+ Command m_command;
+
bool m_shiftPressed;
QAction* m_removeAction; // Action that represents either 'Move To Trash' or 'Delete'
};