diff options
author | Neil Herald <neil.herald@gmail.com> | 2016-06-19 17:35:49 +0100 |
---|---|---|
committer | Neil Herald <neil.herald@gmail.com> | 2016-06-23 22:22:48 +0100 |
commit | 35f10147ccafd7ddea63e544aacfae81ae0d554e (patch) | |
tree | c0c4d3798af57eb48e150b8ba930a95b98f5602a /src/resources/ui/nautilus-toolbar-menu.ui | |
parent | 0453216b8a6731d92cfcd6405c323d76c0c1182c (diff) | |
download | nautilus-35f10147ccafd7ddea63e544aacfae81ae0d554e.tar.gz |
view: allow view to have more control over the toolbar menu
Currently we have this menu structure:
------------------------------
1. New Folder/New Tab/Bookmark
------------------------------
2. Zoom controls
------------------------------
3. Undo/Redo
------------------------------
4. Sort options
------------------------------
5. Other view related controls
------------------------------
The view creates 2-5, contained in a single GtkWidget - which is then
passed to the toolbar via the enclosing window slot. The problem is that
3 shouldn't be created or managed by the view as the controls in that
section of the menu are not related to the view. We'd like to move this
responsibility back to the toolbar, but that would mean the view must
pass multiple menu sections back to the toolbar (as 3 is in the middle
of the other view controls).
This change allows the view to pass multiple sections back to the
toolbar, using the new NautilusToolbarMenuSections structure. The files
view now passes 2 as a separate section to 3-5 (3 will be moved out of
the view in a future commit).
https://bugzilla.gnome.org/show_bug.cgi?id=764632
Diffstat (limited to 'src/resources/ui/nautilus-toolbar-menu.ui')
-rw-r--r-- | src/resources/ui/nautilus-toolbar-menu.ui | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/resources/ui/nautilus-toolbar-menu.ui b/src/resources/ui/nautilus-toolbar-menu.ui index 48f27e15d..05ab33fb8 100644 --- a/src/resources/ui/nautilus-toolbar-menu.ui +++ b/src/resources/ui/nautilus-toolbar-menu.ui @@ -88,7 +88,16 @@ </object> </child> <child> - <object class="GtkBox" id="view_menu_slot_section"> + <!-- Zoom controls are added to this, if the view supports them --> + <object class="GtkBox" id="view_menu_zoom_section"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + </object> + </child> + <child> + <!-- Other controls custom to the view are added to this --> + <object class="GtkBox" id="view_menu_extended_section"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> |