fix bug 605957 'shortcuts in popup-menu'
[claws.git] / src / summaryview.c
index 9cb28465928367578db912eba810a523cba402f7..638600ea6b0a993e3389c2eb87561167fd51ff43 100644 (file)
@@ -395,30 +395,30 @@ GtkTargetEntry summary_drag_types[1] =
 
 static GtkItemFactoryEntry summary_popup_entries[] =
 {
-       {N_("/_Reply"),                 NULL, summary_reply_cb, COMPOSE_REPLY, NULL},
+       {N_("/_Reply"),                 "<control>R", summary_reply_cb, COMPOSE_REPLY, NULL},
        {N_("/Repl_y to"),              NULL, NULL,             0, "<Branch>"},
-       {N_("/Repl_y to/_all"),         NULL, summary_reply_cb, COMPOSE_REPLY_TO_ALL, NULL},
+       {N_("/Repl_y to/_all"),         "<shift><control>R", summary_reply_cb,  COMPOSE_REPLY_TO_ALL, NULL},
        {N_("/Repl_y to/_sender"),      NULL, summary_reply_cb, COMPOSE_REPLY_TO_SENDER, NULL},
        {N_("/Repl_y to/mailing _list"),
-                                       NULL, summary_reply_cb, COMPOSE_REPLY_TO_LIST, NULL},
+                                       "<control>L", summary_reply_cb, COMPOSE_REPLY_TO_LIST, NULL},
        {N_("/Follow-up and reply to"), NULL, summary_reply_cb, COMPOSE_FOLLOWUP_AND_REPLY_TO, NULL},
        {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
-       {N_("/_Forward"),               NULL, summary_reply_cb, COMPOSE_FORWARD, NULL},
+       {N_("/_Forward"),               "<control><alt>F", summary_reply_cb, COMPOSE_FORWARD, NULL},
        {N_("/Redirect"),               NULL, summary_reply_cb, COMPOSE_REDIRECT, NULL},
        {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
        {N_("/Re-_edit"),               NULL, summary_reedit,   0, NULL},
        {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
-       {N_("/M_ove..."),               NULL, summary_move_to,  0, NULL},
-       {N_("/_Copy..."),               NULL, summary_copy_to,  0, NULL},
-       {N_("/_Delete"),                NULL, summary_delete,   0, NULL},
+       {N_("/M_ove..."),               "<control>O", summary_move_to,  0, NULL},
+       {N_("/_Copy..."),               "<shift><control>O", summary_copy_to,   0, NULL},
+       {N_("/_Delete"),                "<control>D", summary_delete,   0, NULL},
        {N_("/Cancel a news message"),  NULL, summary_cancel,   0, NULL},
-       {N_("/E_xecute"),               NULL, summary_execute_cb,       0, NULL},
+       {N_("/E_xecute"),               "X", summary_execute_cb,        0, NULL},
        {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
        {N_("/_Mark"),                  NULL, NULL,             0, "<Branch>"},
-       {N_("/_Mark/_Mark"),            NULL, summary_mark,     0, NULL},
-       {N_("/_Mark/_Unmark"),          NULL, summary_unmark,   0, NULL},
+       {N_("/_Mark/_Mark"),            "<shift>asterisk", summary_mark,        0, NULL},
+       {N_("/_Mark/_Unmark"),          "U", summary_unmark,    0, NULL},
        {N_("/_Mark/---"),              NULL, NULL,             0, "<Separator>"},
-       {N_("/_Mark/Mark as unr_ead"),  NULL, summary_mark_as_unread, 0, NULL},
+       {N_("/_Mark/Mark as unr_ead"),  "<shift>exclam", summary_mark_as_unread, 0, NULL},
        {N_("/_Mark/Mark as rea_d"),    NULL, summary_mark_as_read, 0, NULL},
        {N_("/_Mark/Mark all read"),    NULL, summary_mark_all_read, 0, NULL},
        {N_("/_Mark/Ignore thread"),    NULL, summary_ignore_thread, 0, NULL},
@@ -440,16 +440,16 @@ static GtkItemFactoryEntry summary_popup_entries[] =
        {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
        {N_("/_View"),                  NULL, NULL,             0, "<Branch>"},
        {N_("/_View/Open in new _window"),
-                                       NULL, summary_open_msg, 0, NULL},
-       {N_("/_View/_Source"),          NULL, summary_view_source, 0, NULL},
-       {N_("/_View/All _header"),      NULL, summary_show_all_header_cb, 0, "<ToggleItem>"},
+                                       "<control><alt>N", summary_open_msg,    0, NULL},
+       {N_("/_View/_Source"),          "<control>U", summary_view_source, 0, NULL},
+       {N_("/_View/All _header"),      "<control>H", summary_show_all_header_cb, 0, "<ToggleItem>"},
        {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
-       {N_("/_Save as..."),            NULL, summary_save_as,  0, NULL},
+       {N_("/_Save as..."),            "<control>S", summary_save_as,  0, NULL},
        {N_("/_Print..."),              NULL, summary_print,    0, NULL},
        {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
-       {N_("/Select _all"),            NULL, summary_select_all, 0, NULL},
+       {N_("/Select _all"),            "<control>A", summary_select_all, 0, NULL},
        {N_("/Select t_hread"),         NULL, summary_select_thread, 0, NULL}
-};
+};  /* see also list in menu_connect_identical_items() in menu.c if this changes */
 
 static const gchar *const col_label[N_SUMMARY_COLS] = {
        N_("M"),        /* S_COL_MARK    */