From 37327c9b0aae112c5890703cba1f0157043007e0 Mon Sep 17 00:00:00 2001
From: Felix Ernst <fe.a.ernst@gmail.com>
Date: Sun, 20 Sep 2020 18:53:59 +0200
Subject: 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
---
 src/dolphinui.rc | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'src/dolphinui.rc')

diff --git a/src/dolphinui.rc b/src/dolphinui.rc
index 10c7c2fa4..01a3778f9 100644
--- a/src/dolphinui.rc
+++ b/src/dolphinui.rc
@@ -56,7 +56,6 @@
                 <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" />
@@ -120,9 +119,7 @@
         <Action name="icons" />
         <Action name="compact" />
         <Action name="details" />
-        <Separator name="separator_0" />
-        <Action name="sort" />
-        <Action name="url_navigator" />
+        <Action name="url_navigators" />
         <Action name="split_view" />
         <Action name="split_stash" />
         <Action name="toggle_search" />
-- 
cgit v1.3