X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-msg-edit-window-ui.h;h=006d3f99a77b094df467994e4238d02aba7e196b;hb=4a8de13d63fefd3935633c4b46bc07caf46d7ca5;hp=1e825c051dd504705302a2687775ad3dad0ae321;hpb=efed8f74e1b2d4439aeff42e12001664d8cfaf54;p=modest diff --git a/src/widgets/modest-msg-edit-window-ui.h b/src/widgets/modest-msg-edit-window-ui.h index 1e825c0..006d3f9 100644 --- a/src/widgets/modest-msg-edit-window-ui.h +++ b/src/widgets/modest-msg-edit-window-ui.h @@ -34,19 +34,18 @@ #include #include "modest-icon-names.h" #include "modest-ui-actions.h" +#include "modest-defs.h" G_BEGIN_DECLS static const GtkActionEntry modest_msg_edit_action_entries [] = { - /* Toplevel menus */ - { "Email", NULL, N_("mcen_me_inbox_email") }, + { "Email", NULL, N_("mcen_me_inbox_email") , NULL, NULL, G_CALLBACK (modest_ui_actions_on_email_menu_activated) }, { "View", NULL, N_("mcen_me_inbox_view") , NULL, NULL, G_CALLBACK (modest_ui_actions_on_view_menu_activated)}, { "Edit", NULL, N_("mcen_me_inbox_edit") , NULL, NULL, G_CALLBACK (modest_ui_actions_on_edit_menu_activated)}, { "Format", NULL, N_("mcen_me_editor_format") , NULL, NULL, G_CALLBACK (modest_ui_actions_on_format_menu_activated)}, { "Alignment", NULL, N_("mcen_me_editor_align") }, { "Attachments", NULL, N_("mcen_me_viewer_attachments"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_attachment_menu_activated) }, - { "Zoom", NULL, N_("mcen_me_viewer_zoom") }, { "MessagePriority", NULL, N_("mcen_me_editor_message_priority") }, { "FileFormat", NULL, N_("mcen_me_editor_file_format") }, { "Tools", NULL, N_("mcen_me_inbox_tools") }, @@ -54,46 +53,76 @@ static const GtkActionEntry modest_msg_edit_action_entries [] = { { "Close", NULL, N_("mcen_me_inbox_close") }, /* ACTIONS */ - { "ActionsNewMessage", NULL, N_("mcen_me_viewer_newemail"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_new_msg) }, + /* The logical id is different */ +#ifdef MODEST_TOOLKIT_HILDON2 + { "ActionsNewMessage", NULL, N_("mcen_me_new_message"), "N", NULL, G_CALLBACK (modest_ui_actions_on_new_msg) }, +#else + { "ActionsNewMessage", NULL, N_("mcen_me_viewer_newemail"), "N", NULL, G_CALLBACK (modest_ui_actions_on_new_msg) }, { "ActionsSaveToDrafts", NULL, N_("mcen_me_editor_save_as_draft"), "S", NULL, G_CALLBACK (modest_ui_actions_on_save_to_drafts) }, +#endif +#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) }, - { "ActionsSend", NULL, N_("mcen_me_editor_send"), "Return", NULL, G_CALLBACK (modest_ui_actions_on_send) }, -/* { "ActionsFontColor", GTK_STOCK_SELECT_COLOR, N_("Color"), NULL, N_("Change text color"), G_CALLBACK (modest_ui_actions_on_select_editor_color)}, */ -/* { "BackgroundColor", GTK_STOCK_SELECT_COLOR, N_("Background color"), NULL, N_("Change background color"), G_CALLBACK (modest_ui_actions_on_select_editor_background_color)}, */ +#endif + { "ActionsSend", NULL, N_("mcen_me_editor_send"), NULL, 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)}, + { "BackgroundColor", GTK_STOCK_SELECT_COLOR, N_("Background color"), NULL, N_("Change background color"), G_CALLBACK (modest_ui_actions_on_select_editor_background_color)}, +#endif { "InsertImage", NULL, N_("mcen_me_editor_attach_inlineimage"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_insert_image)}, +#ifndef MODEST_TOOLKIT_HILDON2 { "AttachFile", NULL, N_("mcen_me_editor_attachfile"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_attach_file)}, +#endif { "RemoveAttachments", NULL, N_("mcen_me_inbox_remove_attachments"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_remove_attachments) }, { "Undo", NULL, N_("mcen_me_inbox_undo"), "Z", NULL, G_CALLBACK (modest_ui_actions_on_undo)}, +#ifndef MODEST_TOOLKIT_HILDON2 { "Redo", NULL, N_("mcen_me_inbox_redo"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_redo)}, { "Cut", NULL, N_("mcen_me_inbox_cut"), "X", NULL, G_CALLBACK (modest_ui_actions_on_cut)}, { "Copy", NULL, N_("mcen_me_inbox_copy"), "C", NULL, G_CALLBACK (modest_ui_actions_on_copy)}, { "Paste", NULL, N_("mcen_me_inbox_paste"), "V", NULL, G_CALLBACK (modest_ui_actions_on_paste)}, { "SelectAll", NULL, N_("mcen_me_viewer_selectall"), "A", NULL, G_CALLBACK (modest_ui_actions_on_select_all)}, +#endif { "SelectFont", NULL, N_("mcen_me_editor_font"), NULL, NULL, G_CALLBACK (modest_ui_actions_msg_edit_on_select_font)}, +#ifndef MODEST_TOOLKIT_HILDON2 { "SelectContacts", NULL, N_("mcen_me_editor_selectrecipients"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_select_contacts)}, +#endif { "CheckNames", NULL, N_("mcen_me_editor_checknames"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_check_names)}, { "CloseWindow", NULL, N_("mcen_me_inbox_close_window"), "W", NULL, G_CALLBACK (modest_ui_actions_on_close_window)}, { "CloseAllWindows", NULL, N_("mcen_me_inbox_close_windows"), "Q", NULL, G_CALLBACK (modest_ui_actions_on_quit) }, { "Help", NULL, N_("mcen_me_inbox_help"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_help) }, - { "SearchMessages", NULL, N_("mcen_me_inbox_search"), "E", NULL, G_CALLBACK (modest_ui_actions_on_search_messages) }, - - +#ifndef MODEST_TOOLKIT_HILDON2 + { "SearchMessages", NULL, N_("mcen_me_inbox_search"), "E", NULL, G_CALLBACK (modest_ui_actions_on_search_messages) }, +#endif /* KEY ACCELERATOR ACTIONS */ { "ZoomPlus", NULL, N_("Zoom +"), "F7", NULL, G_CALLBACK (modest_ui_actions_on_zoom_plus) }, { "ZoomMinus", NULL, N_("Zoom -"), "F8", NULL, G_CALLBACK (modest_ui_actions_on_zoom_minus) }, - { "ToggleFullscreen", NULL, N_("Toggle fullscreen"), "F6", NULL, G_CALLBACK (modest_ui_actions_on_change_fullscreen) }, - { "CloseWindowShortcut", NULL, NULL, "Escape", NULL, G_CALLBACK (modest_ui_actions_on_close_window) }, + { "SendShortcut", NULL, N_("Send email"), "KP_Enter", NULL, G_CALLBACK (modest_ui_actions_on_send) }, +#ifdef MODEST_TOOLKIT_HILDON2 + { "SendShortcut2", NULL, N_("Send email"), "Return", NULL, G_CALLBACK (modest_ui_actions_on_send) }, +#endif + { "ToggleFullscreen", NULL, N_("Toggle fullscreen"), "F6", NULL, G_CALLBACK (modest_ui_actions_on_change_fullscreen) }, + { "CloseWindowShortcut", NULL, NULL, "Escape", NULL, NULL }, /* TOOLBAR ACTIONS */ - { "ToolbarSend", MODEST_STOCK_MAIL_SEND, N_("qgn_toolb_messagin_send"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_send) }, - +#ifndef MODEST_TOOLKIT_HILDON2 + { "ToolbarSend", MODEST_TOOLBAR_ICON_MAIL_SEND, N_("mcen_me_editor_send"), "Return", NULL, G_CALLBACK (modest_ui_actions_on_send) }, +#endif +#ifdef MODEST_TOOLKIT_GTK + { "ToolbarAttach", "stock_attach", N_("mcen_me_editor_attachfile"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_attach_file) }, +#endif }; static const GtkToggleActionEntry modest_msg_edit_toggle_action_entries [] = { /* VIEW */ - { "ViewCcField", NULL, N_("mcen_me_editor_showcc"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_toggle_show_cc), TRUE }, +#ifdef MODEST_TOOLKIT_HILDON2 + { "ViewCcField", NULL, N_("mcen_me_editor_showcc"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_toggle_show_cc), FALSE }, + { "ViewBccField", NULL, N_("mcen_me_editor_showbcc"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_toggle_show_bcc), FALSE }, +#else + { "ViewCcField", NULL, N_("mcen_me_editor_showcc"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_toggle_show_cc), TRUE }, { "ViewBccField", NULL, N_("mcen_me_editor_showbcc"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_toggle_show_bcc), TRUE }, +#endif /* Fullscreen toggle */ { "ViewToggleFullscreen", NULL, N_("mcen_me_inbox_fullscreen"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_toggle_fullscreen), FALSE}, @@ -110,7 +139,6 @@ static const GtkToggleActionEntry modest_msg_edit_toggle_action_entries [] = { /* Find in page */ { "FindInMessage", NULL, N_("mcen_me_viewer_find"), "F", NULL, G_CALLBACK (modest_ui_actions_on_toggle_find_in_page), FALSE }, - }; static const GtkRadioActionEntry modest_msg_edit_alignment_radio_action_entries [] = { @@ -119,15 +147,6 @@ static const GtkRadioActionEntry modest_msg_edit_alignment_radio_action_entries { "AlignmentRight", NULL, N_("mcen_me_editor_align_right"), NULL, NULL, GTK_JUSTIFY_RIGHT }, }; -static const GtkRadioActionEntry modest_msg_edit_zoom_action_entries [] = { - { "Zoom50", NULL, N_("mcen_me_viewer_50"), NULL, NULL, 50 }, - { "Zoom80", NULL, N_("mcen_me_viewer_80"), NULL, NULL, 80 }, - { "Zoom100", NULL, N_("mcen_me_viewer_100"), NULL, NULL, 100 }, - { "Zoom120", NULL, N_("mcen_me_viewer_120"), NULL, NULL, 120 }, - { "Zoom150", NULL, N_("mcen_me_viewer_150"), NULL, NULL, 150 }, - { "Zoom200", NULL, N_("mcen_me_viewer_200"), NULL, NULL, 200 } -}; - static const GtkRadioActionEntry modest_msg_edit_priority_action_entries [] = { { "MessagePriorityHigh", NULL, N_("mcen_me_editor_priority_high"), NULL, NULL, TNY_HEADER_FLAG_HIGH_PRIORITY }, { "MessagePriorityNormal", NULL, N_("mcen_me_editor_priority_normal"), NULL, NULL, TNY_HEADER_FLAG_NORMAL_PRIORITY },