Merge branch 'release/20.12'

[dolphin.git] / src / dolphinmainwindow.h

diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index 251f50d8d0fbd2d4488c2dab4bd1797d69fa96e4..883d92b699327d7463ef4424c5efdb28138abee5 100644 (file)
--- a/src/dolphinmainwindow.h
+++ b/src/dolphinmainwindow.h
@@ -65,19 +65,12 @@ public:
      * having a split view setup, the nonactive view
      * is usually shown in darker colors.
      */
-    DolphinViewContainer *activeViewContainer() const;
+    DolphinViewContainer* activeViewContainer() const;
 
     /**
-     * Returns the active view containers of all tabs.
-     * @see activeViewContainer()
-     * Use viewContainers() to also include the inactive ones.
+     * Returns view container for all tabs
      */
-    QVector<DolphinViewContainer *> activeViewContainers() const;
-
-    /**
-     * Returns all view containers.
-     */
-    QVector<DolphinViewContainer *> viewContainers() const;
+    QVector<DolphinViewContainer*> viewContainers() const;
 
     /**
      * Opens each directory in \p dirs in a separate tab. If \a splitView is set,
@@ -177,14 +170,9 @@ public slots:
     void quit();
 
     /**
-     * Opens a new tab and places it after the current tab
-     */
-    void openNewTabAfterCurrentTab(const QUrl& url);
-
-    /**
-     * Opens a new tab and places it as the last tab
+     * Opens a new tab in the background showing the URL \a url.
      */
-    void openNewTabAfterLastTab(const QUrl& url);
+    void openNewTab(const QUrl& url);
 
 signals:
     /**
@@ -228,6 +216,14 @@ protected:
     /** Handles QWhatsThisClickedEvent and passes all others on. */
     bool eventFilter(QObject*, QEvent*) override;
 
+protected slots:
+    /**
+     * Calls the base method KXmlGuiWindow::saveNewToolbarConfig().
+     * Is also used to set toolbar constraints and UrlNavigator position
+     * based on the newly changed toolbar configuration.
+     */
+    void saveNewToolbarConfig() override;
+
 private slots:
     /**
      * Refreshes the views of the main window by recreating them according to
@@ -311,12 +307,7 @@ private slots:
     void disableStopAction();
 
     void showFilterBar();
-
-    /**
-     * Toggle between either using an UrlNavigator in the toolbar or the
-     * ones in the location bar for navigating.
-     */
-    void toggleLocationInToolbar();
+    void toggleFilterBar();
 
     /**
      * Toggles between edit and browse mode of the navigation bar.
@@ -421,11 +412,6 @@ private slots:
      */
     void addToPlaces();
 
-    /**
-     * Opens a new tab in the background showing the URL \a url.
-     */
-    void openNewTab(const QUrl& url, DolphinTabWidget::TabPlacement tabPlacement);
-
     /**
      * Opens the selected folder in a new tab.
      */
@@ -606,6 +592,11 @@ private:
      */
     void updateSplitAction();
 
+    /**
+     * Sets the window sides the toolbar may be moved to based on toolbar contents.
+     */
+    void updateAllowedToolbarAreas();
+
     bool isKompareInstalled() const;
 
     /**
@@ -662,6 +653,9 @@ private:
     KToolBarPopupAction* m_backAction;
     KToolBarPopupAction* m_forwardAction;
 
+    /** Makes sure that only one object is ever connected to the history. */
+    QMetaObject::Connection m_updateHistoryConnection;
+
     QMenu m_searchTools;
 
 };