removed most of the hardcoded shortcuts

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 0894132834f598269af1cbb1e0856d896efd9eb5..a6ee6389a26b273e2e9efda775fdceb7737d6181 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,13 @@
+2002-01-16 [carsten]   0.7.0claws9
+       * src/gtkstext.c
+               removed the <control> and <alt> shortcuts because they're
+               not needed and interefered with the "normal" shortcuts
+       * src/mainwindow.c
+       * src/summaryview.c
+               removed most of the hardcoded shortcuts and assigned
+               them to menu entries making them easy customizable by
+               that
+

 2002-01-16 |melvin]    0.7.0claws8
 
        * src/gtkspell.c
 2002-01-16 |melvin]    0.7.0claws8
 
        * src/gtkspell.c

diff --git a/configure.in b/configure.in
index 27b9cd878913e706aa52302f87890704110e3f74..5f6fbeeb9d98d3ef76726a76a16ff584f3f0f6ad 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=7
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=claws8
+EXTRA_VERSION=claws9

 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl

diff --git a/src/gtkstext.c b/src/gtkstext.c
index 11bdd6098f71aca89ce903db87e49e045f876ae2..b704bc0d7bdd66d2ff70cab34062df1c6a87e24a 100644 (file)
--- a/src/gtkstext.c
+++ b/src/gtkstext.c
@@ -495,31 +495,31 @@ static GtkWidgetClass *parent_class = NULL;
 
 static const GtkTextFunction control_keys[26] =
 {
 
 static const GtkTextFunction control_keys[26] =
 {

-  (GtkTextFunction)gtk_stext_move_beginning_of_line,    /* a */
-  (GtkTextFunction)gtk_stext_move_backward_character,   /* b */
+  NULL,/*(GtkTextFunction)gtk_stext_move_beginning_of_line,    /* a */
+  NULL,/*(GtkTextFunction)gtk_stext_move_backward_character,   /* b */

   NULL,                                                      /* c */
 /*  (GtkTextFunction)gtk_editable_copy_clipboard,        /* c */
   NULL,                                                      /* c */
 /*  (GtkTextFunction)gtk_editable_copy_clipboard,        /* c */

-  (GtkTextFunction)gtk_stext_delete_forward_character,  /* d */
-  (GtkTextFunction)gtk_stext_move_end_of_line,          /* e */
-  (GtkTextFunction)gtk_stext_move_forward_character,    /* f */
+  NULL,/*(GtkTextFunction)gtk_stext_delete_forward_character,  /* d */
+  NULL,/*(GtkTextFunction)gtk_stext_move_end_of_line,          /* e */
+  NULL,/*(GtkTextFunction)gtk_stext_move_forward_character,    /* f */

   NULL,                                                /* g */
   NULL,                                                /* g */

-  (GtkTextFunction)gtk_stext_delete_backward_character, /* h */
+  NULL,/*(GtkTextFunction)gtk_stext_delete_backward_character, /* h */

   NULL,                                                /* i */
   NULL,                                                /* j */
   NULL,                                                /* i */
   NULL,                                                /* j */

-  (GtkTextFunction)gtk_stext_delete_to_line_end,        /* k */
+  NULL,/*(GtkTextFunction)gtk_stext_delete_to_line_end,        /* k */

   NULL,                                                /* l */
   NULL,                                                /* m */
   NULL,                                                /* l */
   NULL,                                                /* m */

-  (GtkTextFunction)gtk_stext_move_next_line,            /* n */
+  NULL,/*(GtkTextFunction)gtk_stext_move_next_line,            /* n */

   NULL,                                                /* o */
   NULL,                                                /* o */

-  (GtkTextFunction)gtk_stext_move_previous_line,        /* p */
+  NULL,/*(GtkTextFunction)gtk_stext_move_previous_line,        /* p */

   NULL,                                                /* q */
   NULL,                                                /* r */
   NULL,                                                /* s */
   NULL,                                                /* t */
   NULL,                                                /* q */
   NULL,                                                /* r */
   NULL,                                                /* s */
   NULL,                                                /* t */

-  (GtkTextFunction)gtk_stext_delete_line,               /* u */
+  NULL,/*(GtkTextFunction)gtk_stext_delete_line,               /* u */

   NULL,                                                      /* v */
 /*  (GtkTextFunction)gtk_editable_paste_clipboard,       /* v */
   NULL,                                                      /* v */
 /*  (GtkTextFunction)gtk_editable_paste_clipboard,       /* v */

-  (GtkTextFunction)gtk_stext_delete_backward_word,      /* w */
+  NULL,/*(GtkTextFunction)gtk_stext_delete_backward_word,      /* w */

   NULL,                                                     /* x */
 /*  (GtkTextFunction)gtk_editable_cut_clipboard,         /* x */
   NULL,                                                /* y */
   NULL,                                                     /* x */
 /*  (GtkTextFunction)gtk_editable_cut_clipboard,         /* x */
   NULL,                                                /* y */


@@ -529,11 +529,11 @@ static const GtkTextFunction control_keys[26] =
 static const GtkTextFunction alt_keys[26] =
 {
   NULL,                                                /* a */
 static const GtkTextFunction alt_keys[26] =
 {
   NULL,                                                /* a */

-  (GtkTextFunction)gtk_stext_move_backward_word,        /* b */
+  NULL,/*(GtkTextFunction)gtk_stext_move_backward_word,        /* b */

   NULL,                                                /* c */
   NULL,                                                /* c */

-  (GtkTextFunction)gtk_stext_delete_forward_word,       /* d */
+  NULL,/*(GtkTextFunction)gtk_stext_delete_forward_word,       /* d */

   NULL,                                           /* e */
   NULL,                                           /* e */

-  (GtkTextFunction)gtk_stext_move_forward_word,         /* f */
+  NULL,/*(GtkTextFunction)gtk_stext_move_forward_word,         /* f */

   NULL,                                           /* g */
   NULL,                                           /* h */
   NULL,                                           /* i */
   NULL,                                           /* g */
   NULL,                                           /* h */
   NULL,                                           /* i */

diff --git a/src/mainwindow.c b/src/mainwindow.c
index b24d9f9607cc75f23dc85dc11fbbd6fb8c750962..9889e84cb00c16196324972409e35bb02e92fa29 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -430,13 +430,12 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_File/_Folder/_Delete folder"),   NULL, delete_folder_cb, 0, NULL},
        {N_("/_File/_Import mbox file..."),     NULL, import_mbox_cb, 0, NULL},
        {N_("/_File/_Export to mbox file..."),  NULL, export_mbox_cb, 0, NULL},
        {N_("/_File/_Folder/_Delete folder"),   NULL, delete_folder_cb, 0, NULL},
        {N_("/_File/_Import mbox file..."),     NULL, import_mbox_cb, 0, NULL},
        {N_("/_File/_Export to mbox file..."),  NULL, export_mbox_cb, 0, NULL},

-       {N_("/_File/Empty _trash"),             NULL, empty_trash_cb, 0, NULL},
+       {N_("/_File/Empty _trash"),             "<shift>D", empty_trash_cb, 0, NULL},

        {N_("/_File/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_File/---"),                      NULL, NULL, 0, "<Separator>"},

-       {N_("/_File/_Save as..."),              NULL, save_as_cb, 0, NULL},
-       {N_("/_File/_Print..."),                "<alt>P", print_cb, 0, NULL},
+       {N_("/_File/_Save as..."),              "y", save_as_cb, 0, NULL},
+       {N_("/_File/_Print..."),                "<control>P", print_cb, 0, NULL},

        {N_("/_File/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_File/---"),                      NULL, NULL, 0, "<Separator>"},

-       /* {N_("/_File/_Close"),                "<alt>W", app_exit_cb, 0, NULL}, */
-       {N_("/_File/E_xit"),                    "<alt>Q", app_exit_cb, 0, NULL},
+       {N_("/_File/E_xit"),                    "<control>Q", app_exit_cb, 0, NULL},

 
        {N_("/_Edit"),                          NULL, NULL, 0, "<Branch>"},
        {N_("/_Edit/_Copy"),                    "<control>C", copy_cb, 0, NULL},
 
        {N_("/_Edit"),                          NULL, NULL, 0, "<Branch>"},
        {N_("/_Edit/_Copy"),                    "<control>C", copy_cb, 0, NULL},


@@ -444,7 +443,7 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_Edit/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_Edit/_Find in current message..."),
                                                "<control>F", search_cb, 0, NULL},
        {N_("/_Edit/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_Edit/_Find in current message..."),
                                                "<control>F", search_cb, 0, NULL},

-       {N_("/_Edit/_Search folder..."),        "<control>S", search_cb, 1, NULL},
+       {N_("/_Edit/_Search folder..."),        "<shift><control>F", search_cb, 1, NULL},

 
        {N_("/_View"),                          NULL, NULL, 0, "<Branch>"},
        {N_("/_View/_Folder tree"),             NULL, NULL, SEPARATE_ACTION + SEPARATE_FOLDER,  "<ToggleItem>"},
 
        {N_("/_View"),                          NULL, NULL, 0, "<Branch>"},
        {N_("/_View/_Folder tree"),             NULL, NULL, SEPARATE_ACTION + SEPARATE_FOLDER,  "<ToggleItem>"},


@@ -455,9 +454,6 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_View/_Toolbar/_Text"),           NULL, toggle_toolbar_cb, TOOLBAR_TEXT, "/View/Toolbar/Icon and text"},
        {N_("/_View/_Toolbar/_None"),           NULL, toggle_toolbar_cb, TOOLBAR_NONE, "/View/Toolbar/Icon and text"},
        {N_("/_View/Status _bar"),              NULL, toggle_statusbar_cb, 0, "<ToggleItem>"},
        {N_("/_View/_Toolbar/_Text"),           NULL, toggle_toolbar_cb, TOOLBAR_TEXT, "/View/Toolbar/Icon and text"},
        {N_("/_View/_Toolbar/_None"),           NULL, toggle_toolbar_cb, TOOLBAR_NONE, "/View/Toolbar/Icon and text"},
        {N_("/_View/Status _bar"),              NULL, toggle_statusbar_cb, 0, "<ToggleItem>"},

-/*     {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
-       {N_("/_View/Separate f_older tree"),    NULL, NULL, SEPARATE_ACTION + SEPARATE_FOLDER, "<ToggleItem>"},
-       {N_("/_View/Separate m_essage view"),   NULL, NULL, SEPARATE_ACTION + SEPARATE_MESSAGE, "<ToggleItem>"},*/

        {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_View/_Sort"),                    NULL, NULL, 0, "<Branch>"},
        {N_("/_View/_Sort/Sort by _number"),    NULL, sort_summary_cb, SORT_BY_NUMBER, NULL},
        {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_View/_Sort"),                    NULL, NULL, 0, "<Branch>"},
        {N_("/_View/_Sort/Sort by _number"),    NULL, sort_summary_cb, SORT_BY_NUMBER, NULL},


@@ -560,13 +556,13 @@ static GtkItemFactoryEntry mainwin_entries[] =
 
        {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_View/_Go to"),                   NULL, NULL, 0, "<Branch>"},
 
        {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_View/_Go to"),                   NULL, NULL, 0, "<Branch>"},

-       {N_("/_View/_Go to/_Prev message"),     NULL, prev_cb, 0, NULL},
-       {N_("/_View/_Go to/_Next message"),     NULL, next_cb, 0, NULL},
+       {N_("/_View/_Go to/_Prev message"),     "p", prev_cb, 0, NULL},
+       {N_("/_View/_Go to/_Next message"),     "n", next_cb, 0, NULL},

        {N_("/_View/_Go to/---"),               NULL, NULL, 0, "<Separator>"},
        {N_("/_View/_Go to/P_rev unread message"),
        {N_("/_View/_Go to/---"),               NULL, NULL, 0, "<Separator>"},
        {N_("/_View/_Go to/P_rev unread message"),

-                                               NULL, prev_unread_cb, 0, NULL},
+                                               "<shift>P", prev_unread_cb, 0, NULL},

        {N_("/_View/_Go to/N_ext unread message"),
        {N_("/_View/_Go to/N_ext unread message"),

-                                               NULL, next_unread_cb, 0, NULL},
+                                               "<shift>N", next_unread_cb, 0, NULL},

        {N_("/_View/_Go to/---"),               NULL, NULL, 0, "<Separator>"},
        {N_("/_View/_Go to/Prev _marked message"),
                                                NULL, prev_marked_cb, 0, NULL},
        {N_("/_View/_Go to/---"),               NULL, NULL, 0, "<Separator>"},
        {N_("/_View/_Go to/Prev _marked message"),
                                                NULL, prev_marked_cb, 0, NULL},


@@ -584,53 +580,53 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_View/_View source"),             "<control>U", view_source_cb, 0, NULL},
        {N_("/_View/Show all _header"),         "<control>H", header_window_show_cb, 0, NULL},
        {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_View/_View source"),             "<control>U", view_source_cb, 0, NULL},
        {N_("/_View/Show all _header"),         "<control>H", header_window_show_cb, 0, NULL},
        {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},

-       {N_("/_View/_Update"),                  "<alt>U", update_summary_cb,  0, NULL},
+       {N_("/_View/_Update"),                  "<control><alt>U", update_summary_cb,  0, NULL},

 
        {N_("/_Message"),                       NULL, NULL, 0, "<Branch>"},
 
        {N_("/_Message"),                       NULL, NULL, 0, "<Branch>"},

-       {N_("/_Message/Get new ma_il"), "<alt>I",       inc_mail_cb, 0, NULL},
+       {N_("/_Message/Get new ma_il"), "<control><alt>I",      inc_mail_cb, 0, NULL},

        {N_("/_Message/Get from _all accounts"),
        {N_("/_Message/Get from _all accounts"),

-                                               "<shift><alt>I", inc_all_account_mail_cb, 0, NULL},
+                                               "<shift><control>I", inc_all_account_mail_cb, 0, NULL},

        {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
        {N_("/_Message/Send queued messa_ges"),
                                                NULL, send_queue_cb, 0, NULL},
        {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
        {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
        {N_("/_Message/Send queued messa_ges"),
                                                NULL, send_queue_cb, 0, NULL},
        {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},

-       {N_("/_Message/Compose a_n email message"),     "<alt>N", compose_mail_cb, 0, NULL},
+       {N_("/_Message/Compose a_n email message"),     "w", compose_mail_cb, 0, NULL},

        {N_("/_Message/Compose a news message"),        NULL,   compose_news_cb, 0, NULL},
        {N_("/_Message/Compose a news message"),        NULL,   compose_news_cb, 0, NULL},

-       {N_("/_Message/_Reply"),                "<alt>R",       reply_cb, COMPOSE_REPLY, NULL},
+       {N_("/_Message/_Reply"),                "<control>R",   reply_cb, COMPOSE_REPLY, NULL},

        {N_("/_Message/Repl_y to sender"),      "<control><alt>R", reply_cb, COMPOSE_REPLY_TO_SENDER, NULL},
        {N_("/_Message/Follow-up and reply to"), NULL, reply_cb, COMPOSE_FOLLOWUP_AND_REPLY_TO, NULL},
        {N_("/_Message/Repl_y to sender"),      "<control><alt>R", reply_cb, COMPOSE_REPLY_TO_SENDER, NULL},
        {N_("/_Message/Follow-up and reply to"), NULL, reply_cb, COMPOSE_FOLLOWUP_AND_REPLY_TO, NULL},

-       {N_("/_Message/Reply to a_ll"),         "<shift><alt>R", reply_cb, COMPOSE_REPLY_TO_ALL, NULL},
-       {N_("/_Message/_Forward"),              "<shift><alt>F", reply_cb, COMPOSE_FORWARD, NULL},
+       {N_("/_Message/Reply to a_ll"),         "<control><shift>R", reply_cb, COMPOSE_REPLY_TO_ALL, NULL},
+       {N_("/_Message/_Forward"),              "<control><alt>F", reply_cb, COMPOSE_FORWARD, NULL},

        {N_("/_Message/Bounce"),                NULL, reply_cb, COMPOSE_BOUNCE, NULL},
        {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
        {N_("/_Message/Re-_edit"),              NULL, reedit_cb, 0, NULL},
        {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
        {N_("/_Message/Bounce"),                NULL, reply_cb, COMPOSE_BOUNCE, NULL},
        {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
        {N_("/_Message/Re-_edit"),              NULL, reedit_cb, 0, NULL},
        {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},

-       {N_("/_Message/M_ove..."),              "<alt>O", move_to_cb, 0, NULL},
-       {N_("/_Message/_Copy..."),              NULL, copy_to_cb, 0, NULL},
-       {N_("/_Message/_Delete"),               "<alt>D", delete_cb,  0, NULL},
+       {N_("/_Message/M_ove..."),              "o", move_to_cb, 0, NULL},
+       {N_("/_Message/_Copy..."),              "<shift>O", copy_to_cb, 0, NULL},
+       {N_("/_Message/_Delete"),               "d", delete_cb,  0, NULL},

        {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
        {N_("/_Message/Delete du_plicated messages"),
                                                NULL, delete_duplicated_cb,   0, NULL},
        {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
        {N_("/_Message/_Mark"),                 NULL, NULL, 0, "<Branch>"},
        {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
        {N_("/_Message/Delete du_plicated messages"),
                                                NULL, delete_duplicated_cb,   0, NULL},
        {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
        {N_("/_Message/_Mark"),                 NULL, NULL, 0, "<Branch>"},

-       {N_("/_Message/_Mark/_Mark"),           NULL, mark_cb,   0, NULL},
-       {N_("/_Message/_Mark/_Unmark"),         NULL, unmark_cb, 0, NULL},
+       {N_("/_Message/_Mark/_Mark"),           "<shift>asterisk", mark_cb,   0, NULL},
+       {N_("/_Message/_Mark/_Unmark"),         "u", unmark_cb, 0, NULL},

        {N_("/_Message/_Mark/---"),             NULL, NULL, 0, "<Separator>"},
        {N_("/_Message/_Mark/---"),             NULL, NULL, 0, "<Separator>"},

-       {N_("/_Message/_Mark/Mark as unr_ead"), NULL, mark_as_unread_cb, 0, NULL},
+       {N_("/_Message/_Mark/Mark as unr_ead"), "<shift>exclam", mark_as_unread_cb, 0, NULL},

        {N_("/_Message/_Mark/Mark as rea_d"),
                                                NULL, mark_as_read_cb, 0, NULL},
        {N_("/_Message/_Mark/Mark all _read"),  NULL, mark_all_read_cb, 0, NULL},
 
        {N_("/_Tool"),                          NULL, NULL, 0, "<Branch>"},
        {N_("/_Message/_Mark/Mark as rea_d"),
                                                NULL, mark_as_read_cb, 0, NULL},
        {N_("/_Message/_Mark/Mark all _read"),  NULL, mark_all_read_cb, 0, NULL},
 
        {N_("/_Tool"),                          NULL, NULL, 0, "<Branch>"},

-       {N_("/_Tool/_Address book"),            "<alt>A", addressbook_open_cb, 0, NULL},
+       {N_("/_Tool/_Address book"),            "<control><alt>A", addressbook_open_cb, 0, NULL},

        {N_("/_Tool/Add sender to address boo_k"),
                                                NULL, add_address_cb, 0, NULL},
        {N_("/_Tool/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_Tool/_Filter messages"),         NULL, filter_cb, 0, NULL},
        {N_("/_Tool/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_Tool/Add sender to address boo_k"),
                                                NULL, add_address_cb, 0, NULL},
        {N_("/_Tool/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_Tool/_Filter messages"),         NULL, filter_cb, 0, NULL},
        {N_("/_Tool/---"),                      NULL, NULL, 0, "<Separator>"},

-       {N_("/_Tool/E_xecute"),                 "<alt>X", execute_summary_cb, 0, NULL},
+       {N_("/_Tool/E_xecute"),                 "x", execute_summary_cb, 0, NULL},

        {N_("/_Tool/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_Tool/---"),                      NULL, NULL, 0, "<Separator>"},

-       {N_("/_Tool/_Log window"),              "<alt>L", log_window_show_cb, 0, NULL},
+       {N_("/_Tool/_Log window"),              "<control>L", log_window_show_cb, 0, NULL},

 
        {N_("/_Configuration"),                 NULL, NULL, 0, "<Branch>"},
        {N_("/_Configuration/_Common preferences..."),
 
        {N_("/_Configuration"),                 NULL, NULL, 0, "<Branch>"},
        {N_("/_Configuration/_Common preferences..."),


@@ -666,8 +662,8 @@ static GtkItemFactoryEntry reply_popup_entries[] =
 };
 static GtkItemFactoryEntry replyall_popup_entries[] =
 {
 };
 static GtkItemFactoryEntry replyall_popup_entries[] =
 {

-       {N_("/Reply to all with _quote"), NULL, reply_cb, COMPOSE_REPLY_TO_ALL_WITH_QUOTE, NULL},
-       {N_("/_Reply to all without quote"), NULL, reply_cb, COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE, NULL}
+       {N_("/Reply to all with _quote"), "<shift>A", reply_cb, COMPOSE_REPLY_TO_ALL_WITH_QUOTE, NULL},
+       {N_("/_Reply to all without quote"), "a", reply_cb, COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE, NULL}

 };
 static GtkItemFactoryEntry replysender_popup_entries[] =
 {
 };
 static GtkItemFactoryEntry replysender_popup_entries[] =
 {


@@ -676,8 +672,8 @@ static GtkItemFactoryEntry replysender_popup_entries[] =
 };
 static GtkItemFactoryEntry fwd_popup_entries[] =
 {
 };
 static GtkItemFactoryEntry fwd_popup_entries[] =
 {

-       {N_("/_Forward message (inline style)"), NULL, reply_cb, COMPOSE_FORWARD_INLINE, NULL},
-       {N_("/Forward message as _attachment"), NULL, reply_cb, COMPOSE_FORWARD_AS_ATTACH, NULL}
+       {N_("/_Forward message (inline style)"), "f", reply_cb, COMPOSE_FORWARD_INLINE, NULL},
+       {N_("/Forward message as _attachment"), "<shift>F", reply_cb, COMPOSE_FORWARD_AS_ATTACH, NULL}

 };
 
 
 };
 
 

diff --git a/src/summaryview.c b/src/summaryview.c
index 29cffcf961868f0f4dec271c7adccf63bb403dbf..1130a59f96e963c49ace94463eb7c9e38d682b6a 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -4216,52 +4216,6 @@ static void summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
        if (!event) return;
 
        switch (event->keyval) {
        if (!event) return;
 
        switch (event->keyval) {

-       case GDK_g:             /* Go */
-       case GDK_G:
-               RETURN_IF_LOCKED();
-               BREAK_ON_MODIFIER_KEY();
-               KEY_PRESS_EVENT_STOP();
-               to_folder = foldersel_folder_sel(NULL, NULL);
-               if (to_folder) {
-                       debug_print(_("Go to %s\n"), to_folder->path);
-                       folderview_select(summaryview->folderview, to_folder);
-               }
-               return;
-       case GDK_w:             /* Write new message */
-               BREAK_ON_MODIFIER_KEY();
-               if (summaryview->folder_item) {
-                       PrefsAccount *ac;
-                       ac = summaryview->folder_item->folder->account;
-                       if (ac && ac->protocol == A_NNTP)
-                               compose_new_with_recipient
-                                       (ac, summaryview->folder_item->path);
-                       else
-                               compose_new_with_folderitem(ac, summaryview->folder_item);
-               } else
-                       compose_new(NULL);
-               return;
-       case GDK_D:             /* Empty trash */
-               RETURN_IF_LOCKED();
-               BREAK_ON_MODIFIER_KEY();
-               KEY_PRESS_EVENT_STOP();
-               main_window_empty_trash(summaryview->mainwin, TRUE);
-               return;
-       case GDK_Q:             /* Quit */
-               RETURN_IF_LOCKED();
-               BREAK_ON_MODIFIER_KEY();
-
-               if (prefs_common.confirm_on_exit) {
-                       if (alertpanel(_("Exit"), _("Exit this program?"),
-                                      _("OK"), _("Cancel"), NULL)
-                                      == G_ALERTDEFAULT) {
-                               manage_window_focus_in
-                                       (summaryview->mainwin->window,
-                                        NULL, NULL);
-                               app_will_exit(NULL, summaryview->mainwin);
-                       }
-               }
-               return;
-       case GDK_Left:          /* Move focus */

        case GDK_Escape:
                gtk_widget_grab_focus(summaryview->folderview->ctree);
                return;
        case GDK_Escape:
                gtk_widget_grab_focus(summaryview->folderview->ctree);
                return;


@@ -4288,19 +4242,6 @@ static void summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
                                          FALSE))
                        summary_select_next_unread(summaryview);
                break;
                                          FALSE))
                        summary_select_next_unread(summaryview);
                break;

-       case GDK_n:             /* Next */
-       case GDK_N:
-               BREAK_ON_MODIFIER_KEY();
-               summary_step(summaryview, GTK_SCROLL_STEP_FORWARD);
-               break;
-       case GDK_BackSpace:     /* Page up */
-               textview_scroll_page(summaryview->messageview->textview, TRUE);
-               break;
-       case GDK_p:             /* Prev */
-       case GDK_P:
-               BREAK_ON_MODIFIER_KEY();
-               summary_step(summaryview, GTK_SCROLL_STEP_BACKWARD);
-               break;

        case GDK_v:             /* Toggle summary mode / message mode */
        case GDK_V:
                BREAK_ON_MODIFIER_KEY();
        case GDK_v:             /* Toggle summary mode / message mode */
        case GDK_V:
                BREAK_ON_MODIFIER_KEY();


@@ -4320,62 +4261,11 @@ static void summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
                textview_scroll_one_line(summaryview->messageview->textview,
                                         (event->state & GDK_MOD1_MASK) != 0);
                break;
                textview_scroll_one_line(summaryview->messageview->textview,
                                         (event->state & GDK_MOD1_MASK) != 0);
                break;

-       case GDK_asterisk:      /* Mark */
-               summary_mark(summaryview);
-               break;
-       case GDK_exclam:        /* Mark as unread */
-               summary_mark_as_unread(summaryview);
-               break;
-       case GDK_d:             /* Delete */

        case GDK_Delete:
                RETURN_IF_LOCKED();
                BREAK_ON_MODIFIER_KEY();
                summary_delete(summaryview);
                break;
        case GDK_Delete:
                RETURN_IF_LOCKED();
                BREAK_ON_MODIFIER_KEY();
                summary_delete(summaryview);
                break;

-       case GDK_u:             /* Unmark */
-       case GDK_U:
-               BREAK_ON_MODIFIER_KEY();
-               summary_unmark(summaryview);
-               break;
-       case GDK_o:             /* Move */
-               RETURN_IF_LOCKED();
-               BREAK_ON_MODIFIER_KEY();
-               summary_move_to(summaryview);
-               break;
-       case GDK_O:             /* Copy */
-               RETURN_IF_LOCKED();
-               BREAK_ON_MODIFIER_KEY();
-               summary_copy_to(summaryview);
-               break;
-       case GDK_x:             /* Execute */
-       case GDK_X:
-               RETURN_IF_LOCKED();
-               BREAK_ON_MODIFIER_KEY();
-               KEY_PRESS_EVENT_STOP();
-               summary_execute(summaryview);
-               break;
-       case GDK_a:             /* Reply to the message */
-               BREAK_ON_MODIFIER_KEY();
-               summary_reply_cb(summaryview,
-                                COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE, NULL);
-               break;
-       case GDK_A:             /* Reply to the message with quotation */
-               BREAK_ON_MODIFIER_KEY();
-               summary_reply_cb(summaryview,
-                                COMPOSE_REPLY_TO_ALL_WITH_QUOTE, NULL);
-               break;
-       case GDK_f:             /* Forward the message */
-               BREAK_ON_MODIFIER_KEY();
-               summary_reply_cb(summaryview, COMPOSE_FORWARD, NULL);
-               break;
-       case GDK_F:
-               BREAK_ON_MODIFIER_KEY();
-               summary_reply_cb(summaryview, COMPOSE_FORWARD_AS_ATTACH, NULL);
-               break;
-       case GDK_y:             /* Save the message */
-               BREAK_ON_MODIFIER_KEY();
-               summary_save_as(summaryview);
-               break;

        default:
                break;
        }
        default:
                break;
        }