Merge lp:~nathandyer/pantheon-mail/headerbar-fix into lp:~elementary-apps/pantheon-mail/trunk

[Nathan Dyer]

This moves back to a normal headerbar, adds back the search entry, and removes the search bar from the application.

[Danielle Foré (danrabbit)]

* The big problem here is that the inline composer is supposed to use the second half of the headerbar for actions. Since that's gone, those actions are just missing. Which means you can't send a new message. I'm kind of wondering if we should just leave the dual headerbar for now until we figure out what to do about that

* It looks like the compose toolbar shares the same icon size as the headerbar. If we want to leave the format icons symbolic here, I think they need to remain 16px

* We lost the undo and clear buttons

review: Needs Fixing

[lp:~nathandyer/pantheon-mail/headerbar-fix]

1869. By Nathan Dyer <email address hidden> on 2015-11-19

Added send, close, and detach buttons to the primary toolbar and improved the overall compose headerbar support.

[kay van der Zander (kay20)]

see the diff comments :)

review: Needs Fixing (code)

[lp:~nathandyer/pantheon-mail/headerbar-fix]

1870. By Nathan Dyer <email address hidden> on 2015-11-25

Keep the toolbar embedded to match normal composer style when popping out into new window.

1871. By Nathan Dyer <email address hidden> on 2015-11-25

Hide detach button when popped out.

1872. By Nathan Dyer <email address hidden> on 2015-11-25

Restored the empty and undo buttons.

[kay van der Zander (kay20)]

clean up merging lines

Unmerged revisions

1872. By Nathan Dyer <email address hidden> on 2015-11-25

Restored the empty and undo buttons.

1871. By Nathan Dyer <email address hidden> on 2015-11-25

Hide detach button when popped out.

1870. By Nathan Dyer <email address hidden> on 2015-11-25

Keep the toolbar embedded to match normal composer style when popping out into new window.

1869. By Nathan Dyer <email address hidden> on 2015-11-19

Added send, close, and detach buttons to the primary toolbar and improved the overall compose headerbar support.

1868. By Nathan Dyer <email address hidden> on 2015-11-19

Additional archive/trash fixes.

1867. By Nathan Dyer <email address hidden> on 2015-11-19

Fix the search entry and murder the searchbar.

1866. By Nathan Dyer <email address hidden> on 2015-11-18

Back to the good headerbar.

=== modified file 'src/client/application/geary-controller.vala'
--- src/client/application/geary-controller.vala	2015-11-18 23:34:21 +0000
+++ src/client/application/geary-controller.vala	2015-11-25 01:35:24 +0000
@@ -210,7 +210,7 @@
         main_window.folder_list.move_conversation.connect(on_move_conversation);
         main_window.main_toolbar.copy_folder_menu.folder_selected.connect(on_copy_conversation);
         main_window.main_toolbar.move_folder_menu.folder_selected.connect(on_move_conversation);
-        main_window.search_bar.search_text_changed.connect(on_search_text_changed);
+        main_window.main_toolbar.search_text_changed.connect(on_search_text_changed);
         main_window.conversation_viewer.link_selected.connect(on_link_selected);
         main_window.conversation_viewer.reply_to_message.connect(on_reply_to_message);
         main_window.conversation_viewer.reply_all_message.connect(on_reply_all_message);
@@ -279,7 +279,7 @@
         main_window.folder_list.move_conversation.disconnect(on_move_conversation);
         main_window.main_toolbar.copy_folder_menu.folder_selected.disconnect(on_copy_conversation);
         main_window.main_toolbar.move_folder_menu.folder_selected.disconnect(on_move_conversation);
-        main_window.search_bar.search_text_changed.disconnect(on_search_text_changed);
+        main_window.main_toolbar.search_text_changed.disconnect(on_search_text_changed);
         main_window.conversation_viewer.link_selected.disconnect(on_link_selected);
         main_window.conversation_viewer.reply_to_message.disconnect(on_reply_to_message);
         main_window.conversation_viewer.reply_all_message.disconnect(on_reply_all_message);
@@ -522,7 +522,7 @@
         // widget
         Gtk.ActionEntry search = { ACTION_SEARCH, null, null, null, null, on_search };
         entries += search;
-        add_accelerator("<Ctrl>S", ACTION_SEARCH);
+        add_accelerator("<Ctrl>F", ACTION_SEARCH);
         
         Gtk.ActionEntry conversation_list = { ACTION_CONVERSATION_LIST, null, null, null, null, on_conversation_list };
         entries += conversation_list;
@@ -1214,7 +1214,7 @@
         cancel_inbox(account);
         
         previous_non_search_folder = null;
-        main_window.search_bar.set_search_text(""); // Reset search.
+        main_window.main_toolbar.set_search_text(""); // Reset search.
         if (current_account == account) {
             cancel_folder();
             switch_to_first_inbox(); // Switch folder.
@@ -1311,7 +1311,7 @@
     // by other utility methods
     private void update_ui() {
         update_tooltips();
-        main_window.main_toolbar.update_trash_archive_buttons(
+        main_window.main_toolbar.update_trash_buttons(
             current_folder_supports_trash() || !(current_folder is Geary.FolderSupport.Remove),
             current_account.can_support_archive);
     }
@@ -1323,7 +1323,6 @@
         if (folder == null) {
             current_folder = null;
             main_window.conversation_list_store.clear();
-            main_window.main_toolbar.folder = null;
             folder_selected(null);
             
             return;
@@ -1722,7 +1721,7 @@
     private void on_shift_key(bool pressed) {
         if (main_window != null && main_window.main_toolbar != null
             && current_account != null && current_folder != null) {
-            main_window.main_toolbar.update_trash_archive_buttons(
+            main_window.main_toolbar.update_trash_buttons(
                 (!pressed && current_folder_supports_trash()) || !(current_folder is Geary.FolderSupport.Remove),
                 current_account.can_support_archive);
         }
@@ -2644,7 +2643,7 @@
     }
     
     private void on_search() {
-        main_window.search_bar.give_search_focus();
+        main_window.main_toolbar.give_search_focus();
     }
     
     private void on_conversation_list() {
@@ -2810,7 +2809,7 @@
             cancellable_search);
         
         main_window.folder_list.set_search(folder);
-        search_text_changed(main_window.search_bar.search_text);
+        search_text_changed(main_window.main_toolbar.search_text);
     }
     
     private void on_search_text_changed(string search_text) {
@@ -2825,7 +2824,7 @@
     private bool on_search_timeout() {
         search_timeout_id = 0;
         
-        do_search(main_window.search_bar.search_text);
+        do_search(main_window.main_toolbar.search_text);
         
         return false;
     }

=== modified file 'src/client/components/main-toolbar.vala'
--- src/client/components/main-toolbar.vala	2015-11-24 19:48:54 +0000
+++ src/client/components/main-toolbar.vala	2015-11-25 01:35:24 +0000
@@ -1,13 +1,18 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2011-2014 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
  */
 
 // Draws the main toolbar.
-public class MainToolbar : Gtk.Box {
+public class MainToolbar : PillHeaderbar {
+    private const string ICON_CLEAR_NAME = "edit-clear";
+    private const string ICON_CLEAR_RTL_NAME = "edit-clear-rtl";
+    private const string DEFAULT_SEARCH_TEXT = _("Search");
+    
     public FolderMenu copy_folder_menu { get; private set; default = new FolderMenu(); }
     public FolderMenu move_folder_menu { get; private set; default = new FolderMenu(); }
+<<<<<<< TREE
     public string account { get; set; }
     public string folder { get; set; }
     public bool show_close_button { get; set; default = false; }
@@ -18,11 +23,28 @@
 
     private PillHeaderbar folder_header;
     private PillHeaderbar conversation_header;
+=======
+    public string search_text { get { return search_entry.text; } }
+    public bool search_entry_has_focus { get { return search_entry.has_focus; } }
+    
+>>>>>>> MERGE-SOURCE
     private Gtk.Button archive_button;
+<<<<<<< TREE
     private Gtk.Button trash_delete_button;
     private Binding guest_header_binding;
 
+=======
+    private Gtk.Button trash_buttons[2];
+    private Gtk.SearchEntry search_entry = new Gtk.SearchEntry();
+    private Geary.ProgressMonitor? search_upgrade_progress_monitor = null;
+    private MonitoredProgressBar search_upgrade_progress_bar = new MonitoredProgressBar();
+    private Geary.Account? current_account = null;
+    
+    public signal void search_text_changed(string search_text);
+    
+>>>>>>> MERGE-SOURCE
     public MainToolbar() {
+<<<<<<< TREE
         Object(orientation: Gtk.Orientation.HORIZONTAL, spacing: 0);
 
         folder_header = new PillHeaderbar(GearyApplication.instance.actions);
@@ -55,25 +77,60 @@
 
         bool rtl = get_direction() == Gtk.TextDirection.RTL;
 
+=======
+        base(GearyApplication.instance.actions);
+        GearyApplication.instance.controller.account_selected.connect(on_account_changed);
+        
+>>>>>>> MERGE-SOURCE
         // Assemble mark menu.
         GearyApplication.instance.load_ui_file("toolbar_mark_menu.ui");
         Gtk.Menu mark_menu = (Gtk.Menu) GearyApplication.instance.ui_manager.get_widget("/ui/ToolbarMarkMenu");
         mark_menu.foreach(GtkUtil.show_menuitem_accel_labels);
+<<<<<<< TREE
 
+=======
+        
+        // Setup the application menu.
+        GearyApplication.instance.load_ui_file("toolbar_menu.ui");
+        Gtk.Menu application_menu = (Gtk.Menu) GearyApplication.instance.ui_manager.get_widget("/ui/ToolbarMenu");
+        application_menu.foreach(GtkUtil.show_menuitem_accel_labels);
+        
+>>>>>>> MERGE-SOURCE
         // Toolbar setup.
         Gee.List<Gtk.Button> insert = new Gee.ArrayList<Gtk.Button>();
 
         // Compose.
+<<<<<<< TREE
         Gtk.Button compose = new Gtk.Button();
         compose.related_action = GearyApplication.instance.actions.get_action(GearyController.ACTION_NEW_MESSAGE);
         compose.tooltip_text = compose.related_action.tooltip;
         compose.image = new Gtk.Image.from_icon_name("mail-message-new", Gtk.IconSize.LARGE_TOOLBAR); //FIXME: For some reason doing Button.from_icon_name doesn't work
         folder_header.pack_start(compose);
 
+=======
+        insert.add(create_toolbar_button("mail-message-new", GearyController.ACTION_NEW_MESSAGE));
+        add_start(create_pill_buttons(insert, false));
+        
+        // Reply buttons
+        insert.clear();
+        insert.add(create_toolbar_button("mail-reply-sender", GearyController.ACTION_REPLY_TO_MESSAGE));
+        insert.add(create_toolbar_button("mail-reply-all", GearyController.ACTION_REPLY_ALL_MESSAGE));
+        insert.add(create_toolbar_button("mail-forward", GearyController.ACTION_FORWARD_MESSAGE));
+        add_start(create_pill_buttons(insert));
+        
+        // Mark, copy, move.
+        insert.clear();
+        insert.add(create_menu_button("edit-mark", mark_menu, GearyController.ACTION_MARK_AS_MENU));
+        insert.add(create_menu_button("tag-new", copy_folder_menu, GearyController.ACTION_COPY_MENU));
+        insert.add(create_menu_button("mail-move", move_folder_menu, GearyController.ACTION_MOVE_MENU));
+        add_start(create_pill_buttons(insert));
+
+>>>>>>> MERGE-SOURCE
         // Assemble the empty menu
         GearyApplication.instance.load_ui_file("toolbar_empty_menu.ui");
         Gtk.Menu empty_menu = (Gtk.Menu) GearyApplication.instance.ui_manager.get_widget("/ui/ToolbarEmptyMenu");
         empty_menu.foreach(GtkUtil.show_menuitem_accel_labels);
+<<<<<<< TREE
 
         Gtk.MenuButton empty = new Gtk.MenuButton();
         empty.image = new Gtk.Image.from_icon_name("edit-clear", Gtk.IconSize.LARGE_TOOLBAR);
@@ -154,12 +211,78 @@
 
         Gtk.Settings.get_default().notify["gtk-decoration-layout"].connect(set_window_buttons);
         realize.connect(set_window_buttons);
+=======
+
+        Gtk.MenuButton empty = new Gtk.MenuButton();
+        empty.image = new Gtk.Image.from_icon_name("edit-clear", Gtk.IconSize.LARGE_TOOLBAR);
+        empty.popup = empty_menu;
+        empty.tooltip_text = _("Empty Spam or Trash folders");
+        
+        // The toolbar looks bad when you hide one of a pair of pill buttons.
+        // Unfortunately, this means we have to have one pair for archive/trash
+        // and one single button for just trash, for when the archive button is
+        // hidden.
+        insert.clear();
+        insert.add(archive_button = create_toolbar_button("mail-archive", GearyController.ACTION_ARCHIVE_MESSAGE, false));
+        insert.add(trash_buttons[0] = create_toolbar_button("user-trash", GearyController.ACTION_TRASH_MESSAGE, false));
+        Gtk.Box trash_archive = create_pill_buttons(insert);
+        insert.clear();
+        insert.add(trash_buttons[1] = create_toolbar_button("user-trash", GearyController.ACTION_TRASH_MESSAGE, false));
+        Gtk.Box trash = create_pill_buttons(insert, false);
+        add_start(empty);
+        add_start(trash_archive);
+        add_start(trash);
+        
+        // Search bar.
+        search_entry.width_chars = 28;
+        search_entry.tooltip_text = _("Search all mail in account for keywords (Ctrl+S)");
+        search_entry.changed.connect(on_search_entry_changed);
+        search_entry.key_press_event.connect(on_search_key_press);
+        on_search_entry_changed(); // set initial state
+        search_entry.has_focus = true;
+        
+        // Search upgrade progress bar.
+        search_upgrade_progress_bar.margin_top = 3;
+        search_upgrade_progress_bar.margin_bottom = 3;
+        search_upgrade_progress_bar.show_text = true;
+        search_upgrade_progress_bar.visible = false;
+        search_upgrade_progress_bar.no_show_all = true;
+        
+        insert.clear();
+        insert.add(create_menu_button("open-menu", application_menu, GearyController.ACTION_GEAR_MENU));
+        add_end(create_pill_buttons(insert));
+        
+        Gtk.Button undo = new Gtk.Button();
+        undo.related_action = GearyApplication.instance.actions.get_action(GearyController.ACTION_UNDO);
+        undo.tooltip_text = undo.related_action.tooltip;
+        undo.related_action.notify["tooltip"].connect(() => { undo.tooltip_text = undo.related_action.tooltip; });
+        undo.image = new Gtk.Image.from_icon_name("edit-undo", Gtk.IconSize.LARGE_TOOLBAR); //FIXME: For some reason doing Button.from_icon_name doesn't work
+
+        add_end(search_entry);
+        add_end(search_upgrade_progress_bar);
+        add_end(undo);
+
+        set_search_placeholder_text(DEFAULT_SEARCH_TEXT);
+    }
+    
+    private void show_archive_button(bool show) {
+        if (show) {
+            archive_button.show();
+            trash_buttons[0].show();
+            trash_buttons[1].hide();
+        } else {
+            archive_button.hide();
+            trash_buttons[0].hide();
+            trash_buttons[1].show();
+        }
+>>>>>>> MERGE-SOURCE
     }
 
     /// Updates the trash button as trash or delete, and shows or hides the archive button.
-    public void update_trash_archive_buttons(bool trash, bool archive) {
+    public void update_trash_buttons(bool trash, bool archive) {
         string action_name = (trash ? GearyController.ACTION_TRASH_MESSAGE
             : GearyController.ACTION_DELETE_MESSAGE);
+<<<<<<< TREE
         conversation_header.setup_button(trash_delete_button, null, action_name, false);
 
         archive_button.visible = archive;
@@ -197,4 +320,98 @@
         conversation_header.decoration_layout = ":" + buttons[1];
     }
 }
+=======
+        foreach (Gtk.Button b in trash_buttons)
+            setup_button(b, "user-trash", action_name, false);
+>>>>>>> MERGE-SOURCE
 
+        show_archive_button(archive);
+    }
+    
+    public void set_search_text(string text) {
+        search_entry.text = text;
+    }
+    
+    public void give_search_focus() {
+        search_entry.grab_focus();
+    }
+    
+    public void set_search_placeholder_text(string placeholder) {
+        search_entry.placeholder_text = placeholder;
+    }
+    
+    private void on_search_entry_changed() {
+        search_text_changed(search_entry.text);
+        // Enable/disable clear button.
+        search_entry.secondary_icon_name = search_entry.text != "" ?
+            (get_direction() == Gtk.TextDirection.RTL ? ICON_CLEAR_RTL_NAME : ICON_CLEAR_NAME) : null;
+    }
+    
+    private bool on_search_key_press(Gdk.EventKey event) {
+        // Clear box if user hits escape.
+        if (Gdk.keyval_name(event.keyval) == "Escape")
+            search_entry.text = "";
+        
+        // Force search if user hits enter.
+        if (Gdk.keyval_name(event.keyval) == "Return")
+            on_search_entry_changed();
+        
+        return false;
+    }
+    
+    private void on_search_upgrade_start() {
+        // Set the progress bar's width to match the search entry's width.
+        int minimum_width = 0;
+        int natural_width = 0;
+        search_entry.get_preferred_width(out minimum_width, out natural_width);
+        search_upgrade_progress_bar.width_request = minimum_width;
+        
+        search_entry.hide();
+        search_upgrade_progress_bar.show();
+    }
+    
+    private void on_search_upgrade_finished() {
+        search_entry.show();
+        search_upgrade_progress_bar.hide();
+    }
+    
+    private void on_account_changed(Geary.Account? account) {
+        on_search_upgrade_finished(); // Reset search box.
+        
+        if (search_upgrade_progress_monitor != null) {
+            search_upgrade_progress_monitor.start.disconnect(on_search_upgrade_start);
+            search_upgrade_progress_monitor.finish.disconnect(on_search_upgrade_finished);
+            search_upgrade_progress_monitor = null;
+        }
+        
+        if (current_account != null) {
+            current_account.information.notify[Geary.AccountInformation.PROP_NICKNAME].disconnect(
+                on_nickname_changed);
+        }
+        
+        if (account != null) {
+            search_upgrade_progress_monitor = account.search_upgrade_monitor;
+            search_upgrade_progress_bar.set_progress_monitor(search_upgrade_progress_monitor);
+            
+            search_upgrade_progress_monitor.start.connect(on_search_upgrade_start);
+            search_upgrade_progress_monitor.finish.connect(on_search_upgrade_finished);
+            if (search_upgrade_progress_monitor.is_in_progress)
+                on_search_upgrade_start(); // Remove search box, we're already in progress.
+            
+            account.information.notify[Geary.AccountInformation.PROP_NICKNAME].connect(
+                on_nickname_changed);
+            
+            search_upgrade_progress_bar.text = _("Indexing %s account").printf(account.information.nickname);
+        }
+        
+        current_account = account;
+        
+        on_nickname_changed(); // Set new account name.
+    }
+    
+    private void on_nickname_changed() {
+        set_search_placeholder_text(current_account == null ||
+            GearyApplication.instance.controller.get_num_accounts() == 1 ? DEFAULT_SEARCH_TEXT :
+            _("Search %s account").printf(current_account.information.nickname));
+    }
+}
\ No newline at end of file

=== modified file 'src/client/components/main-window.vala'
--- src/client/components/main-window.vala	2015-11-23 01:27:32 +0000
+++ src/client/components/main-window.vala	2015-11-25 01:35:24 +0000
@@ -15,7 +15,6 @@
     public FolderList.Tree folder_list { get; private set; default = new FolderList.Tree(); }
     public ConversationListStore conversation_list_store { get; private set; default = new ConversationListStore(); }
     public MainToolbar main_toolbar { get; private set; }
-    public SearchBar search_bar { get; private set; default = new SearchBar(); }
     public ConversationListView conversation_list_view  { get; private set; }
     public ConversationViewer conversation_viewer { get; private set; default = new ConversationViewer(); }
     public StatusBar status_bar { get; private set; default = new StatusBar(); }
@@ -84,7 +83,9 @@
         Geary.Engine.instance.account_unavailable.connect(on_account_unavailable);
         
         // Toolbar.
+        // Toolbar.
         main_toolbar = new MainToolbar();
+<<<<<<< TREE
         main_toolbar.bind_property("search-open", search_bar, "search-mode-enabled",
             BindingFlags.SYNC_CREATE | BindingFlags.BIDIRECTIONAL);
         if (!GearyApplication.instance.is_running_unity) {
@@ -104,8 +105,15 @@
             main_toolbar.bind_property("account", this, "title", BindingFlags.SYNC_CREATE, title_func);
         }
 
+=======
+#if !ENABLE_UNITY
+        main_toolbar.show_close_button = true;
+        set_titlebar(main_toolbar);
+#endif
+        
+        set_styling();
+>>>>>>> MERGE-SOURCE
         create_layout();
-        on_change_orientation();
     }
     
     public override void show_all() {
@@ -183,12 +191,8 @@
         folder_paned.pack1(folder_box, false, false);
         folder_paned.pack2(conversation_box, true, false);
 
-        Gtk.Box search_bar_box = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
-        search_bar_box.pack_start(search_bar, false, false, 0);
-        search_bar_box.pack_start(folder_paned);
-
         // Message list left of message viewer.
-        conversations_paned.pack1(search_bar_box, false, false);
+        conversations_paned.pack1(folder_paned, true, true);
         conversations_paned.pack2(conversation_viewer, true, true);
         
         if (GearyApplication.instance.is_running_unity)
@@ -208,7 +212,7 @@
     
     private bool on_key_press_event(Gdk.EventKey event) {
         if ((event.keyval == Gdk.Key.Shift_L || event.keyval == Gdk.Key.Shift_R)
-            && (event.state & Gdk.ModifierType.SHIFT_MASK) == 0 && !search_bar.search_entry_has_focus)
+            && (event.state & Gdk.ModifierType.SHIFT_MASK) == 0 && !main_toolbar.search_entry_has_focus)
             on_shift_key(true);
         
         // Check whether the focused widget wants to handle it, if not let the accelerators kick in
@@ -221,7 +225,7 @@
         // the shift key to report as released when they release ALL of them.
         // There doesn't seem to be an easy way to do this in Gdk.
         if ((event.keyval == Gdk.Key.Shift_L || event.keyval == Gdk.Key.Shift_R)
-            && !search_bar.search_entry_has_focus)
+            && !main_toolbar.search_entry_has_focus)
             on_shift_key(false);
         
         return propagate_key_event(event);
@@ -325,13 +329,13 @@
     
     private void update_headerbar() {
         if (current_folder == null) {
-            main_toolbar.account = null;
-            main_toolbar.folder = null;
+            main_toolbar.title = null;
+            main_toolbar.subtitle = null;
             
             return;
         }
         
-        main_toolbar.account = current_folder.account.information.nickname;
+        main_toolbar.title = current_folder.account.information.nickname;
         
         /// Current folder's name followed by its unread count, i.e. "Inbox (42)"
         // except for Drafts and Outbox, where we show total count
@@ -348,9 +352,9 @@
         }
         
         if (count > 0)
-            main_toolbar.folder = _("%s (%d)").printf(current_folder.get_display_name(), count);
+            main_toolbar.subtitle = _("%s (%d)").printf(current_folder.get_display_name(), count);
         else
-            main_toolbar.folder = current_folder.get_display_name();
+            main_toolbar.subtitle = current_folder.get_display_name();
     }
 }
 

=== modified file 'src/client/components/pill-toolbar.vala'
--- src/client/components/pill-toolbar.vala	2015-11-24 19:48:54 +0000
+++ src/client/components/pill-toolbar.vala	2015-11-25 01:35:24 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2011-2014 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
@@ -32,12 +32,18 @@
         pack_end(widget);
         size.add_widget(widget);
     }
+<<<<<<< TREE
 
     public virtual void setup_button(Gtk.Button b, string? icon_name, string action_name,
+=======
+    
+    protected virtual void setup_button(Gtk.Button b, string? icon_name, string action_name,
+>>>>>>> MERGE-SOURCE
         bool show_label = false) {
         b.related_action = action_group.get_action(action_name);
         b.tooltip_text = b.related_action.tooltip;
         b.related_action.notify["tooltip"].connect(() => { b.tooltip_text = b.related_action.tooltip; });
+<<<<<<< TREE
 
         // Load icon by name with this fallback order: specified icon name, the action's icon name,
         // the action's stock ID ... although stock IDs are being deprecated, that's how we specify
@@ -59,6 +65,11 @@
         if (GearyApplication.instance.is_running_unity && b.image != null)
             b.image.margin = b.image.margin + 4;
 
+=======
+        b.image = new Gtk.Image.from_icon_name(icon_name != null ? icon_name :
+            b.related_action.icon_name, Gtk.IconSize.LARGE_TOOLBAR);
+
+>>>>>>> MERGE-SOURCE
         b.always_show_image = true;
 
         if (!show_label)
@@ -118,6 +129,7 @@
     public PillHeaderbar(Gtk.ActionGroup toolbar_action_group) {
         initialize(toolbar_action_group);
     }
+<<<<<<< TREE
 
     public bool close_button_at_end() {
         string layout;
@@ -135,6 +147,8 @@
         }
         return at_end;
     }
+=======
+>>>>>>> MERGE-SOURCE
 }
 
 /**
@@ -157,4 +171,3 @@
         base.pack_end(widget, false, false, 0);
     }
 }
-

=== modified file 'src/client/composer/composer-box.vala'
--- src/client/composer/composer-box.vala	2015-11-23 01:27:32 +0000
+++ src/client/composer/composer-box.vala	2015-11-25 01:35:24 +0000
@@ -30,8 +30,6 @@
             conversation_list_view.get_selection().unselect_all();
             
             composer.free_header();
-            GearyApplication.instance.controller.main_window.main_toolbar.set_conversation_header(
-                composer.header);
             get_style_context().add_class("full-pane");
         }
     }
@@ -72,9 +70,6 @@
     public void vanish() {
         hide();
         parent.hide();
-        if (get_style_context().has_class("full-pane"))
-            GearyApplication.instance.controller.main_window.main_toolbar.remove_conversation_header(
-                composer.header);
         
         composer.state = ComposerWidget.ComposerState.DETACHED;
         composer.editor.focus_in_event.disconnect(on_focus_in);

=== modified file 'src/client/composer/composer-embed.vala'
--- src/client/composer/composer-embed.vala	2015-03-12 01:16:27 +0000
+++ src/client/composer/composer-embed.vala	2015-11-25 01:35:24 +0000
@@ -25,6 +25,7 @@
     public ComposerEmbed(ComposerWidget composer, ConversationViewer conversation_viewer,
         Geary.Email referred) {
         this.composer = composer;
+        this.composer.header.hide_all_except_recipients();
         this.conversation_viewer = conversation_viewer;
         halign = Gtk.Align.FILL;
         valign = Gtk.Align.FILL;

=== modified file 'src/client/composer/composer-headerbar.vala'
--- src/client/composer/composer-headerbar.vala	2015-11-24 21:21:25 +0000
+++ src/client/composer/composer-headerbar.vala	2015-11-25 01:35:24 +0000
@@ -4,8 +4,13 @@
  * (version 2.1 or later).  See the COPYING file in this distribution.
  */
 
+<<<<<<< TREE
 public class ComposerHeaderbar : PillHeaderbar {
 
+=======
+public class ComposerHeaderbar : PillToolbar {
+    
+>>>>>>> MERGE-SOURCE
     public ComposerWidget.ComposerState state { get; set; }
     public bool show_pending_attachments { get; set; default = false; }
     public bool send_enabled { get; set; default = false; }
@@ -14,12 +19,25 @@
     private Gtk.Label recipients_label;
     private Gtk.Box detach_start;
     private Gtk.Box detach_end;
-
+<<<<<<< TREE
+
+=======
+
+    private Gtk.Box attach_buttons;
+    private Gtk.Button send_button;
+    private Gtk.Box close_buttons;
+    private Gtk.Button detach_button;
+    
+>>>>>>> MERGE-SOURCE
     public ComposerHeaderbar(Gtk.ActionGroup action_group) {
         base(action_group);
+<<<<<<< TREE
 
         show_close_button = false;
 
+=======
+        
+>>>>>>> MERGE-SOURCE
         bool rtl = (get_direction() == Gtk.TextDirection.RTL);
 
         // Toolbar setup.
@@ -27,7 +45,7 @@
 
         // Window management.
         detach_start = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 0);
-        Gtk.Button detach_button = create_toolbar_button(null, ComposerWidget.ACTION_DETACH);
+        detach_button = create_toolbar_button(null, ComposerWidget.ACTION_DETACH);
         detach_button.set_relief(Gtk.ReliefStyle.NONE);
         if (rtl)
             detach_button.set_margin_left(6);
@@ -48,13 +66,23 @@
 
         insert.add(create_toolbar_button(null, ComposerWidget.ACTION_CLOSE_DISCARD));
         insert.add(create_toolbar_button(null, ComposerWidget.ACTION_CLOSE_SAVE));
-        Gtk.Box close_buttons = create_pill_buttons(insert, false);
+        close_buttons = create_pill_buttons(insert, false);
         insert.clear();
+<<<<<<< TREE
 
         Gtk.Button send_button = create_toolbar_button(null, ComposerWidget.ACTION_SEND, true);
+=======
+        
+        send_button = create_toolbar_button(null, ComposerWidget.ACTION_SEND, true);
+>>>>>>> MERGE-SOURCE
         send_button.get_style_context().add_class("suggested-action");
+<<<<<<< TREE
 
         Gtk.Box attach_buttons = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 0);
+=======
+        
+        attach_buttons = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 0);
+>>>>>>> MERGE-SOURCE
         Gtk.Button attach_only = create_toolbar_button(null, ComposerWidget.ACTION_ADD_ATTACHMENT);
         insert.add(create_toolbar_button(null, ComposerWidget.ACTION_ADD_ATTACHMENT));
         insert.add(create_toolbar_button(null, ComposerWidget.ACTION_ADD_ORIGINAL_ATTACHMENTS));
@@ -117,9 +145,25 @@
     }
 
     private void set_detach_button_side() {
-        bool at_end = close_button_at_end();
+        bool at_end = true;
         detach_start.visible = !at_end;
         detach_end.visible = at_end;
     }
+
+    public void hide_all_except_recipients() {
+        detach_start.set_no_show_all(true);
+        detach_start.hide();
+        detach_end.set_no_show_all(true);
+        detach_end.hide();
+        detach_button.set_no_show_all(true);
+        detach_button.hide();
+
+        attach_buttons.set_no_show_all(true);
+        attach_buttons.hide();
+        send_button.set_no_show_all(true);
+        send_button.hide();
+        close_buttons.set_no_show_all(true);
+        close_buttons.hide();
+    }
 }
 

=== modified file 'src/client/composer/composer-toolbar.vala'
--- src/client/composer/composer-toolbar.vala	2015-11-24 19:48:54 +0000
+++ src/client/composer/composer-toolbar.vala	2015-11-25 01:35:24 +0000
@@ -7,36 +7,57 @@
 public class ComposerToolbar : PillToolbar {
 
     public string label_text { get; set; }
+<<<<<<< TREE
 
+=======
+    private Gtk.Button detach_button;
+    
+>>>>>>> MERGE-SOURCE
     public ComposerToolbar(Gtk.ActionGroup toolbar_action_group, Gtk.Menu menu) {
         base(toolbar_action_group);
 
         Gee.List<Gtk.Button> insert = new Gee.ArrayList<Gtk.Button>();
-
+<<<<<<< TREE
+
+=======
+
+        // Detach
+        detach_button = setup_button("detach-symbolic", ComposerWidget.ACTION_DETACH);
+        insert.add(detach_button);
+        add_start(create_pill_buttons(insert, false, true));
+
+        // Attachments
+        insert.clear();
+        insert.add(setup_button("mail-attachment-symbolic", ComposerWidget.ACTION_ADD_ATTACHMENT));
+        add_start(create_pill_buttons(insert, false, true));
+        
+>>>>>>> MERGE-SOURCE
         // Font formatting.
-        insert.add(create_toggle_button(null, ComposerWidget.ACTION_BOLD));
-        insert.add(create_toggle_button(null, ComposerWidget.ACTION_ITALIC));
-        insert.add(create_toggle_button(null, ComposerWidget.ACTION_UNDERLINE));
-        insert.add(create_toggle_button(null, ComposerWidget.ACTION_STRIKETHROUGH));
+        insert.clear();
+        insert.add(setup_button("format-text-bold-symbolic", ComposerWidget.ACTION_BOLD));
+        insert.add(setup_button("format-text-italic-symbolic", ComposerWidget.ACTION_ITALIC));
+        insert.add(setup_button("format-text-underline-symbolic", ComposerWidget.ACTION_UNDERLINE));
+        insert.add(setup_button("format-text-strikethrough-symbolic", ComposerWidget.ACTION_STRIKETHROUGH));
         add_start(create_pill_buttons(insert, false, true));
 
         // Indent level.
         insert.clear();
-        insert.add(create_toolbar_button(null, ComposerWidget.ACTION_INDENT));
-        insert.add(create_toolbar_button(null, ComposerWidget.ACTION_OUTDENT));
+        insert.add(setup_button("format-indent-more-symbolic", ComposerWidget.ACTION_INDENT));
+        insert.add(setup_button("format-indent-less-symbolic", ComposerWidget.ACTION_OUTDENT));
         add_start(create_pill_buttons(insert, false));
 
         // Link.
         insert.clear();
-        insert.add(create_toolbar_button(null, ComposerWidget.ACTION_INSERT_LINK));
+        insert.add(setup_button("insert-link-symbolic", ComposerWidget.ACTION_INSERT_LINK));
         add_start(create_pill_buttons(insert));
 
         // Remove formatting.
         insert.clear();
-        insert.add(create_toolbar_button(null, ComposerWidget.ACTION_REMOVE_FORMAT));
+        insert.add(setup_button("format-text-remove-symbolic", ComposerWidget.ACTION_REMOVE_FORMAT));
         add_start(create_pill_buttons(insert));
 
         // Menu.
+<<<<<<< TREE
         Gtk.MenuButton more = new Gtk.MenuButton();
         more.image = new Gtk.Image.from_icon_name("view-more-symbolic", Gtk.IconSize.MENU);
         more.popup = menu;
@@ -47,6 +68,45 @@
         label.get_style_context().add_class("dim-label");
         bind_property("label-text", label, "label", BindingFlags.SYNC_CREATE);
         add_end(label);
+=======
+        insert.clear();
+        insert.add(setup_button("open-menu-symbolic", ComposerWidget.ACTION_MENU));
+        add_start(create_pill_buttons(insert));
+
+        // Send
+        insert.clear();
+        insert.add(setup_button("mail-send-symbolic", ComposerWidget.ACTION_SEND));
+        add_end(create_pill_buttons(insert));
+        add_end(new Gtk.Separator(Gtk.Orientation.VERTICAL));
+
+        // Close options.
+        insert.clear();
+        insert.add(setup_button("document-save-symbolic", ComposerWidget.ACTION_CLOSE_SAVE));
+        insert.add(setup_button("user-trash-symbolic", ComposerWidget.ACTION_CLOSE_DISCARD));
+        add_end(create_pill_buttons(insert));
+    }
+
+    protected Gtk.Button setup_button(string? icon_name, string action_name, bool show_label = false) {
+        Gtk.Button b = new Gtk.Button();
+        b.related_action = action_group.get_action(action_name);
+        b.tooltip_text = b.related_action.tooltip;
+        b.related_action.notify["tooltip"].connect(() => { b.tooltip_text = b.related_action.tooltip; });
+        b.image = new Gtk.Image.from_icon_name(icon_name != null ? icon_name :
+            b.related_action.icon_name, Gtk.IconSize.SMALL_TOOLBAR);
+
+        b.always_show_image = true;
+        b.relief = Gtk.ReliefStyle.NONE;
+        
+        if (!show_label)
+            b.label = null;
+
+        return b;
+    }
+
+    public void hide_detach_button() {
+        detach_button.set_no_show_all(true);
+        detach_button.hide();
+>>>>>>> MERGE-SOURCE
     }
 }
 

=== modified file 'src/client/composer/composer-widget.vala'
--- src/client/composer/composer-widget.vala	2015-03-20 22:50:31 +0000
+++ src/client/composer/composer-widget.vala	2015-11-25 01:35:24 +0000
@@ -220,7 +220,7 @@
     private Gee.Set<File> attachment_files = new Gee.HashSet<File>(Geary.Files.nullable_hash,
         Geary.Files.nullable_equal);
     
-    private Gtk.Builder builder;
+    public Gtk.Builder builder;
     private Gtk.Label from_label;
     private Gtk.Label from_single;
     private Gtk.ComboBoxText from_multiple = new Gtk.ComboBoxText();
@@ -1147,8 +1147,9 @@
         state = ComposerWidget.ComposerState.DETACHED;
         if (focus != null && focus.parent.visible) {
             ComposerWindow focus_win = focus.get_toplevel() as ComposerWindow;
-            if (focus_win != null && focus_win == window)
+            if (focus_win != null && focus_win == window) {
                 focus.grab_focus();
+            }
         } else {
             set_focus();
         }

=== modified file 'src/client/composer/composer-window.vala'
--- src/client/composer/composer-window.vala	2015-03-12 01:40:29 +0000
+++ src/client/composer/composer-window.vala	2015-11-25 01:35:24 +0000
@@ -8,26 +8,21 @@
 public class ComposerWindow : Gtk.Window, ComposerContainer {
 
     private bool closing = false;
+    private ComposerWidget composer_widget;
     
     public ComposerWindow(ComposerWidget composer) {
         Object(type: Gtk.WindowType.TOPLEVEL);
         
+        this.composer_widget = composer;
         add(composer);
-        
-        if (!GearyApplication.instance.is_running_unity) {
-            composer.header.show_close_button = true;
-            composer.free_header();
-            set_titlebar(composer.header);
-            composer.bind_property("window-title", composer.header, "title",
-                BindingFlags.SYNC_CREATE);
-        } else {
-            composer.embed_header();
-            composer.bind_property("window-title", this, "title", BindingFlags.SYNC_CREATE);
-        }
+
+        composer.embed_header();
+        composer.bind_property("window-title", this, "title", BindingFlags.SYNC_CREATE);
         
         add_accel_group(composer.ui.get_accel_group());
         show();
         set_position(Gtk.WindowPosition.CENTER);
+        remove_detach_button();
     }
     
     public Gtk.Window top_window {
@@ -56,5 +51,15 @@
     public void remove_composer() {
         warning("Detached composer received remove");
     }
+
+    private void remove_detach_button() {
+        Gtk.Alignment toolbar_area = (Gtk.Alignment) composer_widget.builder.get_object("toolbar area");
+        if(toolbar_area != null) {
+            ComposerToolbar tb = toolbar_area.get_child() as ComposerToolbar;
+            if(tb != null) {
+                tb.hide_detach_button();
+            }
+        }
+    }
 }
 

=== modified file 'src/client/util/util-gtk.vala'
--- src/client/util/util-gtk.vala	2015-03-23 19:09:44 +0000
+++ src/client/util/util-gtk.vala	2015-11-25 01:35:24 +0000
@@ -121,12 +121,6 @@
 }
 
 /**
- * This is not bound in Vala < 0.26.
- */
-[CCode(cname = "g_binding_unbind")]
-extern void unbind(Binding binding);
-
-/**
  * Set xalign property on Gtk.Label in a compatible way.
  *
  * GtkMisc is being deprecated in GTK+ 3 and the "xalign" property has been moved to GtkLabel.  This