X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/ad5d3367c7fef4c3c11188a768f21a2ee2b3c025..f65b0899c3666561cafac14f67ab0bb8a5bfa00a:/src/dolphinmainwindow.h

diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index 529319e2a..921f5a4c9 100644
--- a/src/dolphinmainwindow.h
+++ b/src/dolphinmainwindow.h
@@ -68,14 +68,9 @@ public:
     DolphinViewContainer* activeViewContainer() const;
 
     /**
-     * Returns view containers for all tabs
-     * @param includeInactive   When true all view containers available in
-     *                          this window are returned. When false the
-     *                          view containers of split views that are not
-     *                          currently active are ignored.
-     *                          Default is true.
+     * Returns view container for all tabs
      */
-    QVector<DolphinViewContainer*> viewContainers(bool includeInactive = true) const;
+    QVector<DolphinViewContainer*> viewContainers() const;
 
     /**
      * Opens each directory in \p dirs in a separate tab. If \a splitView is set,
@@ -116,7 +111,7 @@ public:
     bool isFoldersPanelEnabled() const;
     bool isInformationPanelEnabled() const;
 
-public slots:
+public Q_SLOTS:
     /**
      * Opens each directory in \p dirs in a separate tab. If \a splitView is set,
      * 2 directories are collected within one tab.
@@ -175,16 +170,11 @@ 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:
+Q_SIGNALS:
     /**
      * Is sent if the selection of the currently active view has
      * been changed.
@@ -226,7 +216,15 @@ protected:
     /** Handles QWhatsThisClickedEvent and passes all others on. */
     bool eventFilter(QObject*, QEvent*) override;
 
-private slots:
+protected Q_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 Q_SLOTS:
     /**
      * Refreshes the views of the main window by recreating them according to
      * the given Dolphin settings.
@@ -309,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.
@@ -419,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.
      */
@@ -604,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;
 
     /**
@@ -660,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;
 
 };