Fix selection rect after porting from QFontMetrics::width()

[dolphin.git] / src / dolphincontextmenu.h

diff --git a/src/dolphincontextmenu.h b/src/dolphincontextmenu.h
index 3d0005d30a21810546dabd754ea166427ada5870..3f36895ec0b62a09cc19e5ec390c8e089fd80576 100644 (file)
--- a/src/dolphincontextmenu.h
+++ b/src/dolphincontextmenu.h
@@ -20,23 +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 <QObject>
+#include <QMenu>
+#include <QUrl>

 
 

-#include <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


@@ -50,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 QObject
+class DolphinContextMenu : public QMenu

 {
     Q_OBJECT
 
 {
     Q_OBJECT
 


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

+        OpenParentFolder,

         OpenParentFolderInNewWindow,
         OpenParentFolderInNewTab
     };
         OpenParentFolderInNewWindow,
         OpenParentFolderInNewTab
     };


@@ -75,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,30 +86,9 @@ public:
      */
     Command open();
 
      */
     Command 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.
-     */
-    void slotKeyModifierPressed(Qt::Key key, bool pressed);
-
-    /**
-     * Triggers the 'Delete'-action if the shift-key has been pressed, otherwise
-     * the 'Move to Trash'-action gets triggered.
-     */
-    void slotRemoveActionTriggered();
+protected:
+    void keyPressEvent(QKeyEvent *ev) override;
+    void keyReleaseEvent(QKeyEvent *ev) override;

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


@@ -122,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


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

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

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


@@ -142,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)
+     * Adds "Open With" actions

      */
      */

-    void addServiceActions(KFileItemActions& fileItemActions);
-
-    /**
-     * Adds actions that are provided by a KFileItemActionPlugin.
-     */
-    void addFileItemPluginActions();
+    void addOpenWithActions(KFileItemActions& fileItemActions);

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


@@ -163,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
     {


@@ -192,7 +146,9 @@ private:
     {
         NoContext = 0,
         ItemContext = 1,
     {
         NoContext = 0,
         ItemContext = 1,

-        TrashContext = 2
+        TrashContext = 2,
+        TimelineContext = 4,
+        SearchContext = 8,

     };
 
     QPoint m_pos;
     };
 
     QPoint m_pos;


@@ -200,21 +156,21 @@ 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;
     QList<QAction*> m_customActions;

-    KMenu* m_popup;

 
     Command m_command;
 
 
     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'
+    void addDirectoryItemContextMenu(KFileItemActions &fileItemActions);
+

 };
 
 #endif
 };
 
 #endif