X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/ad5d3367c7fef4c3c11188a768f21a2ee2b3c025..3d49996615a094df8fc2cb613955abb740a0463a:/src/dolphinviewcontainer.h

diff --git a/src/dolphinviewcontainer.h b/src/dolphinviewcontainer.h
index 822d8072d..1a92e1fa6 100644
--- a/src/dolphinviewcontainer.h
+++ b/src/dolphinviewcontainer.h
@@ -28,7 +28,6 @@ namespace KActivities {
 class FilterBar;
 class KMessageWidget;
 class QUrl;
-class KUrlNavigator;
 class DolphinSearchBox;
 class DolphinStatusBar;
 
@@ -90,9 +89,9 @@ public:
      *          or nullptr if there is none.
      * @see connectUrlNavigator()
      * @see disconnectUrlNavigator()
-     * 
-     * Use urlNavigatorInternal() if you want to access the history.
-     * @see urlNavigatorInternal()
+     *
+     * Use urlNavigatorInternalWithHistory() if you want to access the history.
+     * @see urlNavigatorInternalWithHistory()
      */
     const DolphinUrlNavigator *urlNavigator() const;
     /**
@@ -100,9 +99,9 @@ public:
      *          or nullptr if there is none.
      * @see connectUrlNavigator()
      * @see disconnectUrlNavigator()
-     * 
-     * Use urlNavigatorInternal() if you want to access the history.
-     * @see urlNavigatorInternal()
+     *
+     * Use urlNavigatorInternalWithHistory() if you want to access the history.
+     * @see urlNavigatorInternalWithHistory()
      */
     DolphinUrlNavigator *urlNavigator();
 
@@ -110,12 +109,12 @@ public:
      * @return An UrlNavigator that contains this view's history.
      * Use urlNavigator() instead when not accessing the history.
      */
-    const DolphinUrlNavigator *urlNavigatorInternal() const;
+    const DolphinUrlNavigator *urlNavigatorInternalWithHistory() const;
     /**
      * @return An UrlNavigator that contains this view's history.
      * Use urlNavigator() instead when not accessing the history.
      */
-    DolphinUrlNavigator *urlNavigatorInternal();
+    DolphinUrlNavigator *urlNavigatorInternalWithHistory();
 
     const DolphinView* view() const;
     DolphinView* view();
@@ -126,11 +125,6 @@ public:
      */
     void connectUrlNavigator(DolphinUrlNavigator *urlNavigator);
 
-    inline void connectToInternalUrlNavigator()
-    {
-        connectUrlNavigator(m_urlNavigator);
-    }
-
     /**
      * Disconnects the navigator that is currently controling the view.
      * This method completely reverses connectUrlNavigator().
@@ -180,7 +174,16 @@ public:
      */
     QString caption() const;
 
-public slots:
+    /**
+     * Disable/enable the behavior of "select child when moving to parent folder"
+     * offered by KUrlNavigator.
+     *
+     * See KUrlNavigator::urlSelectionRequested
+     */
+    void disableUrlNavigatorSelectionRequests();
+    void enableUrlNavigatorSelectionRequests();
+
+public Q_SLOTS:
     /**
      * Sets the current active URL, where all actions are applied. The
      * URL navigator is synchronized with this URL. The signals
@@ -203,7 +206,7 @@ public slots:
      */
     void setSearchModeEnabled(bool enabled);
 
-signals:
+Q_SIGNALS:
     /**
      * Is emitted whenever the filter bar has changed its visibility state.
      */
@@ -220,7 +223,7 @@ signals:
      */
     void writeStateChanged(bool isFolderWritable);
 
-private slots:
+private Q_SLOTS:
     /**
      * Updates the number of items (= number of files + number of
      * directories) in the statusbar. If files are selected, the number
@@ -243,8 +246,6 @@ private slots:
 
     void updateDirectorySortingProgress(int percent);
 
-    void updateNavigatorWidgetVisibility();
-
     /**
      * Updates the statusbar to show an undetermined progress with the correct
      * context information whether a searching or a directory loading is done.
@@ -368,21 +369,20 @@ private:
 
 private:
     QVBoxLayout* m_topLayout;
-    QWidget* m_navigatorWidget;
 
     /**
-     * The UrlNavigator within the m_navigatorWidget. m_urlNavigator is
-     * used even when another UrlNavigator is controlling the view to keep
-     * track of this view containers history.
+     * The internal UrlNavigator which is never visible to the user.
+     * m_urlNavigator is used even when another UrlNavigator is controlling
+     * the view to keep track of this object's history.
      */
-    DolphinUrlNavigator *m_urlNavigator;
+    std::unique_ptr<DolphinUrlNavigator> m_urlNavigator;
 
     /**
-     * The UrlNavigator that is currently connected to the view. This could
-     * either be m_urlNavigator, the urlNavigator in the toolbar or nullptr.
+     * The UrlNavigator that is currently connected to the view.
+     * This is a nullptr if no UrlNavigator is connected.
+     * Otherwise it's one of the UrlNavigators visible in the toolbar.
      */
     QPointer<DolphinUrlNavigator> m_urlNavigatorConnected;
-    QPushButton* m_emptyTrashButton;
     DolphinSearchBox* m_searchBox;
     bool m_searchModeEnabled;
     KMessageWidget* m_messageWidget;
@@ -395,6 +395,11 @@ private:
     QTimer* m_statusBarTimer;            // Triggers a delayed update
     QElapsedTimer m_statusBarTimestamp;  // Time in ms since last update
     bool m_autoGrabFocus;
+    /**
+     * The visual state to be applied to the next UrlNavigator that gets
+     * connected to this ViewContainer.
+     */
+    std::unique_ptr<DolphinUrlNavigator::VisualState> m_urlNavigatorVisualState;
 
 #ifdef HAVE_KACTIVITIES
 private: