2007-04-06 Murray Cumming <murrayc@murrayc.com>
[modest] / src / maemo / modest-main-window-ui.h
index 1eda953..cb0611c 100644 (file)
@@ -41,66 +41,59 @@ G_BEGIN_DECLS
 static const GtkActionEntry modest_action_entries [] = {
 
        /* Toplevel menus */
-       { "Message", NULL, N_("Message") },
+       { "Email", NULL, N_("mcen_me_inbox_email") },
        { "Edit",    NULL, N_("Edit") },
        { "View",    NULL, N_("View") },
-       { "Folders", NULL, N_("Folders") },
-       { "Accounts",NULL, N_("Accounts") },
        { "Tools",   NULL, N_("Tools") },
        { "Close",   NULL, N_("Close") },
 
-       /* Message */
-       { "MessageNew",         NULL,  N_("_New message"),      "<CTRL>N", NULL,   G_CALLBACK (modest_ui_actions_on_new_msg) },
-       { "MessageOpen",        NULL,  N_("_Open"),             "<CTRL>O", NULL,   NULL },
-       { "MessageCancelSending",  NULL,  N_("Cancel sending"), NULL,      NULL,   NULL },
-       { "MessageSend",        NULL,  N_("Send"),              NULL,      NULL,   NULL },
-       { "MessageReply",       NULL,  N_("_Reply"),            NULL,      NULL,   G_CALLBACK (modest_ui_actions_on_reply) },
-       { "MessageReplyAll",    NULL,  N_("Reply to all"),      NULL,      NULL,   G_CALLBACK (modest_ui_actions_on_reply_all) },
-       { "MessageForward",     NULL,  N_("_Forward"),          NULL,      NULL,   G_CALLBACK (modest_ui_actions_on_forward) },
-       { "MessageDelete",      NULL,  N_("Delete message"),    NULL,      NULL,   G_CALLBACK (modest_ui_actions_on_delete) },
-       { "MessageSendReceive", NULL,  N_("Send and receive"),  NULL,      NULL,   G_CALLBACK (modest_ui_actions_on_send_receive) },
-       { "MessageContents",    NULL,  N_("Retrieve contents"), NULL,      NULL,   NULL },
-       { "MessageDetails",     NULL,  N_("Details..."),        NULL,      NULL,   NULL },
+       /* Email */
+       { "EmailNew", NULL, N_("mcen_me_inbox_new") }, /* submenu */
+       { "EmailNewMessage",  NULL,  N_("mcen_me_inbox_new"),      "<CTRL>N", NULL,   G_CALLBACK (modest_ui_actions_on_new_msg) },
+       { "EmailNewFolder",   NULL,  N_("mcen_me_inbox_folder"),       NULL,      NULL,   G_CALLBACK (modest_ui_actions_on_new_folder) },
+       { "EmailOpen",        NULL,  N_("mcen_me_inbox_open"),          "<CTRL>O", NULL,   NULL },
+/*     { "MessageCancelSending",  NULL,  N_(""),       NULL,      NULL,   NULL }, */
+/*     { "MessageSend",        NULL,  N_("Send"),              NULL,      NULL,   NULL }, */
+/*     { "MessageSendNow",        NULL,  N_("Send now"),               NULL,      NULL,   NULL }, */
+       { "EmailReply",       NULL,  N_("mcen_me_inbox_reply"),            NULL,      NULL,   G_CALLBACK (modest_ui_actions_on_reply) },
+       { "EmailReplyAll",    NULL,  N_("mcen_me_inbox_replytoall"),      NULL,      NULL,   G_CALLBACK (modest_ui_actions_on_reply_all) },
+       { "EmailForward",     NULL,  N_("mcen_me_inbox_forward"),          NULL,      NULL,   G_CALLBACK (modest_ui_actions_on_forward) },
+       { "EmailDelete",      NULL,  N_("mcen_me_inbox_delete"),    NULL,      NULL,   G_CALLBACK (modest_ui_actions_on_delete) },
+/*     { "MessageSendReceive", NULL,  N_("Send and receive"),  NULL,      NULL,   G_CALLBACK (modest_ui_actions_on_send_receive) }, */
+       { "EmailContents",    NULL,  N_("mcen_me_inbox_retrieve_contents"), NULL,      NULL,   NULL },
+       { "EmailDetails",     NULL,  N_("mcen_me_inbox_messagedetails"),        NULL,      NULL,   NULL },
+       { "EmailPurgeAttachments", NULL, N_("FIXME: Purge attachments"), NULL,  NULL,   NULL },
        
 
        /* Edit */
        { "EditUndo",        NULL,      N_("_Undo"),        "<CTRL>Z",    NULL, NULL },
-       { "EditCut",         NULL,      N_("Cut"),          "<CTRL>X",    NULL, NULL },
-       { "EditCopy",        NULL,      N_("Copy"),         "<CTRL>C",    NULL, NULL },
-       { "EditPaste",       NULL,      N_("Paste"),        "<CTRL>V",    NULL, NULL },
+       { "EditCut",         NULL,      N_("Cut"),          "<CTRL>X",    NULL, G_CALLBACK (modest_ui_actions_on_cut) },
+       { "EditCopy",        NULL,      N_("Copy"),         "<CTRL>C",    NULL, G_CALLBACK (modest_ui_actions_on_copy) },
+       { "EditPaste",       NULL,      N_("Paste"),        "<CTRL>V",    NULL, G_CALLBACK (modest_ui_actions_on_paste) },
+       { "EditSelectAll",   NULL,      N_("Select all"),    NULL,        NULL, G_CALLBACK (modest_ui_actions_on_select_all) },
        { "EditDelete",      NULL,      N_("_Delete"),       NULL,        NULL, NULL },
+       { "EditMarkAsRead", NULL,      N_("Mark as read"),       NULL,    NULL, NULL },
+       { "EditMarkAsUnread", NULL,      N_("Mark as unread"),       NULL,        NULL, NULL },
        { "EditSelect",      NULL,      N_("Select..."),     NULL,        NULL, NULL },   /* submenu */
        { "EditMoveTo",      NULL,      N_("Move to..."),    NULL,        NULL, NULL },
-
        
        /* View */
        { "ViewSort",            NULL,        N_("Sort..."),     NULL,      NULL,  NULL },
        { "ViewFolders",         NULL,        N_("Folders"),     NULL,     NULL,  NULL },
        { "ViewFullscreen",      NULL,        N_("Fullscreen"),  NULL,     NULL,  NULL },
-       { "ViewDetails",         NULL,        N_("Details"),     NULL,     NULL,  NULL },
-       { "ViewThumbnails",      NULL,        N_("Thumbnails"),  NULL,     NULL,  NULL },
-       { "ViewShowToolbar",     NULL,        N_("Show toolbar"), NULL,   NULL,  NULL },    /* submenu */
-
-               
-       /* Folders */
-       { "FoldersNew",          NULL,       N_("New folder"),       NULL, NULL, G_CALLBACK (modest_ui_actions_on_new_folder) },
-       { "FoldersManage",       NULL,       N_("Manage..."),        NULL, NULL, NULL },
-       { "FoldersDetails",      NULL,       N_("Details..."),       NULL, NULL, NULL },
-       { "FoldersDelete",       NULL,       N_("Delete"),           NULL, NULL, G_CALLBACK (modest_ui_actions_on_delete_folder) },
-       { "FoldersRename",       NULL,       N_("Rename"),           NULL, NULL, G_CALLBACK (modest_ui_actions_on_rename_folder) },
-       { "FoldersMoveToTrash",  NULL,       N_("Move to trash"),    NULL, NULL, G_CALLBACK (modest_ui_actions_on_move_folder_to_trash_folder) },
-
-       
-       /* Accounts */
-       { "AccountsNew",          NULL,    N_("_New account..."),             NULL, NULL,  NULL },
-       { "AccountsManage",        NULL,    N_("Manage..."),                  NULL, NULL,  G_CALLBACK (modest_ui_actions_on_accounts) },
-       { "AccountsConfigureSMTP", NULL,    N_("Configure SMTP servers..."),  NULL, NULL,  NULL },
+       { "ViewShowToolbar", NULL, N_("Show toolbar") }, /* submenu */
+       { "ViewShowToolbarNormalScreen",         NULL,        N_("Normal screen"),     NULL,     NULL,  NULL },
+       { "ViewShowToolbarFullScreen",      NULL,        N_("Full screen"),  NULL,     NULL,  NULL },
        
        /* Tools */
        { "ToolsSettings",        NULL,      N_("Settings..."),               NULL, NULL,  NULL },
-       { "ToolsContacts",        NULL,      N_("Contact..."),                NULL, NULL,  NULL },
-       { "ToolsFontSettings",    NULL,      N_("Font settings..."),          NULL, NULL,  NULL },
-       { "ToolsSearchMessages",  NULL,      N_("Search messages..."),        NULL, NULL,  NULL },
+       { "ToolsAccounts",        NULL,      N_("Accounts..."),                NULL, NULL,  G_CALLBACK (modest_ui_actions_on_accounts) },
+       { "ToolsSMTPServers",     NULL,      N_("SMTP servers..."),                NULL, NULL,  NULL },
+       { "ToolsSendReceive", NULL, N_("Send & receive") }, /* submenu */
+       { "ToolsSendReceiveAll",    NULL,      N_("All"),          NULL, NULL,  NULL },
+       { "ToolsSendReceiveCancelSending",  NULL,      N_("Cancel sending"),        NULL, NULL,  NULL },
+       { "ToolsContacts",            NULL,      N_("Contacts..."),                      NULL, NULL,  G_CALLBACK (modest_ui_actions_on_add_to_contacts) },
+       { "ToolsSearchMessages",            NULL,      N_("Search messages..."),                      NULL, NULL,  NULL },
        { "ToolsHelp",            NULL,      N_("Help"),                      NULL, NULL,  NULL },
 
        /* Close */
@@ -113,12 +106,13 @@ static const GtkActionEntry modest_action_entries [] = {
         */
        /* Headers Toolbar */
        { "ToolbarMessageNew",        MODEST_STOCK_NEW_MAIL,     N_("Compose a new message"), NULL, NULL,  G_CALLBACK (modest_ui_actions_on_new_msg) },
-       { "ToolbarMessageReply",      MODEST_STOCK_REPLY,     N_("Reply a message"),       NULL, NULL,  G_CALLBACK (modest_ui_actions_on_reply) },
-       { "ToolbarMessageReplyAll",   MODEST_STOCK_REPLY_ALL,     N_("Reply to all"),          NULL, NULL,  G_CALLBACK (modest_ui_actions_on_reply_all) },
-       { "ToolbarMessageForward",    MODEST_STOCK_FORWARD,     N_("Forward a message"),     NULL, NULL,  G_CALLBACK (modest_ui_actions_on_forward) },
-       { "ToolbarSendReceive",       MODEST_STOCK_SEND_RECEIVE,   N_("Send & receive"),        NULL, NULL,  G_CALLBACK (modest_ui_actions_on_forward) },
-       { "ToolbarToggleView",        GTK_STOCK_CDROM,      N_("Toggle view"),           NULL, NULL,  G_CALLBACK (modest_ui_actions_toggle_view) },
-       { "ToolbarDeleteMessage",     GTK_STOCK_DELETE,     N_("Delete message"),        NULL, NULL,  G_CALLBACK (modest_ui_actions_on_delete) },
+       { "ToolbarMessageReply",      MODEST_STOCK_REPLY,     N_("Reply a message"),          NULL, NULL,  G_CALLBACK (modest_ui_actions_on_reply) },
+       { "ToolbarMessageReplyAll",   MODEST_STOCK_REPLY_ALL,     N_("Reply to all"),         NULL, NULL,  G_CALLBACK (modest_ui_actions_on_reply_all) },
+       { "ToolbarMessageForward",    MODEST_STOCK_FORWARD,     N_("Forward a message"),      NULL, NULL,  G_CALLBACK (modest_ui_actions_on_forward) },
+       { "ToolbarSendReceive",       MODEST_STOCK_REFRESH,   N_("Send & receive"),      NULL, NULL,  G_CALLBACK (modest_ui_actions_on_send_receive) },
+       { "ToolbarToggleView",        MODEST_STOCK_SPLIT_VIEW,      N_("Toggle view"),                "<CTRL>t", NULL,  G_CALLBACK (modest_ui_actions_toggle_view) },
+       { "ToolbarDeleteMessage",     MODEST_STOCK_DELETE,     N_("Delete message"),             NULL, NULL,  G_CALLBACK (modest_ui_actions_on_delete) },
+       { "ToolbarSort",     MODEST_STOCK_SORT,     N_("Sort mail"),             NULL, NULL, NULL },
 };