diff options
| author | Felix Ernst <[email protected]> | 2020-06-14 16:20:02 +0200 |
|---|---|---|
| committer | Elvis Angelaccio <[email protected]> | 2020-11-09 23:49:07 +0100 |
| commit | ad5d3367c7fef4c3c11188a768f21a2ee2b3c025 (patch) | |
| tree | fa59507fdc29060eba061b776c74c53e57b8b668 /src/dolphinmainwindow.h | |
| parent | 880766bd56c0331f39ecffaa08974b5117e3d72a (diff) | |
Add an option to use an UrlNavigator in the toolbar instead
This commit adds a locationInToolbar KToggleAction to switch between
using a location bar to navigate or using a new custom QWidgetAction
in the toolbar.
A big portion of this MR is refactoring because until now the
UrlNavigator was tightly intertwined with the DolphinViewContainer.
With this MR an UrlNavigator for controlling a View can be freely
connected or disconnected with a single method call.
A DolphinUrlNavigator class is created in the process which contains all
Dolphin-specific UrlNavigator code which did previously reside in the
DolphinViewContainer class. Other application parts that belong to
UrlNavigator-management are also moved here.
Diffstat (limited to 'src/dolphinmainwindow.h')
| -rw-r--r-- | src/dolphinmainwindow.h | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h index a56215fa7..529319e2a 100644 --- a/src/dolphinmainwindow.h +++ b/src/dolphinmainwindow.h @@ -68,9 +68,14 @@ public: DolphinViewContainer* activeViewContainer() const; /** - * Returns view container for all tabs + * 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. */ - QVector<DolphinViewContainer*> viewContainers() const; + QVector<DolphinViewContainer*> viewContainers(bool includeInactive = true) const; /** * Opens each directory in \p dirs in a separate tab. If \a splitView is set, @@ -306,6 +311,12 @@ 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(); |
