Commit d6ad0c22 authored by Matthew Barnes's avatar Matthew Barnes

Bug 678397 - Move "mail-to-task" actions to a submenu

Shortens the Message menu a little for low screen resolutions.
parent 50a5e067
......@@ -1992,30 +1992,30 @@ static GtkActionEntry mail_reader_entries[] = {
N_("Mark the selected messages for deletion"),
G_CALLBACK (action_mail_delete_cb) },
{ "mail-filter-on-mailing-list",
{ "mail-filter-rule-for-mailing-list",
NULL,
N_("Filter on Mailing _List..."),
N_("Create a Filter Rule for Mailing _List..."),
NULL,
N_("Create a rule to filter messages to this mailing list"),
G_CALLBACK (action_mail_filter_on_mailing_list_cb) },
{ "mail-filter-on-recipients",
{ "mail-filter-rule-for-recipients",
NULL,
N_("Filter on _Recipients..."),
N_("Create a Filter Rule for _Recipients..."),
NULL,
N_("Create a rule to filter messages to these recipients"),
G_CALLBACK (action_mail_filter_on_recipients_cb) },
{ "mail-filter-on-sender",
{ "mail-filter-rule-for-sender",
NULL,
N_("Filter on Se_nder..."),
N_("Create a Filter Rule for Se_nder..."),
NULL,
N_("Create a rule to filter messages from this sender"),
G_CALLBACK (action_mail_filter_on_sender_cb) },
{ "mail-filter-on-subject",
{ "mail-filter-rule-for-subject",
NULL,
N_("Filter on _Subject..."),
N_("Create a Filter Rule for _Subject..."),
NULL,
N_("Create a rule to filter messages with this subject"),
G_CALLBACK (action_mail_filter_on_subject_cb) },
......@@ -2365,9 +2365,9 @@ static GtkActionEntry mail_reader_entries[] = {
/*** Menus ***/
{ "mail-create-rule-menu",
{ "mail-create-menu",
NULL,
N_("Create R_ule"),
N_("Cre_ate"),
NULL,
NULL,
NULL },
......@@ -2426,28 +2426,28 @@ static GtkActionEntry mail_reader_search_folder_entries[] = {
{ "mail-search-folder-from-mailing-list",
NULL,
N_("Search Folder from Mailing _List..."),
N_("Create a Search Folder from Mailing _List..."),
NULL,
N_("Create a search folder for this mailing list"),
G_CALLBACK (action_mail_search_folder_from_mailing_list_cb) },
{ "mail-search-folder-from-recipients",
NULL,
N_("Search Folder from Recipien_ts..."),
N_("Create a Search Folder from Recipien_ts..."),
NULL,
N_("Create a search folder for these recipients"),
G_CALLBACK (action_mail_search_folder_from_recipients_cb) },
{ "mail-search-folder-from-sender",
NULL,
N_("Search Folder from Sen_der..."),
N_("Create a Search Folder from Sen_der..."),
NULL,
N_("Create a search folder for this sender"),
G_CALLBACK (action_mail_search_folder_from_sender_cb) },
{ "mail-search-folder-from-subject",
NULL,
N_("Search Folder from S_ubject..."),
N_("Create a Search Folder from S_ubject..."),
NULL,
N_("Create a search folder for this subject"),
G_CALLBACK (action_mail_search_folder_from_subject_cb) },
......@@ -3356,7 +3356,7 @@ mail_reader_update_actions (EMailReader *reader,
action = e_mail_reader_get_action (reader, action_name);
gtk_action_set_sensitive (action, sensitive);
action_name = "mail-create-rule-menu";
action_name = "mail-create-menu";
sensitive = single_message_selected;
action = e_mail_reader_get_action (reader, action_name);
gtk_action_set_sensitive (action, sensitive);
......
......@@ -47,14 +47,14 @@
E_SHELL_WINDOW_ACTION ((window), "mail-delete")
#define E_SHELL_WINDOW_ACTION_MAIL_DOWNLOAD(window) \
E_SHELL_WINDOW_ACTION ((window), "mail-download")
#define E_SHELL_WINDOW_ACTION_MAIL_FILTER_ON_MAILING_LIST(window) \
E_SHELL_WINDOW_ACTION ((window), "mail-filter-on-mailing-list")
#define E_SHELL_WINDOW_ACTION_MAIL_FILTER_ON_RECIPIENTS(window) \
E_SHELL_WINDOW_ACTION ((window), "mail-filter-on-recipients")
#define E_SHELL_WINDOW_ACTION_MAIL_FILTER_ON_SENDER(window) \
E_SHELL_WINDOW_ACTION ((window), "mail-filter-on-sender")
#define E_SHELL_WINDOW_ACTION_MAIL_FILTER_ON_SUBJECT(window) \
E_SHELL_WINDOW_ACTION ((window), "mail-filter-on-subject")
#define E_SHELL_WINDOW_ACTION_MAIL_FILTER_RULE_FOR_MAILING_LIST(window) \
E_SHELL_WINDOW_ACTION ((window), "mail-filter-rule-for-mailing-list")
#define E_SHELL_WINDOW_ACTION_MAIL_FILTER_RULE_FOR_RECIPIENTS(window) \
E_SHELL_WINDOW_ACTION ((window), "mail-filter-rule-for-recipients")
#define E_SHELL_WINDOW_ACTION_MAIL_FILTER_RULE_FOR_SENDER(window) \
E_SHELL_WINDOW_ACTION ((window), "mail-filter-rule-for-sender")
#define E_SHELL_WINDOW_ACTION_MAIL_FILTER_RULE_FOR_SUBJECT(window) \
E_SHELL_WINDOW_ACTION ((window), "mail-filter-rule-for-subject")
#define E_SHELL_WINDOW_ACTION_MAIL_FILTERS_APPLY(window) \
E_SHELL_WINDOW_ACTION ((window), "mail-filters-apply")
#define E_SHELL_WINDOW_ACTION_MAIL_FIND(window) \
......
......@@ -54,8 +54,8 @@
#include <calendar/gui/dialogs/memo-editor.h>
#include <calendar/gui/dialogs/task-editor.h>
#define E_SHELL_WINDOW_ACTION_CONVERT_TO_EVENT(window) \
E_SHELL_WINDOW_ACTION ((window), "mail-convert-to-event")
#define E_SHELL_WINDOW_ACTION_CONVERT_TO_APPOINTMENT(window) \
E_SHELL_WINDOW_ACTION ((window), "mail-convert-to-appointment")
#define E_SHELL_WINDOW_ACTION_CONVERT_TO_MEETING(window) \
E_SHELL_WINDOW_ACTION ((window), "mail-convert-to-meeting")
#define E_SHELL_WINDOW_ACTION_CONVERT_TO_MEMO(window) \
......@@ -1266,9 +1266,9 @@ action_mail_convert_to_task_cb (GtkAction *action,
static GtkActionEntry multi_selection_entries[] = {
{ "mail-convert-to-event",
{ "mail-convert-to-appointment",
"appointment-new",
N_("Create an _Event"),
N_("Create an _Appointment"),
NULL,
N_("Create a new event from the selected message"),
G_CALLBACK (action_mail_convert_to_event_cb) },
......
......@@ -8,21 +8,23 @@
<ui-manager id="org.gnome.evolution.mail.browser"
callback="mail_browser_init">
#if !EXPRESS
<menubar name='main-menu'>
<placeholder name='custom-menus'>
<menubar name="main-menu">
<placeholder name="custom-menus">
<menu action="mail-message-menu">
<placeholder name="mail-message-actions">
<menuitem action="mail-convert-to-event"/>
<menuitem action="mail-convert-to-meeting"/>
<menuitem action="mail-convert-to-task"/>
<menuitem action="mail-convert-to-memo"/>
</placeholder>
<menu action="mail-create-menu">
<placeholder name="mail-conversion-actions">
<menuitem action="mail-convert-to-appointment"/>
<menuitem action="mail-convert-to-meeting"/>
<menuitem action="mail-convert-to-task"/>
<menuitem action="mail-convert-to-memo"/>
</placeholder>
</menu>
</menu>
</placeholder>
</menubar>
<popup name="mail-preview-popup">
<placeholder name="mail-message-popup-actions">
<menuitem action="mail-convert-to-event"/>
<menuitem action="mail-convert-to-appointment"/>
<menuitem action="mail-convert-to-meeting"/>
<menuitem action="mail-convert-to-task"/>
<menuitem action="mail-convert-to-memo"/>
......@@ -33,29 +35,33 @@
<ui-manager id="org.gnome.evolution.mail"
callback="mail_shell_view_init">
#if !EXPRESS
<menubar name='main-menu'>
<placeholder name='custom-menus'>
<menubar name="main-menu">
<placeholder name="custom-menus">
<menu action="mail-message-menu">
<placeholder name="mail-message-actions">
<menuitem action="mail-convert-to-event"/>
<menuitem action="mail-convert-to-meeting"/>
<menuitem action="mail-convert-to-task"/>
<menuitem action="mail-convert-to-memo"/>
</placeholder>
<menu action="mail-create-menu">
<placeholder name="mail-conversion-actions">
<menuitem action="mail-convert-to-appointment"/>
<menuitem action="mail-convert-to-meeting"/>
<menuitem action="mail-convert-to-task"/>
<menuitem action="mail-convert-to-memo"/>
</placeholder>
</menu>
</menu>
</placeholder>
</menubar>
<popup name="mail-message-popup">
<placeholder name="mail-message-popup-actions">
<menuitem action="mail-convert-to-event"/>
<menuitem action="mail-convert-to-meeting"/>
<menuitem action="mail-convert-to-task"/>
<menuitem action="mail-convert-to-memo"/>
</placeholder>
<menu action="mail-create-menu">
<placeholder name="mail-conversion-actions">
<menuitem action="mail-convert-to-appointment"/>
<menuitem action="mail-convert-to-meeting"/>
<menuitem action="mail-convert-to-task"/>
<menuitem action="mail-convert-to-memo"/>
</placeholder>
</menu>
</popup>
<popup name="mail-preview-popup">
<placeholder name="mail-message-popup-actions">
<menuitem action="mail-convert-to-event"/>
<menuitem action="mail-convert-to-appointment"/>
<menuitem action="mail-convert-to-meeting"/>
<menuitem action="mail-convert-to-task"/>
<menuitem action="mail-convert-to-memo"/>
......
......@@ -96,14 +96,16 @@
</menu>
<menuitem action='mail-filters-apply'/>
<menuitem action='mail-check-for-junk'/>
<menuitem action='mail-remove-attachments'/>
<menuitem action='mail-remove-attachments'/>
<menuitem action='mail-remove-duplicates'/>
<separator/>
<menu action='mail-create-rule-menu'>
<menuitem action='mail-filter-on-subject'/>
<menuitem action='mail-filter-on-sender'/>
<menuitem action='mail-filter-on-recipients'/>
<menuitem action='mail-filter-on-mailing-list'/>
<menu action='mail-create-menu'>
<placeholder action='mail-conversion-actions'/>
<separator/>
<menuitem action='mail-filter-rule-for-subject'/>
<menuitem action='mail-filter-rule-for-sender'/>
<menuitem action='mail-filter-rule-for-recipients'/>
<menuitem action='mail-filter-rule-for-mailing-list'/>
<separator/>
<menuitem action='mail-search-folder-from-subject'/>
<menuitem action='mail-search-folder-from-sender'/>
......@@ -111,8 +113,6 @@
<menuitem action='mail-search-folder-from-mailing-list'/>
</menu>
<placeholder name='mail-message-custom-menus'/>
<separator/>
<placeholder name='mail-message-actions'/>
</menu>
</placeholder>
</menubar>
......
......@@ -128,11 +128,13 @@
<menuitem action='mail-label-new'/>
</menu>
<separator/>
<menu action='mail-create-rule-menu'>
<menuitem action='mail-filter-on-subject'/>
<menuitem action='mail-filter-on-sender'/>
<menuitem action='mail-filter-on-recipients'/>
<menuitem action='mail-filter-on-mailing-list'/>
<menu action='mail-create-menu'>
<placeholder name='mail-conversion-actions'/>
<separator/>
<menuitem action='mail-filter-rule-for-subject'/>
<menuitem action='mail-filter-rule-for-sender'/>
<menuitem action='mail-filter-rule-for-recipients'/>
<menuitem action='mail-filter-rule-for-mailing-list'/>
<separator/>
<menuitem action='mail-search-folder-from-subject'/>
<menuitem action='mail-search-folder-from-sender'/>
......@@ -141,8 +143,6 @@
</menu>
<separator/>
<placeholder name='mail-message-templates'/>
<separator/>
<placeholder name='mail-message-popup-actions'/>
</popup>
<popup name='mail-search-options'>
<menuitem action='mail-search-advanced-hidden'/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment