[geary/pantheon_mail: 19/32] adapt flag, tag, and move menus

[Javier Jardón Cabezas <jjardon src gnome org>]

commit c6f9b577947146994876a5f9270754d8a7f810c7
Author: Daniel Foré <daniel elementary io>
Date:   Mon Nov 23 20:09:23 2015 -0800

    adapt flag, tag, and move menus

 src/client/components/main-toolbar.vala |   26 ++++++++++++++++++--------
 1 files changed, 18 insertions(+), 8 deletions(-)
---
diff --git a/src/client/components/main-toolbar.vala b/src/client/components/main-toolbar.vala
index 8c5f04c..0be32b9 100644
--- a/src/client/components/main-toolbar.vala
+++ b/src/client/components/main-toolbar.vala
@@ -103,14 +103,24 @@ public class MainToolbar : Gtk.Box {
         conversation_header.add_start(conversation_header.create_pill_buttons(insert));
 
         // Mark, copy, move.
-        insert.clear();
-        insert.add(conversation_header.create_menu_button("marker-symbolic", mark_menu,
-            GearyController.ACTION_MARK_AS_MENU));
-        insert.add(conversation_header.create_menu_button(rtl ? "tag-rtl-symbolic" : "tag-symbolic",
-            copy_folder_menu, GearyController.ACTION_COPY_MENU));
-        insert.add(conversation_header.create_menu_button("folder-symbolic", move_folder_menu,
-            GearyController.ACTION_MOVE_MENU));
-        conversation_header.add_start(conversation_header.create_pill_buttons(insert));
+        Gtk.MenuButton mark = new Gtk.MenuButton();
+        mark.image = new Gtk.Image.from_icon_name("edit-flag", Gtk.IconSize.LARGE_TOOLBAR);
+        mark.popup = mark_menu;
+        mark.tooltip_text = _("Mark conversation");
+
+        Gtk.MenuButton tag = new Gtk.MenuButton();
+        tag.image = new Gtk.Image.from_icon_name("tag-new", Gtk.IconSize.LARGE_TOOLBAR);
+        tag.popup = copy_folder_menu;
+        tag.tooltip_text = _("Add label to conversation");
+
+        Gtk.MenuButton move = new Gtk.MenuButton();
+        move.image = new Gtk.Image.from_icon_name("mail-move", Gtk.IconSize.LARGE_TOOLBAR);
+        move.popup = move_folder_menu;
+        move.tooltip_text = _("Move conversation");
+
+        conversation_header.pack_start(mark);
+        conversation_header.pack_start(tag);
+        conversation_header.pack_start(move);
 
         Gtk.Button trash_delete = new Gtk.Button();
         trash_delete.related_action = 
GearyApplication.instance.actions.get_action(GearyController.ACTION_TRASH_MESSAGE);