Merge branch 'Applications/16.04'

[dolphin.git] / src / dolphincontextmenu.h

diff --git a/src/dolphincontextmenu.h b/src/dolphincontextmenu.h
index 028dc46495734a5abd5b2a082dd21eea0058f074..419d3f9bd4bd0c71fe9132c0299cb2381f399536 100644 (file)
--- a/src/dolphincontextmenu.h
+++ b/src/dolphincontextmenu.h
@@ -1,5 +1,5 @@
 /***************************************************************************
 /***************************************************************************

- *   Copyright (C) 2006 by Peter Penz <peter.penz@gmx.at>                  *
+ *   Copyright (C) 2006 by Peter Penz <peter.penz19@gmail.com>             *

  *                                                                         *
  *   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  *
  *                                                                         *
  *   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,25 +20,19 @@
 #ifndef DOLPHINCONTEXTMENU_H
 #define DOLPHINCONTEXTMENU_H
 
 #ifndef DOLPHINCONTEXTMENU_H
 #define DOLPHINCONTEXTMENU_H
 

-#include <kdesktopfileactions.h>
-#include <kfileitem.h>
-#include <kservice.h>
-#include <kurl.h>
-#include <konq_copytomenu.h>
-#include <kmodifierkeyinfo.h>
+#include <KFileItem>
+#include <QUrl>
+#include <KFileCopyToMenu>
+#include <QMenu>

 
 

-#include <QtCore/QObject>

 
 

-#include <QtCore/QVector>

 
 

-#include <QScopedPointer>

 
 

-class KMenu;
-class KFileItem;

 class QAction;
 class DolphinMainWindow;
 class KFileItemActions;
 class KFileItemListProperties;
 class QAction;
 class DolphinMainWindow;
 class KFileItemActions;
 class KFileItemListProperties;

+class DolphinRemoveAction;

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


@@ -52,14 +46,23 @@ class KFileItemListProperties;
  * - 'Actions':   Contains all actions which can be applied to the
  *                given item.
  */
  * - 'Actions':   Contains all actions which can be applied to the
  *                given item.
  */

-class DolphinContextMenu : public QObject
+class DolphinContextMenu : public QMenu

 {
     Q_OBJECT
 
 public:
 {
     Q_OBJECT
 
 public:

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

     /**
      * @parent        Pointer to the main window the context menu
      *                belongs to.
     /**
      * @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.
      * @fileInfo      Pointer to the file item the context menu
      *                is applied. If 0 is passed, the context menu
      *                is above the viewport.


@@ -67,40 +70,27 @@ public:
      *                should be opened.
      */
     DolphinContextMenu(DolphinMainWindow* parent,
      *                should be opened.
      */
     DolphinContextMenu(DolphinMainWindow* parent,

+                       const QPoint& pos,

                        const KFileItem& fileInfo,
                        const KFileItem& fileInfo,

-                       const KUrl& baseUrl);
+                       const QUrl& baseUrl);

 
     virtual ~DolphinContextMenu();
 
     void setCustomActions(const QList<QAction*>& actions);
 
 
     virtual ~DolphinContextMenu();
 
     void setCustomActions(const QList<QAction*>& actions);
 

-    /** Opens the context menu model. */
-    void 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.
+     * 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.

      */
      */

-    void slotKeyModifierPressed(Qt::Key key, bool pressed);
+    Command open();

 
 

-    /**
-     * Triggers the 'Delete'-action if the shift-key has been pressed, otherwise
-     * the 'Move to Trash'-action gets triggered.
-     */
-    void slotRemoveActionTriggered();
+protected:
+    virtual void keyPressEvent(QKeyEvent *ev) Q_DECL_OVERRIDE;
+    virtual void keyReleaseEvent(QKeyEvent *ev) Q_DECL_OVERRIDE;

 
 private:
     void openTrashContextMenu();
 
 private:
     void openTrashContextMenu();


@@ -108,33 +98,46 @@ private:
     void openItemContextMenu();
     void openViewportContextMenu();
 
     void openItemContextMenu();
     void openViewportContextMenu();
 

-    void insertDefaultItemActions();
+    void insertDefaultItemActions(const KFileItemListProperties&);

 
     /**
      * 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();
+    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;
+    KFileItem baseFileItem();

 
 

-    bool placeExists(const KUrl& url) const;
+    /**
+     * 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);

 
 

-    QAction* createPasteAction();
+    /**
+     * Adds actions that are provided by a KFileItemActionPlugin.
+     */
+    void addFileItemPluginActions();

 
 

-    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
 
 private:
     struct Entry


@@ -154,21 +157,24 @@ private:
         TrashContext = 2
     };
 
         TrashContext = 2
     };
 

+    QPoint m_pos;

     DolphinMainWindow* m_mainWindow;
     DolphinMainWindow* m_mainWindow;

-    KFileItemListProperties* m_capabilities;
+

     KFileItem m_fileInfo;
     KFileItem m_fileInfo;

-    KUrl m_baseUrl;
+
+    QUrl m_baseUrl;
+    KFileItem* m_baseFileItem;  /// File item for m_baseUrl
+

     KFileItemList m_selectedItems;
     KFileItemList m_selectedItems;

-    KUrl::List m_selectedUrls;
+    mutable KFileItemListProperties* m_selectedItemsProperties;
+

     int m_context;
     int m_context;

-    KonqCopyToMenu m_copyToMenu;
+    KFileCopyToMenu m_copyToMenu;

     QList<QAction*> m_customActions;
     QList<QAction*> m_customActions;

-    QScopedPointer<KMenu> m_popup;

 
 

-    bool m_shiftPressed;
-    QAction* m_removeAction; // Action that represents either 'Move To Trash' or 'Delete'
+    Command m_command;

 
 

-    static KModifierKeyInfo* m_keyInfo;
+    DolphinRemoveAction* m_removeAction; // Action that represents either 'Move To Trash' or 'Delete'

 };
 
 #endif
 };
 
 #endif