Reimplement handling of Shift while showing menu without KModifierKeyInfo

[dolphin.git] / src / dolphincontextmenu.h

diff --git a/src/dolphincontextmenu.h b/src/dolphincontextmenu.h
index 75a6e35e856dbc8cf55fa871f6d258250c6624a8..1c65fab138307dac0c848ee42c858d07e6393690 100644 (file)
--- a/src/dolphincontextmenu.h
+++ b/src/dolphincontextmenu.h
@@ -24,6 +24,7 @@
 #include <KService>
 #include <KUrl>
 #include <konq_copytomenu.h>
+#include <KMenu>
 
 #include <QObject>
 
@@ -31,8 +32,6 @@
 
 #include <QScopedPointer>
 
-class KMenu;
-class KFileItem;
 class QAction;
 class DolphinMainWindow;
 class KFileItemActions;
@@ -50,7 +49,7 @@ class KFileItemListProperties;
  * - 'Actions':   Contains all actions which can be applied to the
  *                given item.
  */
-class DolphinContextMenu : public QObject
+class DolphinContextMenu : public KMenu
 {
     Q_OBJECT
 
@@ -91,25 +90,11 @@ public:
      */
     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();
+protected:
+    virtual void keyPressEvent(QKeyEvent *ev);
+    virtual void keyReleaseEvent(QKeyEvent *ev);
 
 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.
@@ -130,11 +115,6 @@ private:
      */
     void addShowMenuBarAction();
 
-    /**
-     * 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();
@@ -214,7 +194,6 @@ private:
     int m_context;
     KonqCopyToMenu m_copyToMenu;
     QList<QAction*> m_customActions;
-    KMenu* m_popup;
 
     Command m_command;