Merge branch 'Applications/18.04'

[dolphin.git] / src / dolphinpart.h

diff --git a/src/dolphinpart.h b/src/dolphinpart.h
index a23e08697c77671e7fed0aa3253c8e01980e5093..864c08344e11a20535248b94fe77bf46df29e006 100644 (file)
--- a/src/dolphinpart.h
+++ b/src/dolphinpart.h
@@ -20,25 +20,21 @@
 #ifndef DOLPHINPART_H
 #define DOLPHINPART_H
 
-#include <kparts/part.h>
-#include <kparts/browserextension.h>
-#include <kparts/fileinfoextension.h>
+#include <KParts/ReadOnlyPart>
 
-#include <QItemSelectionModel>
+#include <QUrl>
 
-class KNewFileMenu;
+class DolphinNewFileMenu;
 class DolphinViewActionHandler;
 class QActionGroup;
-class KAction;
 class KFileItemList;
 class KFileItem;
 class DolphinPartBrowserExtension;
-class DolphinSortFilterProxyModel;
 class DolphinRemoteEncoding;
-class DolphinModel;
 class KDirLister;
 class DolphinView;
 class KAboutData;
+class DolphinRemoveAction;
 
 class DolphinPart : public KParts::ReadOnlyPart
 {
@@ -54,11 +50,11 @@ class DolphinPart : public KParts::ReadOnlyPart
     Q_PROPERTY( QString nameFilter READ nameFilter WRITE setNameFilter )
 
     // Used by konqueror to implement the --select command-line option
-    Q_PROPERTY( KUrl::List filesToSelect READ filesToSelect WRITE setFilesToSelect )
+    Q_PROPERTY( QList<QUrl> filesToSelect READ filesToSelect WRITE setFilesToSelect )
 
 public:
     explicit DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantList& args);
-    ~DolphinPart();
+    ~DolphinPart() override;
 
     static KAboutData* createAboutData();
 
@@ -66,7 +62,7 @@ public:
      * Standard KParts::ReadOnlyPart openUrl method.
      * Called by Konqueror to view a directory in DolphinPart.
      */
-    virtual bool openUrl(const KUrl& url);
+    bool openUrl(const QUrl& url) override;
 
     /// see the supportsUndo property
     bool supportsUndo() const { return true; }
@@ -102,7 +98,7 @@ protected:
     /**
      * We reimplement openUrl so no need to implement openFile.
      */
-    virtual bool openFile() { return true; }
+    bool openFile() override { return true; }
 
 Q_SIGNALS:
     /**
@@ -117,8 +113,6 @@ Q_SIGNALS:
     void aboutToOpenURL();
 
 private Q_SLOTS:
-    void slotCompleted(const KUrl& url);
-    void slotCanceled(const KUrl& url);
     void slotMessage(const QString& msg);
     void slotErrorMessage(const QString& msg);
     /**
@@ -129,21 +123,27 @@ private Q_SLOTS:
     /**
      * Handles clicking on an item
      */
-    void slotItemTriggered(const KFileItem& item);
+    void slotItemActivated(const KFileItem& item);
+    /**
+     * Handles activation of multiple items
+     */
+    void slotItemsActivated(const KFileItemList& items);
     /**
      * Creates a new window showing the content of \a url.
      */
-    void createNewWindow(const KUrl& url);
+    void createNewWindow(const QUrl &url);
     /**
      * Opens the context menu on the current mouse position.
+     * @pos           Position in screen coordinates.
      * @item          File item context. If item is null, the context menu
      *                should be applied to \a url.
      * @url           URL which contains \a item.
      * @customActions Actions that should be added to the context menu,
      *                if the file item is null.
      */
-    void slotOpenContextMenu(const KFileItem& item,
-                             const KUrl& url,
+    void slotOpenContextMenu(const QPoint& pos,
+                             const KFileItem& item,
+                             const QUrl& url,
                              const QList<QAction*>& customActions);
 
     /**
@@ -152,7 +152,7 @@ private Q_SLOTS:
      * Testcase 1: fish://localhost
      * Testcase 2: showing a directory that is being renamed by another window (#180156)
      */
-    void slotRedirection(const KUrl& oldUrl, const KUrl& newUrl);
+    void slotDirectoryRedirection(const QUrl& oldUrl, const QUrl& newUrl);
 
     /**
      * Updates the state of the 'Edit' menu actions and emits
@@ -193,6 +193,11 @@ private Q_SLOTS:
      */
     void slotOpenTerminal();
 
+    /**
+     * Open KFind with the current path.
+     */
+    void slotFindFile();
+
     /**
      * Updates the 'Create New...' sub menu, just before it's shown.
      */
@@ -215,8 +220,10 @@ private Q_SLOTS:
     /**
      * Called by konqueror --select
      */
-    void setFilesToSelect(const KUrl::List& files);
-    KUrl::List filesToSelect() const { return KUrl::List(); } // silence moc
+    void setFilesToSelect(const QList<QUrl> &files);
+    QList<QUrl> filesToSelect() const { return QList<QUrl>(); } // silence moc
+
+    bool eventFilter(QObject*, QEvent*) override;
 
 private:
     void createActions();
@@ -231,50 +238,13 @@ private:
     DolphinView* m_view;
     DolphinViewActionHandler* m_actionHandler;
     DolphinRemoteEncoding* m_remoteEncoding;
-    KDirLister* m_dirLister;
-    DolphinModel* m_dolphinModel;
-    DolphinSortFilterProxyModel* m_proxyModel;
     DolphinPartBrowserExtension* m_extension;
-    KNewFileMenu* m_newFileMenu;
+    DolphinNewFileMenu* m_newFileMenu;
+    QAction* m_findFileAction;
+    QAction* m_openTerminalAction;
     QString m_nameFilter;
+    DolphinRemoveAction* m_removeAction;
     Q_DISABLE_COPY(DolphinPart)
 };
 
-class DolphinPartBrowserExtension : public KParts::BrowserExtension
-{
-    Q_OBJECT
-public:
-    DolphinPartBrowserExtension( DolphinPart* part )
-        : KParts::BrowserExtension( part ), m_part(part) {}
-
-    virtual void restoreState(QDataStream &stream);
-    virtual void saveState(QDataStream &stream);
-
-public Q_SLOTS:
-    void cut();
-    void copy();
-    void paste();
-    void pasteTo(const KUrl&);
-    void reparseConfiguration();
-
-private:
-    DolphinPart* m_part;
-};
-
-
-class DolphinPartFileInfoExtension : public KParts::FileInfoExtension
-{
-    Q_OBJECT
-
-public:
-    DolphinPartFileInfoExtension(DolphinPart* part);
-
-    virtual QueryModes supportedQueryModes() const;
-    virtual bool hasSelection() const;
-
-    virtual KFileItemList queryFor(QueryMode mode) const;
-protected:
-    DolphinPart* part() const;
-};
-
 #endif /* DOLPHINPART_H */