Merge branch 'Applications/18.08'

[dolphin.git] / src / dolphincontextmenu.h

diff --git a/src/dolphincontextmenu.h b/src/dolphincontextmenu.h
index 1c65fab138307dac0c848ee42c858d07e6393690..bf0cf2c97c8935cc51711001855b3c9ea69a9eff 100644 (file)
--- a/src/dolphincontextmenu.h
+++ b/src/dolphincontextmenu.h
@@ -20,22 +20,17 @@
 #ifndef DOLPHINCONTEXTMENU_H
 #define DOLPHINCONTEXTMENU_H
 
 #ifndef DOLPHINCONTEXTMENU_H
 #define DOLPHINCONTEXTMENU_H
 

+#include <KFileCopyToMenu>

 #include <KFileItem>
 #include <KFileItem>

-#include <KService>
-#include <KUrl>
-#include <konq_copytomenu.h>
-#include <KMenu>

 
 

-#include <QObject>
-
-#include <QVector>
-
-#include <QScopedPointer>
+#include <QMenu>
+#include <QUrl>

 
 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


@@ -49,7 +44,7 @@ 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 KMenu
+class DolphinContextMenu : public QMenu

 {
     Q_OBJECT
 
 {
     Q_OBJECT
 


@@ -57,6 +52,7 @@ public:
     enum Command
     {
         None,
     enum Command
     {
         None,

+        OpenParentFolder,

         OpenParentFolderInNewWindow,
         OpenParentFolderInNewTab
     };
         OpenParentFolderInNewWindow,
         OpenParentFolderInNewTab
     };


@@ -74,9 +70,9 @@ public:
     DolphinContextMenu(DolphinMainWindow* parent,
                        const QPoint& pos,
                        const KFileItem& fileInfo,
     DolphinContextMenu(DolphinMainWindow* parent,
                        const QPoint& pos,
                        const KFileItem& fileInfo,

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

 
 

-    virtual ~DolphinContextMenu();
+    ~DolphinContextMenu() override;

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


@@ -91,15 +87,8 @@ public:
     Command open();
 
 protected:
     Command open();
 
 protected:

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

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


@@ -107,7 +96,7 @@ 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
 
     /**
      * Adds the "Show menubar" action to the menu if the


@@ -115,7 +104,7 @@ private:
      */
     void addShowMenuBarAction();
 
      */
     void addShowMenuBarAction();
 

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

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


@@ -127,15 +116,9 @@ private:
     KFileItem baseFileItem();
 
     /**
     KFileItem baseFileItem();
 
     /**

-     * 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);
-
-    /**
-     * Adds actions that are provided by a KFileItemActionPlugin.
+     * Adds "Open With" actions

      */
      */

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

 
     /**
      * Adds actions that are provided by a KVersionControlPlugin.
 
     /**
      * Adds actions that are provided by a KVersionControlPlugin.


@@ -148,20 +131,6 @@ private:
      */
     void addCustomActions();
 
      */
     void addCustomActions();
 

-    /**
-     * Updates m_removeAction to represent the 'Delete'-action if the shift-key
-     * has been pressed or the selection is not local. Otherwise it represents
-     * the 'Move to Trash'-action.
-     */
-    void updateRemoveAction();
-
-    /**
-     * @return True if a moving to the trash should be done instead of
-     *         deleting the selected items.
-     * @see updateRemoveAction(), slotRemoveActionTriggered()
-     */
-    bool moveToTrash() const;
-

 private:
     struct Entry
     {
 private:
     struct Entry
     {


@@ -185,20 +154,19 @@ private:
 
     KFileItem m_fileInfo;
 
 
     KFileItem m_fileInfo;
 

-    KUrl m_baseUrl;
+    QUrl m_baseUrl;

     KFileItem* m_baseFileItem;  /// File item for m_baseUrl
 
     KFileItemList m_selectedItems;
     mutable KFileItemListProperties* m_selectedItemsProperties;
 
     int m_context;
     KFileItem* m_baseFileItem;  /// File item for m_baseUrl
 
     KFileItemList m_selectedItems;
     mutable KFileItemListProperties* m_selectedItemsProperties;
 
     int m_context;

-    KonqCopyToMenu m_copyToMenu;
+    KFileCopyToMenu m_copyToMenu;

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

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

 };
 
 #endif
 };
 
 #endif