[geary: 2/4] Restore Archive toolbar label.

[Michael Gratton <mjog src gnome org>]

commit 29bff87864ac32ebb999f792e2da8a324b487c0a
Author: Michael James Gratton <mike vee net>
Date:   Mon Oct 16 08:37:36 2017 +1030

    Restore Archive toolbar label.
    
    * ui/main-toolbar.ui: Update min GTK version, add label to Archive button.

 ui/main-toolbar.ui |  161 +++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 122 insertions(+), 39 deletions(-)
---
diff --git a/ui/main-toolbar.ui b/ui/main-toolbar.ui
index 48cd8a0..9fa65e8 100644
--- a/ui/main-toolbar.ui
+++ b/ui/main-toolbar.ui
@@ -1,28 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
 <interface>
-  <requires lib="gtk+" version="3.14"/>
+  <requires lib="gtk+" version="3.20"/>
+  <object class="GtkImage" id="archive_image">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">mail-archive-symbolic</property>
+  </object>
   <template class="MainToolbar" parent="GtkBox">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="orientation">horizontal</property>
-    <property name="spacing">0</property>
     <child>
       <object class="GtkHeaderBar" id="folder_header">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <style>
-          <class name="geary-titlebar" />
-          <class name="geary-titlebar-left" />
-        </style>
         <child>
           <object class="GtkButton" id="compose_new_message_button">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="focus_on_click">False</property>
-            <property name="always_show_image">True</property>
+            <property name="receives_default">False</property>
             <property name="action_name">win.new-message</property>
+            <property name="always_show_image">True</property>
             <child>
               <object class="GtkImage" id="compose_new_message_image">
+                <property name="can_focus">False</property>
                 <property name="icon_name">text-editor-symbolic</property>
               </object>
             </child>
@@ -36,6 +38,7 @@
           </object>
           <packing>
             <property name="pack_type">end</property>
+            <property name="position">1</property>
           </packing>
         </child>
         <child>
@@ -43,16 +46,19 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="focus_on_click">False</property>
-            <property name="always_show_image">True</property>
+            <property name="receives_default">False</property>
             <property name="tooltip_text" translatable="yes">Toggle search bar</property>
+            <property name="always_show_image">True</property>
             <child>
               <object class="GtkImage" id="search_conversations_image">
+                <property name="can_focus">False</property>
                 <property name="icon_name">preferences-system-search-symbolic</property>
               </object>
             </child>
           </object>
           <packing>
             <property name="pack_type">end</property>
+            <property name="position">2</property>
           </packing>
         </child>
         <child>
@@ -60,148 +66,204 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="focus_on_click">False</property>
-            <property name="always_show_image">True</property>
+            <property name="receives_default">False</property>
             <property name="tooltip_text" translatable="yes">Empty Spam or Trash folders</property>
+            <property name="always_show_image">True</property>
             <child>
               <object class="GtkImage" id="empty_menu_image">
+                <property name="can_focus">False</property>
                 <property name="icon_name">edit-clear-all-symbolic</property>
               </object>
             </child>
           </object>
           <packing>
             <property name="pack_type">end</property>
+            <property name="position">3</property>
           </packing>
         </child>
+        <style>
+          <class name="geary-titlebar"/>
+          <class name="geary-titlebar-left"/>
+        </style>
       </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">0</property>
+      </packing>
     </child>
     <child>
       <object class="GtkHeaderBar" id="conversation_header">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <style>
-          <class name="geary-titlebar" />
-          <class name="geary-titlebar-right" />
-        </style>
         <child>
           <object class="GtkBox" id="reply_forward_buttons">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <style>
-              <class name="raised" />
-              <class name="linked" />
-            </style>
             <child>
               <object class="GtkButton" id="reply_sender_button">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="focus_on_click">False</property>
-                <property name="always_show_image">True</property>
+                <property name="receives_default">False</property>
                 <property name="tooltip_text" translatable="yes">Reply</property>
                 <property name="action_name">win.reply-to-message</property>
+                <property name="always_show_image">True</property>
                 <child>
                   <object class="GtkImage" id="reply_sender_image">
+                    <property name="can_focus">False</property>
                     <property name="icon_name">mail-reply-sender-symbolic</property>
                   </object>
                 </child>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <object class="GtkButton" id="reply_all_button">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="focus_on_click">False</property>
-                <property name="always_show_image">True</property>
+                <property name="receives_default">False</property>
                 <property name="tooltip_text" translatable="yes">Reply All</property>
                 <property name="action_name">win.reply-all-message</property>
+                <property name="always_show_image">True</property>
                 <child>
                   <object class="GtkImage" id="reply_all_image">
+                    <property name="can_focus">False</property>
                     <property name="icon_name">mail-reply-all-symbolic</property>
                   </object>
                 </child>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
             </child>
             <child>
               <object class="GtkButton" id="forward_button">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="focus_on_click">False</property>
-                <property name="always_show_image">True</property>
+                <property name="receives_default">False</property>
                 <property name="tooltip_text" translatable="yes">Forward</property>
                 <property name="action_name">win.forward-message</property>
+                <property name="always_show_image">True</property>
                 <child>
                   <object class="GtkImage" id="forward_image">
+                    <property name="can_focus">False</property>
                     <property name="icon_name">mail-forward-symbolic</property>
                   </object>
                 </child>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
+              </packing>
             </child>
+            <style>
+              <class name="raised"/>
+              <class name="linked"/>
+            </style>
           </object>
         </child>
         <child>
           <object class="GtkBox" id="mark_copy_move_buttons">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <style>
-              <class name="raised" />
-              <class name="linked" />
-            </style>
             <child>
               <object class="GtkMenuButton" id="mark_message_button">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="focus_on_click">False</property>
-                <property name="always_show_image">True</property>
+                <property name="receives_default">False</property>
                 <property name="action_name">win.mark-message-menu</property>
+                <property name="always_show_image">True</property>
                 <child>
                   <object class="GtkImage" id="mark_message_image">
+                    <property name="can_focus">False</property>
                     <property name="icon_name">marker-symbolic</property>
                   </object>
                 </child>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <object class="GtkMenuButton" id="move_message_button">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="focus_on_click">False</property>
+                <property name="receives_default">False</property>
                 <property name="always_show_image">True</property>
                 <child>
                   <object class="GtkImage" id="copy_message_image">
+                    <property name="can_focus">False</property>
                     <property name="icon_name">tag-symbolic</property>
                   </object>
                 </child>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
             </child>
             <child>
               <object class="GtkMenuButton" id="copy_message_button">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="focus_on_click">False</property>
+                <property name="receives_default">False</property>
                 <property name="always_show_image">True</property>
                 <child>
                   <object class="GtkImage" id="move_message_image">
+                    <property name="can_focus">False</property>
                     <property name="icon_name">folder-symbolic</property>
                   </object>
                 </child>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
+              </packing>
             </child>
+            <style>
+              <class name="raised"/>
+              <class name="linked"/>
+            </style>
           </object>
+          <packing>
+            <property name="position">1</property>
+          </packing>
         </child>
         <child>
           <object class="GtkToggleButton" id="find_button">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="focus_on_click">False</property>
-            <property name="always_show_image">True</property>
+            <property name="receives_default">False</property>
             <property name="tooltip_text" translatable="yes">Toggle find bar</property>
+            <property name="always_show_image">True</property>
             <child>
               <object class="GtkImage" id="find_image">
+                <property name="can_focus">False</property>
                 <property name="icon_name">preferences-system-search-symbolic</property>
               </object>
             </child>
           </object>
           <packing>
             <property name="pack_type">end</property>
+            <property name="position">2</property>
           </packing>
         </child>
         <child>
@@ -209,62 +271,83 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="focus_on_click">False</property>
-            <property name="always_show_image">True</property>
+            <property name="receives_default">False</property>
             <property name="action_name">win.undo</property>
+            <property name="always_show_image">True</property>
             <child>
               <object class="GtkImage" id="undo_image">
+                <property name="can_focus">False</property>
                 <property name="icon_name">edit-undo-symbolic</property>
               </object>
             </child>
           </object>
           <packing>
             <property name="pack_type">end</property>
+            <property name="position">3</property>
           </packing>
         </child>
         <child>
           <object class="GtkBox" id="archive_trash_delete_buttons">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <style>
-              <class name="raised" />
-              <class name="linked" />
-            </style>
             <child>
               <object class="GtkButton" id="archive_button">
+                <property name="label" translatable="yes">_Archive</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="focus_on_click">False</property>
-                <property name="always_show_image">True</property>
+                <property name="receives_default">False</property>
                 <property name="action_name">win.archive-conv</property>
-                <child>
-                  <object class="GtkImage" id="archive_image">
-                    <property name="icon_name">mail-archive-symbolic</property>
-                  </object>
-                </child>
+                <property name="image">archive_image</property>
+                <property name="use_underline">True</property>
+                <property name="always_show_image">True</property>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <object class="GtkButton" id="trash_delete_button">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="focus_on_click">False</property>
-                <property name="always_show_image">True</property>
+                <property name="receives_default">False</property>
                 <property name="action_name">win.trash-conv</property>
+                <property name="always_show_image">True</property>
                 <child>
                   <object class="GtkImage" id="trash_delete_image">
+                    <property name="can_focus">False</property>
                     <property name="icon_name">user-trash-symbolic</property>
                   </object>
                 </child>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
             </child>
+            <style>
+              <class name="raised"/>
+              <class name="linked"/>
+            </style>
           </object>
           <packing>
             <property name="pack_type">end</property>
+            <property name="position">4</property>
           </packing>
         </child>
+        <style>
+          <class name="geary-titlebar"/>
+          <class name="geary-titlebar-right"/>
+        </style>
       </object>
       <packing>
         <property name="expand">True</property>
+        <property name="fill">True</property>
+        <property name="position">1</property>
       </packing>
     </child>
   </template>