The &-shortcut from another action is not set until the action has been shown at...

[dolphin.git] / src / dolphincontextmenu.h

diff --git a/src/dolphincontextmenu.h b/src/dolphincontextmenu.h
index f7234f8e0b9fc9196843337d29fc6ba95b693103..d6b99105367aece4bf1b012310ea51623603dbd8 100644 (file)
--- a/src/dolphincontextmenu.h
+++ b/src/dolphincontextmenu.h
@@ -24,15 +24,20 @@
 #include <kfileitem.h>
 #include <kservice.h>
 #include <kurl.h>
 #include <kfileitem.h>
 #include <kservice.h>
 #include <kurl.h>

+#include <konq_copytomenu.h>

 
 #include <QtCore/QObject>
 
 #include <QtCore/QVector>
 
 
 #include <QtCore/QObject>
 
 #include <QtCore/QVector>
 

+#include <QScopedPointer>
+

 class KMenu;
 class KFileItem;
 class QAction;
 class DolphinMainWindow;
 class KMenu;
 class KFileItem;
 class QAction;
 class DolphinMainWindow;

+class KFileItemActions;
+class KFileItemListProperties;

 
 /**
  * @brief Represents the context menu which appears when doing a right
 
 /**
  * @brief Represents the context menu which appears when doing a right


@@ -51,6 +56,13 @@ class DolphinContextMenu : public QObject
     Q_OBJECT
 
 public:
     Q_OBJECT
 
 public:

+    enum Command
+    {
+        None,
+        OpenParentFolderInNewWindow,
+        OpenParentFolderInNewTab
+    };
+

     /**
      * @parent        Pointer to the main window the context menu
      *                belongs to.
     /**
      * @parent        Pointer to the main window the context menu
      *                belongs to.


@@ -66,50 +78,77 @@ public:
 
     virtual ~DolphinContextMenu();
 
 
     virtual ~DolphinContextMenu();
 

-    /** Opens the context menu model. */
-    void open();
+    void setCustomActions(const QList<QAction*>& actions);

 
 

-private:
-    void openTrashContextMenu();
-    void openTrashItemContextMenu();
-    void openItemContextMenu();
-    void openViewportContextMenu();
+    /**
+     * 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();

 
 

-    void insertDefaultItemActions(KMenu* popup);
+    /**
+     * 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:

     /**
     /**

-     * Inserts the 'Open With...' submenu to \a popup.
-     * @param popup          Menu where the 'Open With...' sub menu should
-     *                       be added.
-     * @param openWithVector Output parameter which contains all 'Open with...'
-     *                       services.
-     * @return               Identifier of the first 'Open With...' entry.
-     *                       All succeeding identifiers have an increased value of 1
-     *                       to the predecessor.
+     * 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.

      */
      */

-    QList<QAction*> insertOpenWithItems(KMenu* popup,
-                                        QVector<KService::Ptr>& openWithVector);
+    void slotKeyModifierPressed(Qt::Key key, bool pressed);

 
     /**
 
     /**

-     * Returns true, if 'menu' contains already
-     * an entry with the name 'entryName'.
+     * Triggers the 'Delete'-action if the shift-key has been pressed, otherwise
+     * the 'Move to Trash'-action gets triggered.

      */
      */

-    bool containsEntry(const KMenu* menu,
-                       const QString& entryName) const;
+    void slotRemoveActionTriggered();
+
+private:
+    void openTrashContextMenu();
+    void openTrashItemContextMenu();
+    void openItemContextMenu();
+    void openViewportContextMenu();
+
+    void insertDefaultItemActions();

 
     /**
      * Adds the "Show menubar" action to the menu if the
      * menubar is hidden.
      */
 
     /**
      * 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.
      */
     QString placesName(const KUrl& url) const;
 
 
     /**
      * Returns a name for adding the URL \a url to the Places panel.
      */
     QString placesName(const KUrl& url) const;
 

+    bool placeExists(const KUrl& url) const;
+

     QAction* createPasteAction();
 
     QAction* createPasteAction();
 

+    KFileItemListProperties& capabilities();
+    void addServiceActions(KFileItemActions& fileItemActions);
+    void addVersionControlActions();
+    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
     {
 private:
     struct Entry
     {


@@ -129,11 +168,20 @@ private:
     };
 
     DolphinMainWindow* m_mainWindow;
     };
 
     DolphinMainWindow* m_mainWindow;

+    KFileItemListProperties* m_capabilities;

     KFileItem m_fileInfo;
     KUrl m_baseUrl;
     KFileItemList m_selectedItems;
     KUrl::List m_selectedUrls;
     int m_context;
     KFileItem m_fileInfo;
     KUrl m_baseUrl;
     KFileItemList m_selectedItems;
     KUrl::List m_selectedUrls;
     int m_context;

+    KonqCopyToMenu m_copyToMenu;
+    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'

 };
 
 #endif
 };
 
 #endif