diff options
| author | António Fernandes <antoniof@gnome.org> | 2022-01-10 12:48:15 +0000 |
|---|---|---|
| committer | António Fernandes <antoniof@gnome.org> | 2022-01-10 12:48:15 +0000 |
| commit | db67fab16a06d866bada5c7fe6d7ff02f21bd0dc (patch) | |
| tree | b105527b55db8a4a1c69bb1f1f1ea239c3034532 | |
| parent | 1c3bb8fac84fa639e4032d6735e040678cf15f94 (diff) | |
| download | nautilus-db67fab16a06d866bada5c7fe6d7ff02f21bd0dc.tar.gz | |
remove-100percent
| -rw-r--r-- | src/nautilus-files-view.c | 9 | ||||
| -rw-r--r-- | src/resources/ui/nautilus-toolbar-view-menu.ui | 6 | ||||
| -rw-r--r-- | src/resources/ui/nautilus-toolbar.ui | 3 |
3 files changed, 2 insertions, 16 deletions
diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c index eb07d9f95..7c995aaca 100644 --- a/src/nautilus-files-view.c +++ b/src/nautilus-files-view.c @@ -8175,21 +8175,12 @@ nautilus_files_view_reset_view_menu (NautilusFilesView *view) { NautilusFilesViewPrivate *priv = nautilus_files_view_get_instance_private (view); NautilusFile *file; - GMenuModel *zoom_section = priv->toolbar_menu_sections->zoom_section; GMenuModel *sort_section = priv->toolbar_menu_sections->sort_section; - g_autofree gchar *zoom_level_percent = NULL; const gchar *trashed_action; gint i; file = nautilus_files_view_get_directory_as_file (NAUTILUS_FILES_VIEW (view)); - /* We want to show the percentage like this: [ - | 100% | + ] */ - zoom_level_percent = g_strdup_printf ("%.0f%%", nautilus_files_view_get_zoom_level_percentage (view) * 100.0); - i = nautilus_g_menu_model_find_by_string (zoom_section, "action", "view.zoom-standard"); - g_return_if_fail (i != -1); - nautilus_g_menu_replace_string_in_item (G_MENU (zoom_section), i, - "label", zoom_level_percent); - /* When not in Trash, set an inexistant action to hide the menu item. This * works under the assumptiont that the menu item has its "hidden-when" * attribute set to "action-disabled", and that an inexistant action is diff --git a/src/resources/ui/nautilus-toolbar-view-menu.ui b/src/resources/ui/nautilus-toolbar-view-menu.ui index a951047cf..2d0260ee5 100644 --- a/src/resources/ui/nautilus-toolbar-view-menu.ui +++ b/src/resources/ui/nautilus-toolbar-view-menu.ui @@ -8,12 +8,6 @@ <attribute name="verb-icon">zoom-out-symbolic</attribute> </item> <item> - <!-- This label is a placeholder. The view is going to replace it with a - percentage, like this: [ - | 100% | + ] --> - <attribute name="label" translatable="yes">Reset zoom</attribute> - <attribute name="action">view.zoom-standard</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> diff --git a/src/resources/ui/nautilus-toolbar.ui b/src/resources/ui/nautilus-toolbar.ui index 139764612..2deaa9c8b 100644 --- a/src/resources/ui/nautilus-toolbar.ui +++ b/src/resources/ui/nautilus-toolbar.ui @@ -5,7 +5,8 @@ <object class="GtkPopoverMenu" id="forward_menu"/> <menu id="view_menu"> <section> - <attribute name="display-hint">horizontal-buttons</attribute> + <attribute name="label" translatable="yes">Icon size</attribute> + <attribute name="display-hint">inline-buttons</attribute> <!-- Zoom section. |