diff options
author | António Fernandes <antoniof@gnome.org> | 2022-01-10 12:54:01 +0000 |
---|---|---|
committer | António Fernandes <antoniof@gnome.org> | 2022-01-10 12:54:01 +0000 |
commit | 209e17327733c7aa150f668249eade983d4d9407 (patch) | |
tree | 4ff56bfafe4f826b576128c80238fbba786d6f60 | |
parent | db67fab16a06d866bada5c7fe6d7ff02f21bd0dc (diff) | |
download | nautilus-209e17327733c7aa150f668249eade983d4d9407.tar.gz |
zoom_section_all_in_toolbar
-rw-r--r-- | src/nautilus-files-view.c | 2 | ||||
-rw-r--r-- | src/nautilus-toolbar-menu-sections.h | 1 | ||||
-rw-r--r-- | src/nautilus-toolbar.c | 5 | ||||
-rw-r--r-- | src/resources/ui/nautilus-toolbar-view-menu.ui | 12 | ||||
-rw-r--r-- | src/resources/ui/nautilus-toolbar.ui | 16 |
5 files changed, 10 insertions, 26 deletions
diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c index 7c995aaca..1dedb3d8e 100644 --- a/src/nautilus-files-view.c +++ b/src/nautilus-files-view.c @@ -3289,7 +3289,6 @@ nautilus_files_view_finalize (GObject *object) g_clear_object (&priv->view_action_group); g_clear_object (&priv->background_menu_model); g_clear_object (&priv->selection_menu_model); - g_clear_object (&priv->toolbar_menu_sections->zoom_section); g_clear_object (&priv->toolbar_menu_sections->sort_section); g_clear_object (&priv->extensions_background_menu); g_clear_object (&priv->templates_menu); @@ -9518,7 +9517,6 @@ nautilus_files_view_init (NautilusFilesView *view) /* Toolbar menu */ builder = gtk_builder_new_from_resource ("/org/gnome/nautilus/ui/nautilus-toolbar-view-menu.ui"); priv->toolbar_menu_sections = g_new0 (NautilusToolbarMenuSections, 1); - priv->toolbar_menu_sections->zoom_section = G_MENU_MODEL (g_object_ref (gtk_builder_get_object (builder, "zoom_section"))); priv->toolbar_menu_sections->sort_section = G_MENU_MODEL (g_object_ref (gtk_builder_get_object (builder, "sort_section"))); g_signal_connect (view, diff --git a/src/nautilus-toolbar-menu-sections.h b/src/nautilus-toolbar-menu-sections.h index 9b5c136fb..8f5a98667 100644 --- a/src/nautilus-toolbar-menu-sections.h +++ b/src/nautilus-toolbar-menu-sections.h @@ -25,7 +25,6 @@ typedef struct _NautilusToolbarMenuSections NautilusToolbarMenuSections; struct _NautilusToolbarMenuSections { GMenuModel *sort_section; - GMenuModel *zoom_section; }; G_END_DECLS diff --git a/src/nautilus-toolbar.c b/src/nautilus-toolbar.c index 835d8add1..3ca1b934b 100644 --- a/src/nautilus-toolbar.c +++ b/src/nautilus-toolbar.c @@ -1233,11 +1233,6 @@ on_slot_toolbar_menu_sections_changed (NautilusToolbar *self, /* Let's assume that zoom and sort sections are the first and second items * in view_menu, as per nautilus-toolbar.ui. */ - zoom_item = g_menu_item_new_from_model (self->view_menu, 0); - g_menu_remove (G_MENU (self->view_menu), 0); - g_menu_item_set_section (zoom_item, new_sections->zoom_section); - g_menu_insert_item (G_MENU (self->view_menu), 0, zoom_item); - sort_item = g_menu_item_new_from_model (self->view_menu, 1); g_menu_remove (G_MENU (self->view_menu), 1); g_menu_item_set_section (sort_item, new_sections->sort_section); diff --git a/src/resources/ui/nautilus-toolbar-view-menu.ui b/src/resources/ui/nautilus-toolbar-view-menu.ui index 2d0260ee5..291408b11 100644 --- a/src/resources/ui/nautilus-toolbar-view-menu.ui +++ b/src/resources/ui/nautilus-toolbar-view-menu.ui @@ -1,18 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <interface> <requires lib="gtk" version="4.0"/> - <menu id="zoom_section"> - <item> - <attribute name="label" translatable="yes">Zoom out</attribute> - <attribute name="action">view.zoom-out</attribute> - <attribute name="verb-icon">zoom-out-symbolic</attribute> - </item> - <item> - <attribute name="label" translatable="yes">Zoom in</attribute> - <attribute name="action">view.zoom-in</attribute> - <attribute name="verb-icon">zoom-in-symbolic</attribute> - </item> - </menu> <menu id="sort_section"> <item> <attribute name="action">view.sort</attribute> diff --git a/src/resources/ui/nautilus-toolbar.ui b/src/resources/ui/nautilus-toolbar.ui index 2deaa9c8b..246506ca2 100644 --- a/src/resources/ui/nautilus-toolbar.ui +++ b/src/resources/ui/nautilus-toolbar.ui @@ -7,12 +7,16 @@ <section> <attribute name="label" translatable="yes">Icon size</attribute> <attribute name="display-hint">inline-buttons</attribute> - <!-- - Zoom section. - - The toolbar code assumes this is the first item of this menu model. - Its contents is provided by the view. - --> + <item> + <attribute name="label" translatable="yes">Zoom out</attribute> + <attribute name="action">view.zoom-out</attribute> + <attribute name="verb-icon">zoom-out-symbolic</attribute> + </item> + <item> + <attribute name="label" translatable="yes">Zoom in</attribute> + <attribute name="action">view.zoom-in</attribute> + <attribute name="verb-icon">zoom-in-symbolic</attribute> + </item> </section> <section> <attribute name="label" translatable="yes" context="menu item" comments="Translators: a menu item in a group of sorting options in a toolbar menu, with criterions such as "A-Z" or "Last Modified".">Sort</attribute> |