┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src/dolphinmainwindow.h
diff options
context:
space:
mode:
authorFelix Ernst <[email protected]>2020-09-20 18:53:59 +0200
committerElvis Angelaccio <[email protected]>2020-11-09 23:49:07 +0100
commit37327c9b0aae112c5890703cba1f0157043007e0 (patch)
tree5cda9876f310a258b95226bc0d9681acc665f98e /src/dolphinmainwindow.h
parent6151a7aec0516570926cb1d15da48936e38e6765 (diff)
Make UrlNavigators in the toolbar the only option
The UrlNavigators will be automatically added to the toolbar. The Sort By action is removed from the default toolbar to make space. Remove all options to have UrlNavigators outside the toolbar and remove those code paths. Make it so the new NavigatorsWidgetAction contains two UrlNavigators when in split view mode. Spacing was also added to align these UrlNavigators with the ViewContainers when enough space is available. Force the toolbar to be either at the top or bottom of the window. Set a sane sizeHint for DolphinUrlNavigator. It would be better to do this in KUrlNavigator in the future. This commit also contains a changes which should be moved to a separate merge requests before this gets merged: - Add an expansion animation when split view is enabled by the user
Diffstat (limited to 'src/dolphinmainwindow.h')
-rw-r--r--src/dolphinmainwindow.h16
1 files changed, 3 insertions, 13 deletions
diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index 251f50d8d..173e017c9 100644
--- a/src/dolphinmainwindow.h
+++ b/src/dolphinmainwindow.h
@@ -69,17 +69,10 @@ public:
/**
* Returns the active view containers of all tabs.
- * @see activeViewContainer()
- * Use viewContainers() to also include the inactive ones.
*/
QVector<DolphinViewContainer *> activeViewContainers() const;
/**
- * Returns all view containers.
- */
- QVector<DolphinViewContainer *> viewContainers() const;
-
- /**
* Opens each directory in \p dirs in a separate tab. If \a splitView is set,
* 2 directories are collected within one tab.
* \pre \a dirs must contain at least one url.
@@ -313,12 +306,6 @@ private slots:
void showFilterBar();
/**
- * Toggle between either using an UrlNavigator in the toolbar or the
- * ones in the location bar for navigating.
- */
- void toggleLocationInToolbar();
-
- /**
* Toggles between edit and browse mode of the navigation bar.
*/
void toggleEditLocation();
@@ -662,6 +649,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;
};