X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/9ed13b31b458bc4d41c7b1c5bbc472fce3554d8d..d6488887ecf69d7f192b94de8dce34fae0b7eb76:/src/dolphincontextmenu.h

diff --git a/src/dolphincontextmenu.h b/src/dolphincontextmenu.h
index 09288c602..c90999252 100644
--- a/src/dolphincontextmenu.h
+++ b/src/dolphincontextmenu.h
@@ -20,13 +20,14 @@
 #ifndef DOLPHINCONTEXTMENU_H
 #define DOLPHINCONTEXTMENU_H
 
-#include <kdedesktopmimetype.h>
+#include <kdesktopfileactions.h>
 #include <kfileitem.h>
 #include <kservice.h>
 #include <kurl.h>
 
-#include <QString>
-#include <QVector>
+#include <QtCore/QObject>
+
+#include <QtCore/QVector>
 
 class KMenu;
 class KFileItem;
@@ -45,15 +46,11 @@ class DolphinMainWindow;
  * - 'Actions':   Contains all actions which can be applied to the
  *                given item.
  */
-class DolphinContextMenu
+class DolphinContextMenu : public QObject
 {
-public:
-    enum ViewType
-    {
-        ItemsView,
-        SidebarView
-    };
+    Q_OBJECT
 
+public:
     /**
      * @parent        Pointer to the main window the context menu
      *                belongs to.
@@ -62,16 +59,14 @@ public:
      *                is above the viewport.
      * @baseUrl       Base URL of the viewport where the context menu
      *                should be opened.
-     * @viewType      On which view type is the context menu shown.
      */
     DolphinContextMenu(DolphinMainWindow* parent,
-                       KFileItem* fileInfo,
-                       const KUrl& baseUrl,
-                       ViewType viewType = ItemsView);
+                       const KFileItem& fileInfo,
+                       const KUrl& baseUrl);
 
     virtual ~DolphinContextMenu();
 
-    /** Opens the context menu modal. */
+    /** Opens the context menu model. */
     void open();
 
 private:
@@ -95,16 +90,6 @@ private:
     QList<QAction*> insertOpenWithItems(KMenu* popup,
                                         QVector<KService::Ptr>& openWithVector);
 
-    /**
-     * Inserts the 'Actions...' submenu to \a popup.
-     * @param popup          Menu where the 'Actions...' sub menu should
-     *                       be added.
-     * @param openWithVector Output parameter which contains all 'Actions...'
-     *                       services.
-     */
-    QList<QAction*> insertActionItems(KMenu* popup,
-                                      QVector<KDEDesktopMimeType::Service>& actionsVector);
-
     /**
      * Returns true, if 'menu' contains already
      * an entry with the name 'entryName'.
@@ -112,8 +97,15 @@ private:
     bool containsEntry(const KMenu* menu,
                        const QString& entryName) const;
 
+    /**
+     * Adds the "Show menubar" action to the menu if the
+     * menubar is hidden.
+     */
+    void addShowMenubarAction(KMenu* menu);
+
 private:
-    struct Entry {
+    struct Entry
+    {
         int type;
         QString name;
         QString filePath;     // empty for separator
@@ -122,18 +114,18 @@ private:
         QString comment;
     };
 
-    enum ContextType {
+    enum ContextType
+    {
         NoContext = 0,
         ItemContext = 1,
         TrashContext = 2
     };
 
     DolphinMainWindow* m_mainWindow;
-    KFileItem* m_fileInfo;
+    KFileItem m_fileInfo;
     KUrl m_baseUrl;
     KFileItemList m_selectedItems;
     KUrl::List m_selectedUrls;
-    ViewType m_viewType;
     int m_context;
 };