nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Restore Archive toolbar label.

Browse source 
* ui/main-toolbar.ui: Update min GTK version, add label to Archive button.
This commit is contained in:
Michael James Gratton 2017-10-16 08:37:36 +10:30
parent 1dddcebb92
commit 29bff87864
1 changed files with 122 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

161
ui/main-toolbar.ui
View file

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