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

Clean up MainWindow action definitions

Browse source 
Rename action consts and values to better reflect what they do.
This commit is contained in:
Michael Gratton 2019-10-06 20:44:48 +11:00 • committed by Michael James Gratton
parent 19b1382345
commit fe67993c8e
4 changed files with 73 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

16
ui/main-toolbar-menus.ui
View file

@ -3,27 +3,23 @@
<menu id="mark_message_menu">
<item>
<attribute name="label" translatable="yes">Mark as _Read</attribute>
<attribute name="action">win.mark-message-read</attribute>
<attribute name="action">win.mark-conversation-read</attribute>
</item>
<item>
<attribute name="label" translatable="yes">Mark as _Unread</attribute>
<attribute name="action">win.mark-message-unread</attribute>
<attribute name="action">win.mark-conversation-unread</attribute>
</item>
<item>
<attribute name="label" translatable="yes">_Star</attribute>
<attribute name="action">win.mark-message-starred</attribute>
<attribute name="action">win.mark-conversation-starred</attribute>
</item>
<item>
<attribute name="label" translatable="yes">U_nstar</attribute>
<attribute name="action">win.mark-message-unstarred</attribute>
<attribute name="action">win.mark-conversation-unstarred</attribute>
</item>
<item>
<attribute name="label" translatable="yes">Mark as S_pam</attribute>
<attribute name="action">win.mark-message-spam</attribute>
</item>
<item>
<attribute name="label" translatable="yes">Mark as not S_pam</attribute>
<attribute name="action">win.mark-message-not-spam</attribute>
<attribute name="label" translatable="yes">Toggle as S_pam</attribute>
<attribute name="action">win.toggle-conversation-spam</attribute>
</item>
</menu>
<menu id="main_menu">

11
ui/main-toolbar.ui
View file

@ -111,7 +111,7 @@
<property name="focus_on_click">False</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="action_name">win.reply-conversation</property>
<property name="always_show_image">True</property>
<child>
<object class="GtkImage" id="reply_sender_image">
@ -134,7 +134,7 @@
<property name="focus_on_click">False</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="action_name">win.reply-all-conversation</property>
<property name="always_show_image">True</property>
<child>
<object class="GtkImage" id="reply_all_image">
@ -157,7 +157,7 @@
<property name="focus_on_click">False</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="action_name">win.forward-conversation</property>
<property name="always_show_image">True</property>
<child>
<object class="GtkImage" id="forward_image">
@ -189,7 +189,6 @@
<property name="can_focus">True</property>
<property name="focus_on_click">False</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">
@ -288,7 +287,7 @@
<property name="can_focus">True</property>
<property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="action_name">win.archive-conv</property>
<property name="action_name">win.archive-conversation</property>
<property name="image">archive_image</property>
<property name="use_underline">True</property>
<property name="always_show_image">True</property>
@ -305,7 +304,7 @@
<property name="can_focus">True</property>
<property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="action_name">win.trash-conv</property>
<property name="action_name">win.trash-conversation</property>
<property name="always_show_image">True</property>
<child>
<object class="GtkImage" id="trash_delete_image">