From e61bc5bdd2caaabfffa138d95062511bb849f052 Mon Sep 17 00:00:00 2001 From: Sergio Villar Senin Date: Tue, 13 Jan 2009 14:08:55 +0000 Subject: [PATCH] * Fixes NB#97911, replaced "delete messages" logical id pmo-trunk-r7129 --- src/hildon2/modest-header-window.c | 2 +- src/hildon2/modest-main-window-ui.h | 3 +-- src/hildon2/modest-main-window.c | 4 ++-- src/widgets/modest-msg-edit-window-ui.h | 4 ++++ 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/hildon2/modest-header-window.c b/src/hildon2/modest-header-window.c index 5af886f..ac275c8 100644 --- a/src/hildon2/modest-header-window.c +++ b/src/hildon2/modest-header-window.c @@ -455,7 +455,7 @@ static void setup_menu (ModestHeaderWindow *self) modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_moveto"), NULL, APP_MENU_CALLBACK (set_moveto_edit_mode), MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_delete)); - modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_delete"), NULL, + modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_delete_messages"), NULL, APP_MENU_CALLBACK (set_delete_edit_mode), MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_move_to)); modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_folder details"), NULL, diff --git a/src/hildon2/modest-main-window-ui.h b/src/hildon2/modest-main-window-ui.h index 5f940f9..dd55cbf 100644 --- a/src/hildon2/modest-main-window-ui.h +++ b/src/hildon2/modest-main-window-ui.h @@ -66,11 +66,10 @@ static const GtkActionEntry modest_action_entries [] = { { "EmailReplyAll", NULL, N_("mcen_me_inbox_replytoall"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_reply_all) }, { "EmailForward", NULL, N_("mcen_me_inbox_forward"), "D", NULL, G_CALLBACK (modest_ui_actions_on_forward) }, { "EmailRenameFolder", NULL, N_("mcen_me_rename_folder"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_rename_folder) }, - { "EmailDelete", NULL, N_("mcen_me_inbox_delete"), "BackSpace", NULL, G_CALLBACK (modest_ui_actions_on_delete_message_or_folder) }, + { "EmailDelete", NULL, N_("mcen_me_delete_messages"), "BackSpace", NULL, G_CALLBACK (modest_ui_actions_on_delete_message_or_folder) }, { "EmailContents", NULL, N_("mcen_me_inbox_retrieve_contents"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_retrieve_msg_contents) }, { "EmailDetails", NULL, N_("mcen_me_inbox_messagedetails"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_details) }, { "EmailPurgeAttachments", NULL, N_("mcen_me_inbox_remove_attachments"), NULL, NULL, G_CALLBACK (modest_ui_actions_remove_attachments) }, - /* Edit */ { "EditCut", NULL, N_("mcen_me_inbox_cut"), "X", NULL, G_CALLBACK (modest_ui_actions_on_cut) }, diff --git a/src/hildon2/modest-main-window.c b/src/hildon2/modest-main-window.c index 801324a..35c13f5 100644 --- a/src/hildon2/modest-main-window.c +++ b/src/hildon2/modest-main-window.c @@ -265,7 +265,7 @@ static const GtkActionEntry modest_folder_view_action_entries [] = { { "FolderViewCSMNewFolder", NULL, N_("mcen_ti_new_folder"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_new_folder) }, { "FolderViewCSMRenameFolder", NULL, N_("mcen_me_rename_folder"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_rename_folder) }, { "FolderViewCSMPasteMsgs", NULL, N_("mcen_me_inbox_paste"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_paste)}, - { "FolderViewCSMDeleteFolder", NULL, N_("mcen_me_inbox_delete"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_delete_folder) }, + { "FolderViewCSMDeleteFolder", NULL, N_("mcen_me_delete_messages"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_delete_folder) }, }; static const GtkActionEntry modest_header_view_action_entries [] = { @@ -278,7 +278,7 @@ static const GtkActionEntry modest_header_view_action_entries [] = { { "HeaderViewCSMCut", NULL, N_("mcen_me_inbox_cut"), "X", NULL, G_CALLBACK (modest_ui_actions_on_cut) }, { "HeaderViewCSMCopy", NULL, N_("mcen_me_inbox_copy"), "C", NULL, G_CALLBACK (modest_ui_actions_on_copy) }, { "HeaderViewCSMPaste", NULL, N_("mcen_me_inbox_paste"), "V", NULL, G_CALLBACK (modest_ui_actions_on_paste) }, - { "HeaderViewCSMDelete", NULL, N_("mcen_me_inbox_delete"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_delete_message) }, + { "HeaderViewCSMDelete", NULL, N_("mcen_me_delete_messages"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_delete_message) }, { "HeaderViewCSMCancelSending", NULL, N_("mcen_me_outbox_cancelsend"), NULL, NULL, G_CALLBACK (modest_ui_actions_cancel_send) }, }; diff --git a/src/widgets/modest-msg-edit-window-ui.h b/src/widgets/modest-msg-edit-window-ui.h index 64e328a..a89dd60 100644 --- a/src/widgets/modest-msg-edit-window-ui.h +++ b/src/widgets/modest-msg-edit-window-ui.h @@ -60,7 +60,11 @@ static const GtkActionEntry modest_msg_edit_action_entries [] = { { "ActionsNewMessage", NULL, N_("mcen_me_viewer_newemail"), "N", NULL, G_CALLBACK (modest_ui_actions_on_new_msg) }, #endif { "ActionsSaveToDrafts", NULL, N_("mcen_me_editor_save_as_draft"), "S", NULL, G_CALLBACK (modest_ui_actions_on_save_to_drafts) }, +#ifdef MODEST_TOOLKIT_HILDON2 + { "ActionsDelete", NULL, N_("mcen_me_delete_messages"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_delete_message) }, +#else { "ActionsDelete", NULL, N_("mcen_me_inbox_delete"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_delete_message) }, +#endif { "ActionsSend", NULL, N_("mcen_me_editor_send"), "KP_Enter", NULL, G_CALLBACK (modest_ui_actions_on_send) }, #ifndef MODEST_TOOLKIT_HILDON2 { "ActionsFontColor", GTK_STOCK_SELECT_COLOR, N_("Color"), NULL, N_("Change text color"), G_CALLBACK (modest_ui_actions_on_select_editor_color)}, -- 1.7.9.5