[evince] ev-toolbar: Rearrange tools and navigation/view controls

[Germán Poo-Caamaño <gpoo src gnome org>]

commit 62fda09af7da2e31fc024ba01dd6dbea786cd595
Author: Germán Poo-Caamaño <gpoo gnome org>
Date:   Tue Jul 31 00:06:29 2018 -0400

    ev-toolbar: Rearrange tools and navigation/view controls
    
    Put together in groups the secondary tools (search and edit), and
    in another group the navigation/view controls (page navigator and
    zoom).
    
    See #947

 shell/ev-toolbar.c | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/shell/ev-toolbar.c b/shell/ev-toolbar.c
index d1c3845b..c1e2c4c5 100644
--- a/shell/ev-toolbar.c
+++ b/shell/ev-toolbar.c
@@ -206,11 +206,16 @@ ev_toolbar_constructed (GObject *object)
                                          ev_window_get_document_model (ev_toolbar->priv->window));
         gtk_header_bar_pack_start (GTK_HEADER_BAR (ev_toolbar), tool_item);
 
-        /* Edit Annots */
-        button = ev_toolbar_create_toggle_button (ev_toolbar, "win.toggle-edit-annots", 
"document-edit-symbolic",
-                                                  _("Annotate the document"));
-        ev_toolbar->priv->annots_button = button;
-        gtk_header_bar_pack_start (GTK_HEADER_BAR (ev_toolbar), button);
+        /* Zoom selector */
+        vbox = ev_zoom_action_new (ev_window_get_document_model (ev_toolbar->priv->window),
+                                   G_MENU (gtk_builder_get_object (builder, "zoom-menu")));
+        ev_toolbar->priv->zoom_action = vbox;
+        gtk_widget_set_tooltip_text (vbox, _("Select or set the zoom level of the document"));
+        atk_object_set_name (gtk_widget_get_accessible (vbox), _("Set zoom level"));
+        g_signal_connect (vbox, "activated",
+                          G_CALLBACK (zoom_selector_activated),
+                          ev_toolbar);
+        gtk_header_bar_pack_start (GTK_HEADER_BAR (ev_toolbar), vbox);
 
         /* Action Menu */
         menu = G_MENU_MODEL (gtk_builder_get_object (builder, "action-menu"));
@@ -222,16 +227,11 @@ ev_toolbar_constructed (GObject *object)
         ev_toolbar->priv->action_menu_button = button;
         gtk_header_bar_pack_end (GTK_HEADER_BAR (ev_toolbar), button);
 
-        /* Zoom selector */
-        vbox = ev_zoom_action_new (ev_window_get_document_model (ev_toolbar->priv->window),
-                                   G_MENU (gtk_builder_get_object (builder, "zoom-menu")));
-        ev_toolbar->priv->zoom_action = vbox;
-        gtk_widget_set_tooltip_text (vbox, _("Select or set the zoom level of the document"));
-        atk_object_set_name (gtk_widget_get_accessible (vbox), _("Set zoom level"));
-        g_signal_connect (vbox, "activated",
-                          G_CALLBACK (zoom_selector_activated),
-                          ev_toolbar);
-        gtk_header_bar_pack_end (GTK_HEADER_BAR (ev_toolbar), vbox);
+        /* Edit Annots */
+        button = ev_toolbar_create_toggle_button (ev_toolbar, "win.toggle-edit-annots", 
"document-edit-symbolic",
+                                                  _("Annotate the document"));
+        ev_toolbar->priv->annots_button = button;
+        gtk_header_bar_pack_end (GTK_HEADER_BAR (ev_toolbar), button);
 
         /* Find */
         button = ev_toolbar_create_toggle_button (ev_toolbar, "win.toggle-find", "edit-find-symbolic",