From ad5d3367c7fef4c3c11188a768f21a2ee2b3c025 Mon Sep 17 00:00:00 2001
From: Felix Ernst <fe.a.ernst@gmail.com>
Date: Sun, 14 Jun 2020 16:20:02 +0200
Subject: 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.
---
 src/dolphinui.rc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/dolphinui.rc')

diff --git a/src/dolphinui.rc b/src/dolphinui.rc
index 46a4bac51..10c7c2fa4 100644
--- a/src/dolphinui.rc
+++ b/src/dolphinui.rc
@@ -56,6 +56,7 @@
                 <text context="@title:menu">Location Bar</text>
                 <Action name="editable_location" />
                 <Action name="replace_location" />
+                <Action name="location_in_toolbar" />
             </Menu>
             <Separator/>
             <Action name="view_properties" />
@@ -121,7 +122,7 @@
         <Action name="details" />
         <Separator name="separator_0" />
         <Action name="sort" />
-        <Spacer name="spacer_0" />
+        <Action name="url_navigator" />
         <Action name="split_view" />
         <Action name="split_stash" />
         <Action name="toggle_search" />
-- 
cgit v1.3.1