SVN_SILENT made messages (.desktop file) - always resolve ours

[dolphin.git] / src / dolphincontextmenu.h

diff --git a/src/dolphincontextmenu.h b/src/dolphincontextmenu.h
index b93df2b612db8bacd4b95b4bb4b165a5a38ac45d..627a6e3b84838e87011c66742f6a6847010b0cc6 100644 (file)
--- a/src/dolphincontextmenu.h
+++ b/src/dolphincontextmenu.h
@@ -9,6 +9,7 @@
 
 #include <KFileCopyToMenu>
 #include <KFileItem>
 
 #include <KFileCopyToMenu>
 #include <KFileItem>

+#include <KFileItemActions>

 
 #include <QMenu>
 #include <QUrl>
 
 #include <QMenu>
 #include <QUrl>


@@ -36,61 +37,43 @@ 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.

+     * @selectedItems The selected items for which the context menu
+     *                is opened. This list generally includes \a fileInfo.

      * @baseUrl       Base URL of the viewport where the context menu
      *                should be opened.
      */
     DolphinContextMenu(DolphinMainWindow* parent,
      * @baseUrl       Base URL of the viewport where the context menu
      *                should be opened.
      */
     DolphinContextMenu(DolphinMainWindow* parent,

-                       const QPoint& pos,

                        const KFileItem& fileInfo,
                        const KFileItem& fileInfo,

-                       const QUrl& baseUrl);
+                       const KFileItemList &selectedItems,
+                       const QUrl& baseUrl,
+                       KFileItemActions *fileItemActions);

 
     ~DolphinContextMenu() override;
 
 
     ~DolphinContextMenu() override;
 

-    void setCustomActions(const QList<QAction*>& actions);
+protected:
+    bool eventFilter(QObject* object, QEvent* event) override;

 
 

+private:

     /**
     /**

-     * 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.
+     * Adds all the actions and menus to this menu based on all given information.
+     * This method calls the other helper methods for adding actions
+     * based on the context given in the constructor.

      */
      */

-    Command open();
-
-protected:
-    void keyPressEvent(QKeyEvent *ev) override;
-    void keyReleaseEvent(QKeyEvent *ev) override;
+    void addAllActions();

 
 

-private:
-    void openTrashContextMenu();
-    void openTrashItemContextMenu();
-    void openItemContextMenu();
-    void openViewportContextMenu();
+    void addTrashContextMenu();
+    void addTrashItemContextMenu();
+    void addItemContextMenu();
+    void addViewportContextMenu();

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

-    /**
-     * Adds the "Show menubar" action to the menu if the
-     * menubar is hidden.
-     */
-    void addShowMenuBarAction();
-

     bool placeExists(const QUrl& url) const;
 
     QAction* createPasteAction();
     bool placeExists(const QUrl& url) const;
 
     QAction* createPasteAction();


@@ -105,18 +88,12 @@ private:
     /**
      * Adds "Open With" actions
      */
     /**
      * Adds "Open With" actions
      */

-    void addOpenWithActions(KFileItemActions& fileItemActions);
+    void addOpenWithActions();

 
     /**
 
     /**

-     * Adds actions that are provided by a KVersionControlPlugin.
+     * Add services, custom actions, plugins and version control items to the menu

      */
      */

-    void addVersionControlPluginActions();
-
-    /**
-     * Adds custom actions e.g. like the "[x] Expandable Folders"-action
-     * provided in the details view.
-     */
-    void addCustomActions();
+    void addAdditionalActions(const KFileItemListProperties &props);

 
 private:
     struct Entry
 
 private:
     struct Entry


@@ -138,7 +115,6 @@ private:
         SearchContext = 8,
     };
 
         SearchContext = 8,
     };
 

-    QPoint m_pos;

     DolphinMainWindow* m_mainWindow;
 
     KFileItem m_fileInfo;
     DolphinMainWindow* m_mainWindow;
 
     KFileItem m_fileInfo;


@@ -151,12 +127,10 @@ private:
 
     int m_context;
     KFileCopyToMenu m_copyToMenu;
 
     int m_context;
     KFileCopyToMenu m_copyToMenu;

-    QList<QAction*> m_customActions;
-
-    Command m_command;

 
     DolphinRemoveAction* m_removeAction; // Action that represents either 'Move To Trash' or 'Delete'
 
     DolphinRemoveAction* m_removeAction; // Action that represents either 'Move To Trash' or 'Delete'

-    void addDirectoryItemContextMenu(KFileItemActions &fileItemActions);
+    void addDirectoryItemContextMenu();
+    KFileItemActions *m_fileItemActions;

 
 };
 
 
 };