gint n_menurc;
static struct KeyBind default_menurc[] = {
- {"<Main>/File/Empty trash", ""},
+ {"<Main>/File/Empty all Trash folders", ""},
{"<Main>/File/Save as...", "<control>S"},
{"<Main>/File/Print...", ""},
{"<Main>/File/Exit", "<control>Q"},
{"<Main>/Edit/Find in current message...", "<control>F"},
{"<Main>/Edit/Search folder...", "<shift><control>F"},
- {"<Main>/View/Expand Summary View", "V"},
- {"<Main>/View/Expand Message View", "<shift>V"},
+ {"<Main>/View/Show or hide/Message View", "V"},
{"<Main>/View/Thread view", "<control>T"},
{"<Main>/View/Go to/Prev message", "P"},
{"<Main>/View/Go to/Next message", "N"},
{"<Main>/View/Go to/Next unread message", "<shift>N"},
{"<Main>/View/Go to/Other folder...", "G"},
{"<Main>/View/Open in new window", "<control><alt>N"},
- {"<Main>/View/View source", "<control>U"},
+ {"<Main>/View/Message source", "<control>U"},
{"<Main>/View/Show all headers", "<control>H"},
- {"<Main>/View/Update", "<control><alt>U"},
+ {"<Main>/View/Update summary", "<control><alt>U"},
- {"<Main>/Message/Receive/Get new mail", "<control>I"},
- {"<Main>/Message/Receive/Get from all accounts", "<shift><control>I"},
+ {"<Main>/Message/Receive/Get from current account",
+ "<control>I"},
+ {"<Main>/Message/Receive/Get from all accounts","<shift><control>I"},
{"<Main>/Message/Compose an email message", "<control>M"},
{"<Main>/Message/Reply", "<control>R"},
{"<Main>/Message/Reply to/all", "<shift><control>R"},
{"<Main>/Tools/Execute", "X"},
{"<Main>/Tools/Log window", "<shift><control>L"},
- {"<Compose>/File/Close", "<control>W"},
+ {"<Compose>/Message/Close", "<control>W"},
{"<Compose>/Edit/Select all", "<control>A"},
{"<Compose>/Edit/Advanced/Move a word backward", ""},
{"<Compose>/Edit/Advanced/Move a word forward", ""},
};
static struct KeyBind mew_wl_menurc[] = {
- {"<Main>/File/Empty trash", "<shift>D"},
+ {"<Main>/File/Empty all Trash folders", "<shift>D"},
{"<Main>/File/Save as...", "Y"},
{"<Main>/File/Print...", "<shift>numbersign"},
{"<Main>/File/Exit", "<shift>Q"},
{"<Main>/Edit/Find in current message...", "<control>F"},
{"<Main>/Edit/Search folder...", "<control>S"},
- {"<Main>/View/Expand Summary View", ""},
- {"<Main>/View/Expand Message View", ""},
+ {"<Main>/View/Show or hide/Message View", ""},
{"<Main>/View/Thread view", "<shift>T"},
{"<Main>/View/Go to/Prev message", "P"},
{"<Main>/View/Go to/Next message", "N"},
{"<Main>/View/Go to/Next unread message", "<shift>N"},
{"<Main>/View/Go to/Other folder...", "G"},
{"<Main>/View/Open in new window", "<control><alt>N"},
- {"<Main>/View/View source", "<control>U"},
+ {"<Main>/View/Message source", "<control>U"},
{"<Main>/View/Show all headers", "<shift>H"},
- {"<Main>/View/Update", "<shift>S"},
+ {"<Main>/View/Update summary", "<shift>S"},
- {"<Main>/Message/Receive/Get new mail", "<control>I"},
- {"<Main>/Message/Receive/Get from all accounts", "<shift><control>I"},
+ {"<Main>/Message/Receive/Get from current account",
+ "<control>I"},
+ {"<Main>/Message/Receive/Get from all accounts","<shift><control>I"},
{"<Main>/Message/Compose an email message", "W"},
{"<Main>/Message/Reply", "<control>R"},
{"<Main>/Message/Reply to/all", "<shift>A"},
{"<Main>/Tools/Execute", "X"},
{"<Main>/Tools/Log window", "<shift><control>L"},
- {"<Compose>/File/Close", "<alt>W"},
+ {"<Compose>/Message/Close", "<alt>W"},
{"<Compose>/Edit/Select all", ""},
{"<Compose>/Edit/Advanced/Move a word backward," "<alt>B"},
{"<Compose>/Edit/Advanced/Move a word forward", "<alt>F"},
};
static struct KeyBind mutt_menurc[] = {
- {"<Main>/File/Empty trash", ""},
+ {"<Main>/File/Empty all Trash folders", ""},
{"<Main>/File/Save as...", "S"},
{"<Main>/File/Print...", "P"},
{"<Main>/File/Exit", "Q"},
{"<Main>/Edit/Find in current message...", "<control>F"},
{"<Main>/Edit/Search messages...", "slash"},
- {"<Main>/View/Toggle summary view", "V"},
+ {"<Main>/View/Show or hide/Message view", "V"},
{"<Main>/View/Thread view", "<control>T"},
{"<Main>/View/Go to/Prev message", ""},
{"<Main>/View/Go to/Next message", ""},
{"<Main>/View/Go to/Next unread message", ""},
{"<Main>/View/Go to/Other folder...", "C"},
{"<Main>/View/Open in new window", "<control><alt>N"},
- {"<Main>/View/View source", "<control>U"},
+ {"<Main>/View/Message source", "<control>U"},
{"<Main>/View/Show all headers", "<control>H"},
- {"<Main>/View/Update", "<control><alt>U"},
+ {"<Main>/View/Update summary", "<control><alt>U"},
- {"<Main>/Message/Receive/Get new mail", "<control>I"},
- {"<Main>/Message/Receive/Get from all accounts", "<shift><control>I"},
+ {"<Main>/Message/Receive/Get from current account",
+ "<control>I"},
+ {"<Main>/Message/Receive/Get from all accounts","<shift><control>I"},
{"<Main>/Message/Compose an email message", "M"},
{"<Main>/Message/Reply", "R"},
{"<Main>/Message/Reply to/all", "G"},
{"<Main>/Tools/Execute", "X"},
{"<Main>/Tools/Log window", "<shift><control>L"},
- {"<Compose>/File/Close", "<alt>W"},
+ {"<Compose>/Message/Close", "<alt>W"},
{"<Compose>/Edit/Select all", ""},
{"<Compose>/Edit/Advanced/Move a word backward", "<alt>B"},
{"<Compose>/Edit/Advanced/Move a word forward", "<alt>F"},
};
static struct KeyBind old_sylpheed_menurc[] = {
- {"<Main>/File/Empty trash", ""},
+ {"<Main>/File/Empty all Trash folders", ""},
{"<Main>/File/Save as...", ""},
{"<Main>/File/Print...", "<alt>P"},
{"<Main>/File/Exit", "<alt>Q"},
{"<Main>/Edit/Find in current message...", "<control>F"},
{"<Main>/Edit/Search folder...", "<control>S"},
- {"<Main>/View/Expand Summary View", ""},
- {"<Main>/View/Expand Message View", ""},
+ {"<Main>/View/Show or hide/Message View", ""},
{"<Main>/View/Thread view", "<control>T"},
{"<Main>/View/Go to/Prev message", "P"},
{"<Main>/View/Go to/Next message", "N"},
{"<Main>/View/Go to/Next unread message", "<shift>N"},
{"<Main>/View/Go to/Other folder...", "<alt>G"},
{"<Main>/View/Open in new window", "<shift><control>N"},
- {"<Main>/View/View source", "<control>U"},
+ {"<Main>/View/Message source", "<control>U"},
{"<Main>/View/Show all headers", "<control>H"},
- {"<Main>/View/Update", "<alt>U"},
+ {"<Main>/View/Update summary", "<alt>U"},
- {"<Main>/Message/Receive/Get new mail", "<alt>I"},
- {"<Main>/Message/Receive/Get from all accounts", "<shift><alt>I"},
+ {"<Main>/Message/Receive/Get from current account",
+ "<alt>I"},
+ {"<Main>/Message/Receive/Get from all accounts","<shift><alt>I"},
{"<Main>/Message/Compose an email message", "<alt>N"},
{"<Main>/Message/Reply", "<alt>R"},
{"<Main>/Message/Reply to/all", "<shift><alt>R"},
{"<Main>/Tools/Execute", "<alt>X"},
{"<Main>/Tools/Log window", "<alt>L"},
- {"<Compose>/File/Close", "<alt>W"},
+ {"<Compose>/Message/Close", "<alt>W"},
{"<Compose>/Edit/Select all", ""},
{"<Compose>/Edit/Advanced/Move a word backward", "<alt>B"},
{"<Compose>/Edit/Advanced/Move a word forward", "<alt>F"},
GdkColor uri_color[2] = {{0, 0, 0, 0xffff}, {0, 0xffff, 0, 0}};
gboolean success[2];
- /* BEGIN GLADE EDITED CODE */
GtkWidget *vbox1;
GtkWidget *frame1;
GtkWidget *vbox2;
vbox1 = gtk_vbox_new (FALSE, 0);
gtk_widget_show (vbox1);
- frame1 = gtk_frame_new (_("Selector"));
- gtk_widget_show (frame1);
- gtk_box_pack_start (GTK_BOX (vbox1), frame1, TRUE, TRUE, 0);
+ PACK_FRAME (vbox1, frame1, _("Selector"));
vbox2 = gtk_vbox_new (FALSE, 0);
gtk_widget_show (vbox2);
gtk_misc_set_alignment (GTK_MISC (label_global_status), 0, 0.5);
gtk_misc_set_padding (GTK_MISC (label_global_status), 6, 0);
- frame_info = gtk_frame_new (_("Information"));
- gtk_widget_show (frame_info);
- gtk_box_pack_start (GTK_BOX (vbox1), frame_info, TRUE, TRUE, 0);
+ PACK_FRAME(vbox1, frame_info, _("Information"));
table1 = gtk_table_new (4, 2, FALSE);
gtk_widget_show (table1);
(GtkAttachOptions) (0), 0, 0);
gtk_misc_set_alignment (GTK_MISC (label_status), 0, 0.5);
- frame_preview = gtk_frame_new (_("Preview"));
- gtk_widget_show (frame_preview);
- gtk_box_pack_start (GTK_BOX (vbox1), frame_preview, TRUE, TRUE, 0);
+ PACK_FRAME(vbox1, frame_preview, _("Preview"));
hbox1 = gtk_hbox_new (FALSE, 0);
gtk_widget_show (hbox1);
gtk_box_pack_start (GTK_BOX (hbox1), icon_7, TRUE, TRUE, 0);
gtk_misc_set_padding (GTK_MISC (icon_7), 0, 5);
- frame_buttons = gtk_frame_new (_("Actions"));
- gtk_widget_show (frame_buttons);
- gtk_box_pack_start (GTK_BOX (vbox1), frame_buttons, TRUE, TRUE, 0);
+ PACK_FRAME(vbox1, frame_buttons, _("Actions"));
hbuttonbox1 = gtk_hbutton_box_new ();
gtk_widget_show (hbuttonbox1);
NULL);
gtk_widget_grab_default (btn_use);
- /* END GLADE EDITED CODE */
prefs_themes->window = GTK_WIDGET(window);