Merge branch 'Applications/18.08'

[dolphin.git] / src / dolphinviewcontainer.h

diff --git a/src/dolphinviewcontainer.h b/src/dolphinviewcontainer.h
index 4ca76961c546806786f4c35b45320521d8a62e85..409aecfcfaf6e0ab063cb2db221eb543164e9d84 100644 (file)
--- a/src/dolphinviewcontainer.h
+++ b/src/dolphinviewcontainer.h
@@ -20,19 +20,18 @@
 #ifndef DOLPHINVIEWCONTAINER_H
 #define DOLPHINVIEWCONTAINER_H
 
 #ifndef DOLPHINVIEWCONTAINER_H
 #define DOLPHINVIEWCONTAINER_H
 

-#include <KFileItem>
-#include <KFileItemDelegate>
+#include "config-dolphin.h"
+#include "views/dolphinview.h"
+

 #include <KCompletion>
 #include <KCompletion>

+#include <KFileItem>

 #include <KIO/Job>
 #include <KIO/Job>

-

 #include <KUrlNavigator>
 
 #include <QElapsedTimer>
 #include <KUrlNavigator>
 
 #include <QElapsedTimer>

+#include <QPushButton>

 #include <QWidget>
 
 #include <QWidget>
 

-#include <views/dolphinview.h>
-#include <config-dolphin.h>
-

 #ifdef KF5Activities_FOUND
 namespace KActivities {
     class ResourceInstance;
 #ifdef KF5Activities_FOUND
 namespace KActivities {
     class ResourceInstance;


@@ -41,7 +40,7 @@ namespace KActivities {
 
 class FilterBar;
 class KMessageWidget;
 
 class FilterBar;
 class KMessageWidget;

-class KUrl;
+class QUrl;

 class KUrlNavigator;
 class DolphinSearchBox;
 class DolphinStatusBar;
 class KUrlNavigator;
 class DolphinSearchBox;
 class DolphinStatusBar;


@@ -70,14 +69,14 @@ public:
         Error
     };
 
         Error
     };
 

-    DolphinViewContainer(const KUrl& url, QWidget* parent);
-    virtual ~DolphinViewContainer();
+    DolphinViewContainer(const QUrl& url, QWidget* parent);
+    ~DolphinViewContainer() override;

 
     /**
      * Returns the current active URL, where all actions are applied.
      * The URL navigator is synchronized with this URL.
      */
 
     /**
      * Returns the current active URL, where all actions are applied.
      * The URL navigator is synchronized with this URL.
      */

-    KUrl url() const;
+    QUrl url() const;

 
     /**
      * If \a active is true, the view container will marked as active. The active
 
     /**
      * If \a active is true, the view container will marked as active. The active


@@ -94,6 +93,8 @@ public:
     void setAutoGrabFocus(bool grab);
     bool autoGrabFocus() const;
 
     void setAutoGrabFocus(bool grab);
     bool autoGrabFocus() const;
 

+    QString currentSearchText() const;
+

     const DolphinStatusBar* statusBar() const;
     DolphinStatusBar* statusBar();
 
     const DolphinStatusBar* statusBar() const;
     DolphinStatusBar* statusBar();
 


@@ -130,6 +131,18 @@ public:
      */
     QString placesText() const;
 
      */
     QString placesText() const;
 

+    /**
+     * Reload the view of this container. This will also hide messages in a messagewidget.
+     */
+    void reload();
+
+    /**
+     * @return Returns a Caption suitable for display to the user. It is
+     * calculated depending on settings, if a search is active and other
+     * factors.
+     */
+    QString caption() const;
+

 public slots:
     /**
      * Sets the current active URL, where all actions are applied. The
 public slots:
     /**
      * Sets the current active URL, where all actions are applied. The


@@ -138,7 +151,7 @@ public slots:
      * are emitted.
      * @see DolphinViewContainer::urlNavigator()
      */
      * are emitted.
      * @see DolphinViewContainer::urlNavigator()
      */

-    void setUrl(const KUrl& url);
+    void setUrl(const QUrl& url);

 
     /**
      * Popups the filter bar above the status bar if \a visible is true.
 
     /**
      * Popups the filter bar above the status bar if \a visible is true.


@@ -205,7 +218,7 @@ private slots:
      * Is called if the URL set by DolphinView::setUrl() represents
      * a file and not a directory. Takes care to activate the file.
      */
      * Is called if the URL set by DolphinView::setUrl() represents
      * a file and not a directory. Takes care to activate the file.
      */

-    void slotUrlIsFileError(const KUrl& url);
+    void slotUrlIsFileError(const QUrl& url);

 
     /**
      * Handles clicking on an item. If the item is a directory, the
 
     /**
      * Handles clicking on an item. If the item is a directory, the


@@ -240,48 +253,29 @@ private slots:
      */
     void activate();
 
      */
     void activate();
 

-    /**
-     * Is invoked if the signal urlAboutToBeChanged() from the DolphinView
-     * is emitted. Tries to save the view-state.
-     */
-    void slotViewUrlAboutToBeChanged(const KUrl& url);
-

     /**
      * Is invoked if the signal urlAboutToBeChanged() from the URL navigator
      * is emitted. Tries to save the view-state.
      */
     /**
      * Is invoked if the signal urlAboutToBeChanged() from the URL navigator
      * is emitted. Tries to save the view-state.
      */

-    void slotUrlNavigatorLocationAboutToBeChanged(const KUrl& url);
+    void slotUrlNavigatorLocationAboutToBeChanged(const QUrl& url);

 
     /**
      * Restores the current view to show \a url and assures
      * that the root URL of the view is respected.
      */
 
     /**
      * Restores the current view to show \a url and assures
      * that the root URL of the view is respected.
      */

-    void slotUrlNavigatorLocationChanged(const KUrl& url);
-
-    /**
-     * Is connected with the URL navigator and drops the URLs
-     * above the destination \a destination.
-     *
-     * Creates a copy of \a event and invokes \a dropUrlsDelayed with a
-     * queued connection.
-     */
-    void dropUrls(const KUrl& destination, QDropEvent* event);
+    void slotUrlNavigatorLocationChanged(const QUrl& url);

 
     /**
 
     /**

-     * Is invoked with a queued connection by \a dropUrls to prevent that the
-     * drop actions are executed in the URL navigator menu's nested event loop,
-     * which might cause a crash. Simply using a queued connection from the URL
-     * navigator to \a dropUrls would not work because the \a event pointer
-     * would be dangling then.
+     * @see KUrlNavigator::urlSelectionRequested

      */
      */

-    void dropUrlsDelayed();
+    void slotUrlSelectionRequested(const QUrl& url);

 
     /**
      * Is invoked when a redirection is done and changes the
      * URL of the URL navigator to \a newUrl without triggering
      * a reloading of the directory.
      */
 
     /**
      * Is invoked when a redirection is done and changes the
      * URL of the URL navigator to \a newUrl without triggering
      * a reloading of the directory.
      */

-    void redirect(const KUrl& oldUrl, const KUrl& newUrl);
+    void redirect(const QUrl& oldUrl, const QUrl& newUrl);

 
     /** Requests the focus for the view \a m_view. */
     void requestFocus();
 
     /** Requests the focus for the view \a m_view. */
     void requestFocus();


@@ -292,8 +286,6 @@ private slots:
      */
     void saveUrlCompletionMode(KCompletion::CompletionMode completion);
 
      */
     void saveUrlCompletionMode(KCompletion::CompletionMode completion);
 

-    void slotHistoryChanged();
-

     void slotReturnPressed();
 
     /**
     void slotReturnPressed();
 
     /**


@@ -319,7 +311,7 @@ private:
     /**
      * @return True if the URL protocol is a search URL (e. g. baloosearch:// or filenamesearch://).
      */
     /**
      * @return True if the URL protocol is a search URL (e. g. baloosearch:// or filenamesearch://).
      */

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

 
     /**
      * Saves the state of the current view: contents position,
 
     /**
      * Saves the state of the current view: contents position,


@@ -327,9 +319,17 @@ private:
      */
     void saveViewState();
 
      */
     void saveViewState();
 

+    /**
+     * Restores the state of the current view iff the URL navigator contains a
+     * non-empty location state.
+     */
+    void tryRestoreViewState();
+

 private:
     QVBoxLayout* m_topLayout;
 private:
     QVBoxLayout* m_topLayout;

+    QWidget* m_navigatorWidget;

     KUrlNavigator* m_urlNavigator;
     KUrlNavigator* m_urlNavigator;

+    QPushButton* m_emptyTrashButton;

     DolphinSearchBox* m_searchBox;
     KMessageWidget* m_messageWidget;
 
     DolphinSearchBox* m_searchBox;
     KMessageWidget* m_messageWidget;
 


@@ -342,9 +342,6 @@ private:
     QElapsedTimer m_statusBarTimestamp;  // Time in ms since last update
     bool m_autoGrabFocus;
 
     QElapsedTimer m_statusBarTimestamp;  // Time in ms since last update
     bool m_autoGrabFocus;
 

-    KUrl m_dropDestination;
-    QScopedPointer<QDropEvent> m_dropEvent;
-

 #ifdef KF5Activities_FOUND
 private:
     KActivities::ResourceInstance * m_activityResourceInstance;
 #ifdef KF5Activities_FOUND
 private:
     KActivities::ResourceInstance * m_activityResourceInstance;