+2002-02-04
+
+ * src/mainwindow.c
+ src/messageview.[ch]
+ src/summaryview.[ch]
+ src/textview.[ch]: show all headers in the message view, and don't
+ use the header window anymore.
+ * src/mainwindow.c
+ src/prefs_common.c: changed the default shortcut of 'compose new
+ message'.
+
+2002-02-03
+
+ * src/prefs_common.c: prefs_other_create(): modified the design
+ of the external command settings.
+ prefs_keybind_apply_clicked(): made the Mew / Wanderlust keybind
+ preset closer to the original.
+ Added Mutt keybind preset.
+ Also change the compose keybinds.
+ * src/compose.c: modified some menu shortcuts.
+ * src/codeconv.c: modified the locale_table for Thai encoding.
+
+2002-02-01
+
+ * src/Makefile.am: added $(GPGME_CFLAGS) to INCLUDES.
+ * src/prefs_common.c: prefs_interface_create(): modified the
+ description for menu shortcut.
+
2002-01-31
* src/gtkutils.[ch]: added gtk_stext_clear().
+2002-02-04 [paul] 0.7.0claws46
+
+ * sync with sylpheed 0.7.0cvs30
+ see ChangeLog entries 2002-02-03 and 2002-02-04
+
2002-02-03 [melvin] 0.7.0claws45
* src/gtkspell.[ch]
+2002-02-04
+
+ * src/mainwindow.c
+ src/messageview.[ch]
+ src/summaryview.[ch]
+ src/textview.[ch]: Á´¥Ø¥Ã¥À¤ò¥á¥Ã¥»¡¼¥¸¥Ó¥å¡¼¤Ëɽ¼¨¤·¡¢¥Ø¥Ã¥À
+ ¥¦¥£¥ó¥É¥¦¤Ï¤â¤¦»ÈÍѤ·¤Ê¤¤¤è¤¦¤Ë¤·¤¿¡£
+ * src/mainwindow.c
+ src/prefs_common.c: ¡Ö¿·µ¬¥á¥Ã¥»¡¼¥¸¤òºîÀ®¡×¤Î¥Ç¥Õ¥©¥ë¥È¤Î
+ ¥·¥ç¡¼¥È¥«¥Ã¥È¤òÊѹ¹¡£
+
+2002-02-03
+
+ * src/prefs_common.c: prefs_other_create(): ³°Éô¥³¥Þ¥ó¥É¤ÎÀßÄê¤Î
+ ¥Ç¥¶¥¤¥ó¤ò½¤Àµ¡£
+ prefs_keybind_apply_clicked(): Mew / Wanderlust ¥¡¼¥Ð¥¤¥ó¥É
+ ¥×¥ê¥»¥Ã¥È¤ò¤è¤ê¥ª¥ê¥¸¥Ê¥ë¤Ë¶á¤Å¤±¤¿¡£
+ Mutt ¥¡¼¥Ð¥¤¥ó¥É¥×¥ê¥»¥Ã¥È¤òÄɲá£
+ ¥á¥Ã¥»¡¼¥¸ºîÀ®¤Î¥¡¼¥Ð¥¤¥ó¥É¤âÊѹ¹¡£
+ * src/compose.c: ¤¤¤¯¤Ä¤«¤Î¥á¥Ë¥å¡¼¥·¥ç¡¼¥È¥«¥Ã¥È¤òÊѹ¹¡£
+ * src/codeconv.c: ¥¿¥¤¸ì¤Î¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°ÍÑ¤Ë locale_table ¤ò½¤Àµ¡£
+
+2002-02-01
+
+ * src/Makefile.am: $(GPGME_CFLAGS) ¤ò INCLUDES ¤ËÄɲá£
+ * src/prefs_common.c: prefs_interface_create(): ¥á¥Ë¥å¡¼¥·¥ç¡¼¥È
+ ¥«¥Ã¥È¤ÎÀâÌÀ¤ò½¤Àµ¡£
+
2002-01-31
* src/gtkutils.[ch]: gtk_stext_clear() ¤òÄɲá£
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=claws45
+EXTRA_VERSION=claws46
VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
dnl set $target
{"el_GR" , C_ISO_8859_7},
{"iw_IL" , C_ISO_8859_8},
{"tr_TR" , C_ISO_8859_9},
- {"th_TH" , C_ISO_8859_11},
+
+ {"th_TH" , C_TIS_620},
+ /* {"th_TH" , C_WINDOWS_874}, */
+ /* {"th_TH" , C_ISO_8859_11}, */
{"lt_LT.iso88594" , C_ISO_8859_4},
{"lt_LT.ISO8859-4" , C_ISO_8859_4},
COMPOSE_CALL_GTK_STEXT_DELETE_BACKWARD_WORD,
NULL},
{N_("/_Edit/A_dvanced/Delete a word forward"),
- "<alt>D",
+ NULL, /* "<alt>D", */
compose_gtk_stext_action_cb,
COMPOSE_CALL_GTK_STEXT_DELETE_FORWARD_WORD,
NULL},
{N_("/_Edit/Wrap all long _lines"),
"<control><alt>L", compose_wrap_line_all, 0, NULL},
{N_("/_Edit/Edit with e_xternal editor"),
- "<control>X", compose_ext_editor_cb, 0, NULL},
+ "<shift><control>X", compose_ext_editor_cb, 0, NULL},
#if USE_PSPELL
{N_("/_Spelling"), NULL, NULL, 0, "<Branch>"},
{N_("/_Spelling/_Check all or check selection"),
{N_("/_Message"), NULL, NULL, 0, "<Branch>"},
{N_("/_Message/_Send"), "<control>Return",
compose_send_cb, 0, NULL},
- {N_("/_Message/Send _later"), "<shift><alt>S",
+ {N_("/_Message/Send _later"), "<shift><control>S",
compose_send_later_cb, 0, NULL},
+ {N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Message/Save to _draft folder"),
- "<alt>D", compose_draft_cb, 0, NULL},
+ "<shift><control>D", compose_draft_cb, 0, NULL},
{N_("/_Message/Save and _keep editing"),
"<control>S", compose_draft_cb, 1, NULL},
#if 0 /* NEW COMPOSE GUI */
{N_("/_Message/_Request Return Receipt"), NULL, compose_toggle_return_receipt_cb, 0, "<ToggleItem>"},
{N_("/_Tool"), NULL, NULL, 0, "<Branch>"},
{N_("/_Tool/Show _ruler"), NULL, compose_toggle_ruler_cb, 0, "<ToggleItem>"},
- {N_("/_Tool/_Address book"), "<control><alt>A", compose_address_cb , 0, NULL},
+ {N_("/_Tool/_Address book"), "<shift><control>A", compose_address_cb , 0, NULL},
{N_("/_Tool/_Template"), NULL, NULL, 0, "<Branch>"},
{N_("/_Help"), NULL, NULL, 0, "<Branch>"},
{N_("/_Help/_About"), NULL, about_show, 0, NULL}
guint action,
GtkWidget *widget);
+static void show_all_header_cb (MainWindow *mainwin,
+ guint action,
+ GtkWidget *widget);
+
static void reedit_cb (MainWindow *mainwin,
guint action,
GtkWidget *widget);
{N_("/_View/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_View/Open in new _window"), "<control><alt>N", open_msg_cb, 0, NULL},
{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/Show all _header"), "<control>H", show_all_header_cb, 0, NULL},
{N_("/_View/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_View/_Update"), "<control><alt>U", update_summary_cb, 0, NULL},
{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"), "<shift><control>N", compose_mail_cb, 0, NULL},
+ {N_("/_Message/Compose a_n email message"), "<control>M", compose_mail_cb, 0, NULL},
{N_("/_Message/Compose a news message"), NULL, compose_news_cb, 0, 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},
else
gtk_widget_show(mainwin->exec_btn);
- summary_redisplay_msg(mainwin->summaryview);
+ summary_redisplay_msg(mainwin->summaryview, FALSE);
headerview_set_visibility(mainwin->messageview->headerview,
prefs_common.display_header_pane);
}
summary_view_source(mainwin->summaryview);
}
+static void show_all_header_cb(MainWindow *mainwin, guint action,
+ GtkWidget *widget)
+{
+ summary_redisplay_msg(mainwin->summaryview, TRUE);
+}
+
static void reedit_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
{
summary_reedit(mainwin->summaryview);
g_free(prefs_common.force_charset);
prefs_common.force_charset = str ? g_strdup(str) : NULL;
- summary_redisplay_msg(mainwin->summaryview);
+ summary_redisplay_msg(mainwin->summaryview, FALSE);
debug_print(_("forced charset: %s\n"), str ? str : "Auto-Detect");
}
return ok;
}
-void messageview_show(MessageView *messageview, MsgInfo *msginfo)
+void messageview_show(MessageView *messageview, MsgInfo *msginfo,
+ gboolean all_headers)
{
FILE *fp;
gchar *file;
headerview_show(messageview->headerview, tmpmsginfo);
procmsg_msginfo_free(tmpmsginfo);
+ textview_set_all_headers(messageview->textview, all_headers);
+
if (mimeinfo->mime_type != MIME_TEXT) {
messageview_change_view_type(messageview, MVIEW_MIME);
mimeview_show_message(messageview->mimeview, mimeinfo, file);
MessageView *messageview_create_with_new_window (void);
void messageview_init (MessageView *messageview);
void messageview_show (MessageView *messageview,
- MsgInfo *msginfo);
+ MsgInfo *msginfo,
+ gboolean all_headers);
void messageview_clear (MessageView *messageview);
void messageview_destroy (MessageView *messageview);
void messageview_quote_color_set (void);
gtk_box_pack_start (GTK_BOX (hbox1), keybind_combo, TRUE, TRUE, 0);
gtkut_combo_set_items (GTK_COMBO (keybind_combo),
_("Default"),
- _("Mew / Wanderlust"),
+ "Mew / Wanderlust",
+ "Mutt",
_("Old Sylpheed"),
NULL);
gtk_entry_set_editable (GTK_ENTRY (GTK_COMBO (keybind_combo)->entry),
static void prefs_other_create(void)
{
GtkWidget *vbox1;
+ GtkWidget *ext_frame;
+ GtkWidget *ext_table;
GtkWidget *hbox1;
- GtkWidget *uri_frame;
GtkWidget *uri_label;
GtkWidget *uri_combo;
GtkWidget *uri_entry;
- GtkWidget *print_frame;
GtkWidget *printcmd_label;
GtkWidget *printcmd_entry;
- GtkWidget *exteditor_frame;
GtkWidget *exteditor_label;
GtkWidget *exteditor_combo;
GtkWidget *exteditor_entry;
gtk_container_add (GTK_CONTAINER (dialog.notebook), vbox1);
gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
- PACK_FRAME(vbox1, uri_frame,
- _("External Web browser (%s will be replaced with URI)"));
+ PACK_FRAME(vbox1, ext_frame,
+ _("External commands (%s will be replaced with file name / URI)"));
- hbox1 = gtk_hbox_new (FALSE, 8);
- gtk_widget_show (hbox1);
- gtk_container_add (GTK_CONTAINER (uri_frame), hbox1);
- gtk_container_set_border_width (GTK_CONTAINER (hbox1), 8);
+ ext_table = gtk_table_new (3, 2, FALSE);
+ gtk_widget_show (ext_table);
+ gtk_container_add (GTK_CONTAINER (ext_frame), ext_table);
+ gtk_container_set_border_width (GTK_CONTAINER (ext_table), 8);
+ gtk_table_set_row_spacings (GTK_TABLE (ext_table), VSPACING_NARROW);
+ gtk_table_set_col_spacings (GTK_TABLE (ext_table), 8);
- uri_label = gtk_label_new (_("Command"));
+ uri_label = gtk_label_new (_("Web browser"));
gtk_widget_show(uri_label);
- gtk_box_pack_start (GTK_BOX (hbox1), uri_label, FALSE, TRUE, 0);
+ gtk_table_attach (GTK_TABLE (ext_table), uri_label, 0, 1, 0, 1,
+ GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+ gtk_misc_set_alignment (GTK_MISC (uri_label), 1, 0.5);
uri_combo = gtk_combo_new ();
gtk_widget_show (uri_combo);
- gtk_box_pack_start (GTK_BOX (hbox1), uri_combo, TRUE, TRUE, 0);
+ gtk_table_attach (GTK_TABLE (ext_table), uri_combo, 1, 2, 0, 1,
+ GTK_EXPAND | GTK_FILL, 0, 0, 0);
gtkut_combo_set_items (GTK_COMBO (uri_combo),
"netscape -remote 'openURL(%s,raise)'",
"netscape '%s'",
"kterm -e w3m '%s'",
"kterm -e lynx '%s'",
NULL);
-
uri_entry = GTK_COMBO (uri_combo)->entry;
- PACK_FRAME(vbox1, print_frame,
- _("Printing (%s will be replaced with file name)"));
-
- hbox1 = gtk_hbox_new (FALSE, 8);
- gtk_widget_show (hbox1);
- gtk_container_add (GTK_CONTAINER (print_frame), hbox1);
- gtk_container_set_border_width (GTK_CONTAINER (hbox1), 8);
-
- printcmd_label = gtk_label_new (_("Command"));
+ printcmd_label = gtk_label_new (_("Print"));
gtk_widget_show (printcmd_label);
- gtk_box_pack_start (GTK_BOX (hbox1), printcmd_label, FALSE, FALSE, 0);
+ gtk_table_attach (GTK_TABLE (ext_table), printcmd_label, 0, 1, 1, 2,
+ GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+ gtk_misc_set_alignment (GTK_MISC (printcmd_label), 1, 0.5);
printcmd_entry = gtk_entry_new ();
gtk_widget_show (printcmd_entry);
- gtk_box_pack_start (GTK_BOX (hbox1), printcmd_entry, TRUE, TRUE, 0);
+ gtk_table_attach (GTK_TABLE (ext_table), printcmd_entry, 1, 2, 1, 2,
+ GTK_EXPAND | GTK_FILL, 0, 0, 0);
- PACK_FRAME(vbox1, exteditor_frame,
- _("External editor (%s will be replaced with file name)"));
-
- hbox1 = gtk_hbox_new (FALSE, 8);
- gtk_widget_show (hbox1);
- gtk_container_add (GTK_CONTAINER (exteditor_frame), hbox1);
- gtk_container_set_border_width (GTK_CONTAINER (hbox1), 8);
-
- exteditor_label = gtk_label_new (_("Command"));
+ exteditor_label = gtk_label_new (_("Editor"));
gtk_widget_show (exteditor_label);
- gtk_box_pack_start (GTK_BOX (hbox1), exteditor_label, FALSE, FALSE, 0);
+ gtk_table_attach (GTK_TABLE (ext_table), exteditor_label, 0, 1, 2, 3,
+ GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+ gtk_misc_set_alignment (GTK_MISC (exteditor_label), 1, 0.5);
exteditor_combo = gtk_combo_new ();
gtk_widget_show (exteditor_combo);
- gtk_box_pack_start (GTK_BOX (hbox1), exteditor_combo, TRUE, TRUE, 0);
+ gtk_table_attach (GTK_TABLE (ext_table), exteditor_combo, 1, 2, 2, 3,
+ GTK_EXPAND | GTK_FILL, 0, 0, 0);
gtkut_combo_set_items (GTK_COMBO (exteditor_combo),
"gedit %s",
"kedit %s",
"(menu-path \"<Main>/Message/Get new mail\" \"<control>I\")\n"
"(menu-path \"<Main>/Message/Get from all accounts\" \"<shift><control>I\")\n"
- "(menu-path \"<Main>/Message/Compose an email message\" \"<shift><control>N\")\n"
+ "(menu-path \"<Main>/Message/Compose an email message\" \"<control>M\")\n"
"(menu-path \"<Main>/Message/Reply\" \"<control>R\")\n"
- "(menu-path \"<Main>/Message/Reply to sender\" \"<control><alt>R\")\n"
+ "(menu-path \"<Main>/Message/Reply to sender\" \"\")\n"
"(menu-path \"<Main>/Message/Reply to all\" \"<shift><control>R\")\n"
"(menu-path \"<Main>/Message/Forward\" \"<control><alt>F\")\n"
/* "(menu-path \"<Main>/Message/Forward as attachment\" \"\")\n" */
"(menu-path \"<Main>/Message/Mark/Mark\" \"<shift>asterisk\")\n"
"(menu-path \"<Main>/Message/Mark/Unmark\" \"U\")\n"
"(menu-path \"<Main>/Message/Mark/Mark as unread\" \"<shift>exclam\")\n"
+ "(menu-path \"<Main>/Message/Mark/Mark as read\" \"\")\n"
"(menu-path \"<Main>/Tool/Address book\" \"<shift><control>A\")\n"
"(menu-path \"<Main>/Tool/Execute\" \"X\")\n"
- "(menu-path \"<Main>/Tool/Log window\" \"<control>L\")";
+ "(menu-path \"<Main>/Tool/Log window\" \"<control>L\")\n"
+
+ "(menu-path \"<Compose>/File/Close\" \"<control>W\")\n"
+ "(menu-path \"<Compose>/Edit/Select all\" \"<control>A\")\n"
+ "(menu-path \"<Compose>/Edit/Advanced/Move a word backward\" \"\")\n"
+ "(menu-path \"<Compose>/Edit/Advanced/Move a word forward\" \"\")\n"
+ "(menu-path \"<Compose>/Edit/Advanced/Move to beginning of line\" \"\")\n"
+ "(menu-path \"<Compose>/Edit/Advanced/Delete a word backward\" \"\")\n"
+ "(menu-path \"<Compose>/Edit/Advanced/Delete a word forward\" \"\")";
static gchar *mew_wl_menurc =
"(menu-path \"<Main>/File/Empty trash\" \"<shift>D\")\n"
"(menu-path \"<Main>/File/Save as...\" \"Y\")\n"
- "(menu-path \"<Main>/File/Print...\" \"\")\n"
+ "(menu-path \"<Main>/File/Print...\" \"<shift>numbersign\")\n"
"(menu-path \"<Main>/File/Exit\" \"<shift>Q\")\n"
"(menu-path \"<Main>/Edit/Copy\" \"<control>C\")\n"
"(menu-path \"<Main>/View/Expand Summary View\" \"\")\n"
"(menu-path \"<Main>/View/Expand Message View\" \"\")\n"
- "(menu-path \"<Main>/View/Thread view\" \"<control>T\")\n"
+ "(menu-path \"<Main>/View/Thread view\" \"<shift>T\")\n"
"(menu-path \"<Main>/View/Unthread view\" \"<shift><control>T\")\n"
"(menu-path \"<Main>/View/Go to/Prev message\" \"P\")\n"
"(menu-path \"<Main>/View/Go to/Next message\" \"N\")\n"
"(menu-path \"<Main>/View/Go to/Other folder...\" \"G\")\n"
"(menu-path \"<Main>/View/Open in new window\" \"<control><alt>N\")\n"
"(menu-path \"<Main>/View/View source\" \"<control>U\")\n"
- "(menu-path \"<Main>/View/Show all header\" \"<control>H\")\n"
- "(menu-path \"<Main>/View/Update\" \"<control><alt>U\")\n"
+ "(menu-path \"<Main>/View/Show all header\" \"<shift>H\")\n"
+ "(menu-path \"<Main>/View/Update\" \"<shift>S\")\n"
"(menu-path \"<Main>/Message/Get new mail\" \"<control>I\")\n"
"(menu-path \"<Main>/Message/Get from all accounts\" \"<shift><control>I\")\n"
"(menu-path \"<Main>/Message/Mark/Mark\" \"<shift>asterisk\")\n"
"(menu-path \"<Main>/Message/Mark/Unmark\" \"U\")\n"
"(menu-path \"<Main>/Message/Mark/Mark as unread\" \"<shift>exclam\")\n"
+ "(menu-path \"<Main>/Message/Mark/Mark as read\" \"<shift>R\")\n"
+
+ "(menu-path \"<Main>/Tool/Address book\" \"<shift><control>A\")\n"
+ "(menu-path \"<Main>/Tool/Execute\" \"X\")\n"
+ "(menu-path \"<Main>/Tool/Log window\" \"<control>L\")\n"
+
+ "(menu-path \"<Compose>/File/Close\" \"<alt>W\")\n"
+ "(menu-path \"<Compose>/Edit/Select all\" \"\")\n"
+ "(menu-path \"<Compose>/Edit/Advanced/Move a word backward\" \"<alt>B\")\n"
+ "(menu-path \"<Compose>/Edit/Advanced/Move a word forward\" \"<alt>F\")\n"
+ "(menu-path \"<Compose>/Edit/Advanced/Move to beginning of line\" \"<control>A\")\n"
+ "(menu-path \"<Compose>/Edit/Advanced/Delete a word backward\" \"<control>W\")\n"
+ "(menu-path \"<Compose>/Edit/Advanced/Delete a word forward\" \"<alt>D\")";
+
+ static gchar *mutt_menurc =
+ "(menu-path \"<Main>/File/Empty trash\" \"\")\n"
+ "(menu-path \"<Main>/File/Save as...\" \"S\")\n"
+ "(menu-path \"<Main>/File/Print...\" \"P\")\n"
+ "(menu-path \"<Main>/File/Exit\" \"Q\")\n"
+
+ "(menu-path \"<Main>/Edit/Copy\" \"<control>C\")\n"
+ "(menu-path \"<Main>/Edit/Select all\" \"<control>A\")\n"
+ "(menu-path \"<Main>/Edit/Find in current message...\" \"<control>F\")\n"
+ "(menu-path \"<Main>/Edit/Search messages...\" \"slash\")\n"
+
+ "(menu-path \"<Main>/View/Toggle summary view\" \"V\")\n"
+ "(menu-path \"<Main>/View/Thread view\" \"<control>T\")\n"
+ "(menu-path \"<Main>/View/Unthread view\" \"<shift><control>T\")\n"
+ "(menu-path \"<Main>/View/Go to/Prev message\" \"\")\n"
+ "(menu-path \"<Main>/View/Go to/Next message\" \"\")\n"
+ "(menu-path \"<Main>/View/Go to/Prev unread message\" \"\")\n"
+ "(menu-path \"<Main>/View/Go to/Next unread message\" \"\")\n"
+ "(menu-path \"<Main>/View/Go to/Other folder...\" \"C\")\n"
+ "(menu-path \"<Main>/View/Open in new window\" \"<control><alt>N\")\n"
+ "(menu-path \"<Main>/View/View source\" \"<control>U\")\n"
+ "(menu-path \"<Main>/View/Show all header\" \"<control>H\")\n"
+ "(menu-path \"<Main>/View/Update\" \"<control><alt>U\")\n"
+
+ "(menu-path \"<Main>/Message/Get new mail\" \"<control>I\")\n"
+ "(menu-path \"<Main>/Message/Get from all accounts\" \"<shift><control>I\")\n"
+ "(menu-path \"<Main>/Message/Compose new message\" \"M\")\n"
+ "(menu-path \"<Main>/Message/Reply\" \"R\")\n"
+ "(menu-path \"<Main>/Message/Reply to all\" \"G\")\n"
+ "(menu-path \"<Main>/Message/Reply to sender\" \"\")\n"
+ "(menu-path \"<Main>/Message/Forward\" \"F\")\n"
+ "(menu-path \"<Main>/Message/Forward as attachment\" \"\")\n"
+ "(menu-path \"<Main>/Message/Move...\" \"<control>O\")\n"
+ "(menu-path \"<Main>/Message/Copy...\" \"<shift>C\")\n"
+ "(menu-path \"<Main>/Message/Delete\" \"D\")\n"
+ "(menu-path \"<Main>/Message/Mark/Mark\" \"<shift>F\")\n"
+ "(menu-path \"<Main>/Message/Mark/Unmark\" \"U\")\n"
+ "(menu-path \"<Main>/Message/Mark/Mark as unread\" \"<shift>N\")\n"
+ "(menu-path \"<Main>/Message/Mark/Mark as read\" \"\")\n"
"(menu-path \"<Main>/Tool/Address book\" \"<shift><control>A\")\n"
"(menu-path \"<Main>/Tool/Execute\" \"X\")\n"
- "(menu-path \"<Main>/Tool/Log window\" \"<control>L\")";
+ "(menu-path \"<Main>/Tool/Log window\" \"<control>L\")\n"
+
+ "(menu-path \"<Compose>/File/Close\" \"<alt>W\")\n"
+ "(menu-path \"<Compose>/Edit/Select all\" \"\")\n"
+ "(menu-path \"<Compose>/Edit/Advanced/Move a word backward\" \"<alt>B\")\n"
+ "(menu-path \"<Compose>/Edit/Advanced/Move a word forward\" \"<alt>F\")\n"
+ "(menu-path \"<Compose>/Edit/Advanced/Move to beginning of line\" \"<control>A\")\n"
+ "(menu-path \"<Compose>/Edit/Advanced/Delete a word backward\" \"<control>W\")\n"
+ "(menu-path \"<Compose>/Edit/Advanced/Delete a word forward\" \"<alt>D\")";
static gchar *old_sylpheed_menurc =
"(menu-path \"<Main>/File/Empty trash\" \"\")\n"
"(menu-path \"<Main>/Message/Mark/Mark\" \"<shift>asterisk\")\n"
"(menu-path \"<Main>/Message/Mark/Unmark\" \"U\")\n"
"(menu-path \"<Main>/Message/Mark/Mark as unread\" \"<shift>exclam\")\n"
+ "(menu-path \"<Main>/Message/Mark/Mark as read\" \"\")\n"
"(menu-path \"<Main>/Tool/Address book\" \"<alt>A\")\n"
"(menu-path \"<Main>/Tool/Execute\" \"<alt>X\")\n"
- "(menu-path \"<Main>/Tool/Log window\" \"<alt>L\")";
+ "(menu-path \"<Main>/Tool/Log window\" \"<alt>L\")\n"
+
+ "(menu-path \"<Compose>/File/Close\" \"<alt>W\")\n"
+ "(menu-path \"<Compose>/Edit/Select all\" \"\")\n"
+ "(menu-path \"<Compose>/Edit/Advanced/Move a word backward\" \"<alt>B\")\n"
+ "(menu-path \"<Compose>/Edit/Advanced/Move a word forward\" \"<alt>F\")\n"
+ "(menu-path \"<Compose>/Edit/Advanced/Move to beginning of line\" \"<control>A\")\n"
+ "(menu-path \"<Compose>/Edit/Advanced/Delete a word backward\" \"<control>W\")\n"
+ "(menu-path \"<Compose>/Edit/Advanced/Delete a word forward\" \"<alt>D\")";
static gchar *empty_menurc =
"(menu-path \"<Main>/File/Empty trash\" \"\")\n"
"(menu-path \"<Main>/Message/Mark/Mark\" \"\")\n"
"(menu-path \"<Main>/Message/Mark/Unmark\" \"\")\n"
"(menu-path \"<Main>/Message/Mark/Mark as unread\" \"\")\n"
+ "(menu-path \"<Main>/Message/Mark/Mark as read\" \"\")\n"
"(menu-path \"<Main>/Tool/Address book\" \"\")\n"
"(menu-path \"<Main>/Tool/Execute\" \"\")\n"
- "(menu-path \"<Main>/Tool/Log window\" \"\")";
+ "(menu-path \"<Main>/Tool/Log window\" \"\")\n"
+
+ "(menu-path \"<Compose>/File/Close\" \"\")\n"
+ "(menu-path \"<Compose>/Edit/Select all\" \"\")\n"
+ "(menu-path \"<Compose>/Edit/Advanced/Move a word backward\" \"\")\n"
+ "(menu-path \"<Compose>/Edit/Advanced/Move a word forward\" \"\")\n"
+ "(menu-path \"<Compose>/Edit/Advanced/Move to beginning of line\" \"\")\n"
+ "(menu-path \"<Compose>/Edit/Advanced/Delete a word backward\" \"\")\n"
+ "(menu-path \"<Compose>/Edit/Advanced/Delete a word forward\" \"\")";
text = gtk_entry_get_text(entry);
if (!strcmp(text, _("Default")))
rc_str = default_menurc;
- else if (!strcmp(text, _("Mew / Wanderlust")))
+ else if (!strcmp(text, "Mew / Wanderlust"))
rc_str = mew_wl_menurc;
+ else if (!strcmp(text, "Mutt"))
+ rc_str = mutt_menurc;
else if (!strcmp(text, _("Old Sylpheed")))
rc_str = old_sylpheed_menurc;
else
gchar *text[],
MsgInfo *msginfo);
static void summary_display_msg (SummaryView *summaryview,
+ GtkCTreeNode *row);
+static void summary_display_msg_full (SummaryView *summaryview,
GtkCTreeNode *row,
- gboolean new_window);
-
+ gboolean new_window,
+ gboolean all_headers);
static void summary_set_row_marks (SummaryView *summaryview,
GtkCTreeNode *row);
static void summaryview_subject_filter_init (PrefsFolderItem *prefs);
gtk_sctree_select(GTK_SCTREE(ctree), node);
if (summaryview->displayed == node)
summaryview->displayed = NULL;
- summary_display_msg(summaryview, node, FALSE);
+ summary_display_msg(summaryview, node);
}
}
gtk_sctree_select(GTK_SCTREE(ctree), node);
if (summaryview->displayed == node)
summaryview->displayed = NULL;
- summary_display_msg(summaryview, node, FALSE);
+ summary_display_msg(summaryview, node);
}
}
gtk_sctree_select(GTK_SCTREE(ctree), node);
if (summaryview->displayed == node)
summaryview->displayed = NULL;
- summary_display_msg(summaryview, node, FALSE);
+ summary_display_msg(summaryview, node);
}
}
gtk_sctree_select(GTK_SCTREE(ctree), node);
if (summaryview->displayed == node)
summaryview->displayed = NULL;
- summary_display_msg(summaryview, node, FALSE);
+ summary_display_msg(summaryview, node);
}
}
gtk_sctree_select(GTK_SCTREE(ctree), node);
if (summaryview->displayed == node)
summaryview->displayed = NULL;
- summary_display_msg(summaryview, node, FALSE);
+ summary_display_msg(summaryview, node);
}
}
gtk_sctree_select(GTK_SCTREE(ctree), node);
if (summaryview->displayed == node)
summaryview->displayed = NULL;
- summary_display_msg(summaryview, node, FALSE);
+ summary_display_msg(summaryview, node);
}
}
msginfo); \
}
-static void summary_display_msg(SummaryView *summaryview, GtkCTreeNode *row,
- gboolean new_window)
+static void summary_display_msg(SummaryView *summaryview, GtkCTreeNode *row)
+{
+ summary_display_msg_full(summaryview, row, FALSE, FALSE);
+}
+
+static void summary_display_msg_full(SummaryView *summaryview,
+ GtkCTreeNode *row,
+ gboolean new_window, gboolean all_headers)
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
MsgInfo *msginfo;
MessageView *msgview;
msgview = messageview_create_with_new_window();
- messageview_show(msgview, msginfo);
+ messageview_show(msgview, msginfo, all_headers);
} else {
MessageView *msgview;
summaryview->displayed = row;
if (!summaryview->msg_is_toggled_on)
summary_toggle_view(summaryview);
- messageview_show(msgview, msginfo);
+ messageview_show(msgview, msginfo, all_headers);
if (msgview->type == MVIEW_TEXT ||
(msgview->type == MVIEW_MIME &&
GTK_CLIST(msgview->mimeview->ctree)->row_list == NULL))
summary_status_show(summaryview);
}
+#if 0
if (GTK_WIDGET_VISIBLE(summaryview->headerwin->window))
header_window_show(summaryview->headerwin, msginfo);
+#endif
summary_unlock(summaryview);
}
-void summary_redisplay_msg(SummaryView *summaryview)
+void summary_redisplay_msg(SummaryView *summaryview, gboolean all_headers)
{
GtkCTreeNode *node;
if (summaryview->displayed) {
node = summaryview->displayed;
summaryview->displayed = NULL;
- summary_display_msg(summaryview, node, FALSE);
+ summary_display_msg_full(summaryview, node, FALSE, all_headers);
}
}
{
if (!summaryview->selected) return;
- summary_display_msg(summaryview, summaryview->selected, TRUE);
+ summary_display_msg_full(summaryview, summaryview->selected,
+ TRUE, FALSE);
}
void summary_view_source(SummaryView * summaryview)
gtk_signal_emit_by_name(GTK_OBJECT(ctree), "scroll_vertical",
type, 0.0);
-
+
if (summaryview->msg_is_toggled_on)
- summary_display_msg(summaryview, summaryview->selected, FALSE);
+ summary_display_msg(summaryview, summaryview->selected);
}
static void summary_toggle_view(SummaryView *summaryview)
if (!summaryview->displayed)
messageview_clear(summaryview->messageview);
else
- summary_redisplay_msg(summaryview);
+ summary_redisplay_msg(summaryview, TRUE);
}
SummaryView *summaryview = (SummaryView *) data;
if (!summaryview->msg_is_toggled_on && summaryview->selected)
- summary_display_msg(summaryview, summaryview->selected, FALSE);
+ summary_display_msg(summaryview, summaryview->selected);
else
summary_toggle_view(summaryview);
}
case GDK_space: /* Page down or go to the next */
if (summaryview->displayed != summaryview->selected) {
summary_display_msg(summaryview,
- summaryview->selected, FALSE);
+ summaryview->selected);
break;
}
if (!textview_scroll_page(summaryview->messageview->textview,
case GDK_Return: /* Scroll up/down one line */
if (summaryview->displayed != summaryview->selected) {
summary_display_msg(summaryview,
- summaryview->selected, FALSE);
+ summaryview->selected);
break;
}
textview_scroll_one_line(summaryview->messageview->textview,
}
if (summaryview->display_msg)
- summary_display_msg(summaryview, row, FALSE);
+ summary_display_msg(summaryview, row);
summaryview->display_msg = FALSE;
}
static void summary_show_all_header_cb(SummaryView *summaryview,
guint action, GtkWidget *widget)
{
- header_window_show_cb(summaryview->mainwin, action, widget);
+ summary_redisplay_msg(summaryview, TRUE);
}
static void summary_add_address_cb(SummaryView *summaryview,
void summary_pass_key_press_event (SummaryView *summaryview,
GdkEventKey *event);
-void summary_redisplay_msg (SummaryView *summaryview);
+void summary_redisplay_msg (SummaryView *summaryview,
+ gboolean all_headers);
void summary_open_msg (SummaryView *summaryview);
void summary_view_source (SummaryView *summaryview);
void summary_reedit (SummaryView *summaryview);
vbox = gtk_vbox_new(FALSE, 0);
gtk_box_pack_start(GTK_BOX(vbox), scrolledwin_sb, TRUE, TRUE, 0);
- textview->vbox = vbox;
- textview->scrolledwin = scrolledwin_sb;
- textview->scrolledwin_sb = scrolledwin_sb;
- textview->scrolledwin_mb = scrolledwin_mb;
- textview->text = text_sb;
- textview->text_sb = text_sb;
- textview->text_mb = text_mb;
- textview->text_is_mb = FALSE;
- textview->uri_list = NULL;
- textview->body_pos = 0;
- textview->cur_pos = 0;
+ textview->vbox = vbox;
+ textview->scrolledwin = scrolledwin_sb;
+ textview->scrolledwin_sb = scrolledwin_sb;
+ textview->scrolledwin_mb = scrolledwin_mb;
+ textview->text = text_sb;
+ textview->text_sb = text_sb;
+ textview->text_mb = text_mb;
+ textview->text_is_mb = FALSE;
+ textview->uri_list = NULL;
+ textview->body_pos = 0;
+ textview->cur_pos = 0;
+ textview->show_all_headers = FALSE;
textview->last_buttonpress = GDK_NOTHING;
return textview;
gtkut_widget_disable_theme_engine(textview->text_sb);
gtkut_widget_disable_theme_engine(textview->text_mb);
textview_update_message_colors();
+ textview_set_all_headers(textview, FALSE);
textview_set_font(textview, NULL);
}
g_free(textview);
}
+void textview_set_all_headers(TextView *textview, gboolean all_headers)
+{
+ textview->show_all_headers = all_headers;
+}
+
void textview_set_font(TextView *textview, const gchar *codeset)
{
gboolean use_fontset = TRUE;
g_return_val_if_fail(fp != NULL, NULL);
+ if (textview->show_all_headers)
+ return procheader_get_header_array_asis(fp);
+
if (!prefs_common.display_header) {
while (fgets(buf, sizeof(buf), fp) != NULL)
if (buf[0] == '\r' || buf[0] == '\n') break;
/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2001 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2002 Hiroyuki Yamamoto
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
gint prev_ascent;
gint prev_descent;
- MessageView *messageview;
+ gboolean show_all_headers;
+ MessageView *messageview;
gint last_buttonpress;
};
#endif
void textview_clear (TextView *textview);
void textview_destroy (TextView *textview);
+void textview_set_all_headers (TextView *textview,
+ gboolean all_headers);
void textview_set_font (TextView *textview,
const gchar *codeset);
void textview_set_position (TextView *textview,