/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2002 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2003 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
GtkWidget *checkbtn_newmail_manu;
GtkWidget *entry_newmail_notify_cmd;
GtkWidget *hbox_newmail_notify;
-
- GtkWidget *spinbtn_maxarticle;
- GtkObject *spinbtn_maxarticle_adj;
} receive;
static struct Send {
GtkWidget *checkbtn_queuemsg;
GtkWidget *optmenu_charset;
+ GtkWidget *optmenu_encoding_method;
} p_send;
static struct Compose {
- GtkWidget *checkbtn_autosig;
- GtkWidget *entry_sigsep;
-
GtkWidget *entry_fw_quotemark;
GtkWidget *text_fw_quotefmt;
GtkWidget *chkbtn_swapfrom;
GtkWidget *chkbtn_useaddrbook;
- GtkWidget *chkbtn_expand_thread;
+ GtkWidget *chkbtn_threadsubj;
GtkWidget *entry_datefmt;
} display;
GtkObject *spinbtn_scrollstep_adj;
GtkWidget *chkbtn_halfpage;
- GtkWidget *chkbtn_display_img;
- GtkWidget *chkbtn_resize_image;
+ GtkWidget *chkbtn_attach_desc;
} message;
#if USE_GPGME
GtkWidget *checkbtn_show_msg_with_cursor;
GtkWidget *checkbtn_openunread;
GtkWidget *checkbtn_mark_as_read_on_newwin;
+ GtkWidget *checkbtn_open_on_delete;
GtkWidget *checkbtn_openinbox;
GtkWidget *checkbtn_immedexec;
GtkWidget *optmenu_recvdialog;
static GtkWidget *quote_color_win;
static GtkWidget *color_dialog;
-static void prefs_common_charset_set_data_from_optmenu(PrefParam *pparam);
-static void prefs_common_charset_set_optmenu (PrefParam *pparam);
+static void prefs_common_charset_set_data_from_optmenu (PrefParam *pparam);
+static void prefs_common_charset_set_optmenu (PrefParam *pparam);
+static void prefs_common_encoding_set_data_from_optmenu (PrefParam *pparam);
+static void prefs_common_encoding_set_optmenu (PrefParam *pparam);
+static void prefs_common_recv_dialog_set_data_from_optmenu (PrefParam *pparam);
+static void prefs_common_recv_dialog_set_optmenu (PrefParam *pparam);
static void prefs_common_recv_dialog_newmail_notify_toggle_cb (GtkWidget *w,
gpointer data);
static void prefs_common_recv_dialog_set_data_from_optmenu(PrefParam *pparam);
{"inc_local", "TRUE", &prefs_common.inc_local, P_BOOL,
&receive.checkbtn_local,
prefs_set_data_from_toggle, prefs_set_toggle},
- {"filter_on_inc_local", "FALSE", &prefs_common.filter_on_inc, P_BOOL,
+ {"filter_on_inc_local", "TRUE", &prefs_common.filter_on_inc, P_BOOL,
&receive.checkbtn_filter_on_inc,
prefs_set_data_from_toggle, prefs_set_toggle},
{"spool_path", DEFAULT_SPOOL_PATH, &prefs_common.spool_path, P_STRING,
&receive.entry_newmail_notify_cmd,
prefs_set_data_from_entry, prefs_set_entry},
- {"max_news_articles", "300", &prefs_common.max_articles, P_INT,
- &receive.spinbtn_maxarticle,
- prefs_set_data_from_spinbtn, prefs_set_spinbtn},
-
/* Send */
{"use_ext_sendmail", "FALSE", &prefs_common.use_extsend, P_BOOL,
&p_send.checkbtn_extsend,
&p_send.optmenu_charset,
prefs_common_charset_set_data_from_optmenu,
prefs_common_charset_set_optmenu},
+ {"encoding_method", "0", &prefs_common.encoding_method, P_ENUM,
+ &p_send.optmenu_encoding_method,
+ prefs_common_encoding_set_data_from_optmenu,
+ prefs_common_encoding_set_optmenu},
/* Compose */
- {"auto_signature", "TRUE", &prefs_common.auto_sig, P_BOOL,
- &compose.checkbtn_autosig,
- prefs_set_data_from_toggle, prefs_set_toggle},
- {"signature_separator", "-- ", &prefs_common.sig_sep, P_STRING,
- &compose.entry_sigsep, prefs_set_data_from_entry, prefs_set_entry},
-
{"auto_ext_editor", "FALSE", &prefs_common.auto_exteditor, P_BOOL,
&compose.checkbtn_autoextedit,
prefs_set_data_from_toggle, prefs_set_toggle},
{"check_while_typing", "TRUE", &prefs_common.check_while_typing,
P_BOOL, &spelling.checkbtn_check_while_typing,
prefs_set_data_from_toggle, prefs_set_toggle},
- {"misspelled_color", "16711680", &prefs_common.misspelled_col, P_INT,
+ {"misspelled_color", "16711680", &prefs_common.misspelled_col, P_COLOR,
NULL, NULL, NULL},
#endif
{"reply_with_quote", "TRUE", &prefs_common.reply_with_quote, P_BOOL,
{"use_address_book", "TRUE", &prefs_common.use_addr_book, P_BOOL,
&display.chkbtn_useaddrbook,
prefs_set_data_from_toggle, prefs_set_toggle},
+ {"thread_by_subject", "TRUE", &prefs_common.thread_by_subject, P_BOOL,
+ &display.chkbtn_threadsubj,
+ prefs_set_data_from_toggle, prefs_set_toggle},
{"date_format", "%y/%m/%d(%a) %H:%M", &prefs_common.date_format,
P_STRING, &display.entry_datefmt,
prefs_set_data_from_entry, prefs_set_entry},
- {"expand_thread", "TRUE", &prefs_common.expand_thread, P_BOOL,
- &display.chkbtn_expand_thread,
- prefs_set_data_from_toggle, prefs_set_toggle},
{"enable_hscrollbar", "TRUE", &prefs_common.enable_hscrollbar, P_BOOL,
NULL, NULL, NULL},
{"summary_col_show_mark", "TRUE",
&prefs_common.summary_col_visible[S_COL_MARK], P_BOOL, NULL, NULL, NULL},
{"summary_col_show_unread", "TRUE",
- &prefs_common.summary_col_visible[S_COL_UNREAD], P_BOOL, NULL, NULL, NULL},
+ &prefs_common.summary_col_visible[S_COL_STATUS], P_BOOL, NULL, NULL, NULL},
{"summary_col_show_mime", "TRUE",
&prefs_common.summary_col_visible[S_COL_MIME], P_BOOL, NULL, NULL, NULL},
{"summary_col_show_subject", "TRUE",
{"summary_col_pos_mark", "0",
&prefs_common.summary_col_pos[S_COL_MARK], P_INT, NULL, NULL, NULL},
{"summary_col_pos_unread", "1",
- &prefs_common.summary_col_pos[S_COL_UNREAD], P_INT, NULL, NULL, NULL},
+ &prefs_common.summary_col_pos[S_COL_STATUS], P_INT, NULL, NULL, NULL},
{"summary_col_pos_mime", "2",
&prefs_common.summary_col_pos[S_COL_MIME], P_INT, NULL, NULL, NULL},
{"summary_col_pos_subject", "3",
{"summary_col_size_mark", "10",
&prefs_common.summary_col_size[S_COL_MARK], P_INT, NULL, NULL, NULL},
{"summary_col_size_unread", "13",
- &prefs_common.summary_col_size[S_COL_UNREAD], P_INT, NULL, NULL, NULL},
+ &prefs_common.summary_col_size[S_COL_STATUS], P_INT, NULL, NULL, NULL},
{"summary_col_size_mime", "10",
&prefs_common.summary_col_size[S_COL_MIME], P_INT, NULL, NULL, NULL},
{"summary_col_size_subject", "200",
NULL, NULL, NULL},
{"messagewin_height", "540", &prefs_common.msgwin_height, P_INT,
NULL, NULL, NULL},
+ {"sourcewin_width", "600", &prefs_common.sourcewin_width, P_INT,
+ NULL, NULL, NULL},
+ {"sourcewin_height", "500", &prefs_common.sourcewin_height, P_INT,
+ NULL, NULL, NULL},
{"compose_width", "600", &prefs_common.compose_width, P_INT,
NULL, NULL, NULL},
{"compose_height", "560", &prefs_common.compose_height, P_INT,
&message.chkbtn_enablecol,
prefs_set_data_from_toggle, prefs_set_toggle},
- {"quote_level1_color", "179", &prefs_common.quote_level1_col, P_INT,
+ {"quote_level1_color", "179", &prefs_common.quote_level1_col, P_COLOR,
NULL, NULL, NULL},
- {"quote_level2_color", "179", &prefs_common.quote_level2_col, P_INT,
+ {"quote_level2_color", "179", &prefs_common.quote_level2_col, P_COLOR,
NULL, NULL, NULL},
- {"quote_level3_color", "179", &prefs_common.quote_level3_col, P_INT,
+ {"quote_level3_color", "179", &prefs_common.quote_level3_col, P_COLOR,
NULL, NULL, NULL},
- {"uri_color", "32512", &prefs_common.uri_col, P_INT,
+ {"uri_color", "32512", &prefs_common.uri_col, P_COLOR,
NULL, NULL, NULL},
- {"target_folder_color", "14294218", &prefs_common.tgt_folder_col, P_INT,
+ {"target_folder_color", "14294218", &prefs_common.tgt_folder_col, P_COLOR,
NULL, NULL, NULL},
- {"signature_color", "7960953", &prefs_common.signature_col, P_INT,
+ {"signature_color", "7960953", &prefs_common.signature_col, P_COLOR,
NULL, NULL, NULL},
{"recycle_quote_colors", "FALSE", &prefs_common.recycle_quote_colors,
P_BOOL, NULL, NULL, NULL},
&message.chkbtn_halfpage,
prefs_set_data_from_toggle, prefs_set_toggle},
- {"display_img", "TRUE", &prefs_common.display_img, P_BOOL,
- &message.chkbtn_display_img,
- prefs_set_data_from_toggle, prefs_set_toggle},
- {"resize_image", "TRUE", &prefs_common.resize_image, P_BOOL,
- &message.chkbtn_resize_image,
- prefs_set_data_from_toggle, prefs_set_toggle},
-
{"show_other_header", "FALSE", &prefs_common.show_other_header, P_BOOL,
NULL, NULL, NULL},
+ {"attach_desc", "TRUE", &prefs_common.attach_desc, P_BOOL,
+ &message.chkbtn_attach_desc,
+ prefs_set_data_from_toggle, prefs_set_toggle},
+
/* MIME viewer */
{"mime_image_viewer", "display '%s'",
&prefs_common.mime_image_viewer, P_STRING, NULL, NULL, NULL},
&prefs_common.mark_as_read_on_new_window,
P_BOOL, &interface.checkbtn_mark_as_read_on_newwin,
prefs_set_data_from_toggle, prefs_set_toggle},
+ {"open_on_delete", "TRUE",
+ &prefs_common.open_on_delete,
+ P_BOOL, &interface.checkbtn_open_on_delete,
+ prefs_set_data_from_toggle, prefs_set_toggle},
{"open_inbox_on_inc", "FALSE", &prefs_common.open_inbox_on_inc,
P_BOOL, &interface.checkbtn_openinbox,
prefs_set_data_from_toggle, prefs_set_toggle},
{"cache_min_keep_time", "15", &prefs_common.cache_min_keep_time, P_INT,
NULL, NULL, NULL},
+ {"color_new", "179", &prefs_common.color_new, P_COLOR,
+ NULL, NULL, NULL},
+
{NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL}
};
prefs_common.disphdr_list = NULL;
}
+PrefsCommon *prefs_common_get(void)
+{
+ return &prefs_common;
+}
+
void prefs_common_read_config(void)
{
FILE *fp;
GtkWidget *entry_newmail_notify_cmd;
GtkWidget *label_newmail_notify_cmd;
- GtkWidget *frame_news;
- GtkWidget *label_maxarticle;
- GtkWidget *spinbtn_maxarticle;
- GtkObject *spinbtn_maxarticle_adj;
-
vbox1 = gtk_vbox_new (FALSE, VSPACING);
gtk_widget_show (vbox1);
gtk_container_add (GTK_CONTAINER (dialog.notebook), vbox1);
prefs_common.newmail_notify_auto ||
prefs_common.newmail_notify_manu);
- PACK_FRAME(vbox1, frame_news, _("News"));
-
- hbox = gtk_hbox_new (FALSE, 8);
- gtk_widget_show (hbox);
- gtk_container_add (GTK_CONTAINER (frame_news), hbox);
- gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
-
- label_maxarticle = gtk_label_new
- (_("Maximum number of articles to download\n"
- "(unlimited if 0 is specified)"));
- gtk_widget_show (label_maxarticle);
- gtk_box_pack_start (GTK_BOX (hbox), label_maxarticle, FALSE, FALSE, 0);
- gtk_label_set_justify (GTK_LABEL (label_maxarticle), GTK_JUSTIFY_LEFT);
-
- spinbtn_maxarticle_adj =
- gtk_adjustment_new (300, 0, 10000, 10, 100, 100);
- spinbtn_maxarticle = gtk_spin_button_new
- (GTK_ADJUSTMENT (spinbtn_maxarticle_adj), 10, 0);
- gtk_widget_show (spinbtn_maxarticle);
- gtk_box_pack_start (GTK_BOX (hbox), spinbtn_maxarticle,
- FALSE, FALSE, 0);
- gtk_widget_set_usize (spinbtn_maxarticle, 64, -1);
- gtk_spin_button_set_numeric
- (GTK_SPIN_BUTTON (spinbtn_maxarticle), TRUE);
-
receive.checkbtn_incext = checkbtn_incext;
receive.entry_incext = entry_incext;
/* receive.button_incext = button_incext; */
receive.checkbtn_newmail_manu = checkbtn_newmail_manu;
receive.hbox_newmail_notify = hbox_newmail_notify;
receive.entry_newmail_notify_cmd = entry_newmail_notify_cmd;
-
- receive.spinbtn_maxarticle = spinbtn_maxarticle;
- receive.spinbtn_maxarticle_adj = spinbtn_maxarticle_adj;
}
static void prefs_send_create(void)
GtkWidget *checkbtn_savemsg;
GtkWidget *checkbtn_queuemsg;
GtkWidget *label_outcharset;
- GtkWidget *optmenu;
+ GtkWidget *optmenu_charset;
GtkWidget *optmenu_menu;
GtkWidget *menuitem;
GtkWidget *label_charset_desc;
+ GtkWidget *optmenu_encoding;
+ GtkWidget *label_encoding;
+ GtkWidget *label_encoding_desc;
vbox1 = gtk_vbox_new (FALSE, VSPACING);
gtk_widget_show (vbox1);
gtk_widget_show (label_outcharset);
gtk_box_pack_start (GTK_BOX (hbox1), label_outcharset, FALSE, FALSE, 0);
- optmenu = gtk_option_menu_new ();
- gtk_widget_show (optmenu);
- gtk_box_pack_start (GTK_BOX (hbox1), optmenu, FALSE, FALSE, 0);
+ optmenu_charset = gtk_option_menu_new ();
+ gtk_widget_show (optmenu_charset);
+ gtk_box_pack_start (GTK_BOX (hbox1), optmenu_charset, FALSE, FALSE, 0);
optmenu_menu = gtk_menu_new ();
-#define SET_MENUITEM(str, charset) \
+#define SET_MENUITEM(str, data) \
{ \
- MENUITEM_ADD(optmenu_menu, menuitem, str, charset); \
+ MENUITEM_ADD(optmenu_menu, menuitem, str, data); \
}
SET_MENUITEM(_("Automatic (Recommended)"), CS_AUTO);
SET_MENUITEM(_("7bit ascii (US-ASCII)"), CS_US_ASCII);
-#if HAVE_LIBJCONV
+#if HAVE_ICONV
SET_MENUITEM(_("Unicode (UTF-8)"), CS_UTF_8);
#endif
SET_MENUITEM(_("Western European (ISO-8859-1)"), CS_ISO_8859_1);
SET_MENUITEM(_("Baltic (ISO-8859-4)"), CS_ISO_8859_4);
SET_MENUITEM(_("Greek (ISO-8859-7)"), CS_ISO_8859_7);
SET_MENUITEM(_("Turkish (ISO-8859-9)"), CS_ISO_8859_9);
-#if HAVE_LIBJCONV
+#if HAVE_ICONV
SET_MENUITEM(_("Cyrillic (ISO-8859-5)"), CS_ISO_8859_5);
#endif
SET_MENUITEM(_("Cyrillic (KOI8-R)"), CS_KOI8_R);
-#if HAVE_LIBJCONV
+#if HAVE_ICONV
SET_MENUITEM(_("Cyrillic (Windows-1251)"), CS_WINDOWS_1251);
SET_MENUITEM(_("Cyrillic (KOI8-U)"), CS_KOI8_U);
#endif
SET_MENUITEM(_("Thai (TIS-620)"), CS_TIS_620);
SET_MENUITEM(_("Thai (Windows-874)"), CS_WINDOWS_874);
- gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu), optmenu_menu);
+ gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu_charset),
+ optmenu_menu);
hbox1 = gtk_hbox_new (FALSE, 8);
gtk_widget_show (hbox1);
gtk_widget_show (label_charset_desc);
gtk_box_pack_start (GTK_BOX (hbox1), label_charset_desc,
FALSE, FALSE, 0);
- gtk_label_set_justify(GTK_LABEL (label_charset_desc), GTK_JUSTIFY_LEFT);
+ gtk_label_set_justify (GTK_LABEL (label_charset_desc),
+ GTK_JUSTIFY_LEFT);
+
+ hbox1 = gtk_hbox_new (FALSE, 8);
+ gtk_widget_show (hbox1);
+ gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
+
+ label_encoding = gtk_label_new (_("Transfer encoding"));
+ gtk_widget_show (label_encoding);
+ gtk_box_pack_start (GTK_BOX (hbox1), label_encoding, FALSE, FALSE, 0);
+
+ optmenu_encoding = gtk_option_menu_new ();
+ gtk_widget_show (optmenu_encoding);
+ gtk_box_pack_start (GTK_BOX (hbox1), optmenu_encoding, FALSE, FALSE, 0);
+
+ optmenu_menu = gtk_menu_new ();
+
+ SET_MENUITEM(_("Automatic"), CTE_AUTO);
+ SET_MENUITEM("base64", CTE_BASE64);
+ SET_MENUITEM("quoted-printable", CTE_QUOTED_PRINTABLE);
+ SET_MENUITEM("8bit", CTE_8BIT);
+
+ gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu_encoding),
+ optmenu_menu);
+
+ hbox1 = gtk_hbox_new (FALSE, 8);
+ gtk_widget_show (hbox1);
+ gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
+
+ label_encoding_desc = gtk_label_new
+ (_("Specify Content-Transfer-Encoding used when\n"
+ "message body contains non-ASCII characters."));
+ gtk_widget_show (label_encoding_desc);
+ gtk_box_pack_start (GTK_BOX (hbox1), label_encoding_desc,
+ FALSE, FALSE, 0);
+ gtk_label_set_justify (GTK_LABEL (label_encoding_desc),
+ GTK_JUSTIFY_LEFT);
p_send.checkbtn_extsend = checkbtn_extsend;
p_send.entry_extsend = entry_extsend;
p_send.checkbtn_savemsg = checkbtn_savemsg;
p_send.checkbtn_queuemsg = checkbtn_queuemsg;
- p_send.optmenu_charset = optmenu;
+ p_send.optmenu_charset = optmenu_charset;
+ p_send.optmenu_encoding_method = optmenu_encoding;
}
static void prefs_common_recv_dialog_newmail_notify_toggle_cb(GtkWidget *w, gpointer data)
{
GtkWidget *vbox1;
GtkWidget *vbox2;
- GtkWidget *hbox1;
-
- GtkWidget *frame_sig;
- GtkWidget *vbox_sig;
- GtkWidget *checkbtn_autosig;
- GtkWidget *label_sigsep;
- GtkWidget *entry_sigsep;
GtkWidget *checkbtn_autoextedit;
gtk_container_add (GTK_CONTAINER (dialog.notebook), vbox1);
gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
- PACK_FRAME(vbox1, frame_sig, _("Signature"));
-
- vbox_sig = gtk_vbox_new (FALSE, VSPACING_NARROW);
- gtk_widget_show (vbox_sig);
- gtk_container_add (GTK_CONTAINER (frame_sig), vbox_sig);
- gtk_container_set_border_width (GTK_CONTAINER (vbox_sig), 8);
-
- PACK_CHECK_BUTTON (vbox_sig, checkbtn_autosig,
- _("Insert signature automatically"));
-
- hbox1 = gtk_hbox_new (FALSE, 8);
- gtk_widget_show (hbox1);
- gtk_box_pack_start (GTK_BOX (vbox_sig), hbox1, TRUE, TRUE, 0);
- label_sigsep = gtk_label_new (_("Signature separator"));
- gtk_widget_show (label_sigsep);
- gtk_box_pack_start (GTK_BOX (hbox1), label_sigsep, FALSE, FALSE, 0);
-
- entry_sigsep = gtk_entry_new ();
- gtk_widget_show (entry_sigsep);
- gtk_box_pack_start (GTK_BOX (hbox1), entry_sigsep, FALSE, FALSE, 0);
-
- gtk_widget_set_usize (entry_sigsep, 64, -1);
-
/* Account autoselection */
PACK_FRAME(vbox1, frame_autosel, _("Automatic account selection"));
compose.entry_quotemark = entry_quotemark;
compose.text_quotefmt = text_quotefmt;
*/
- compose.checkbtn_autosig = checkbtn_autosig;
- compose.entry_sigsep = entry_sigsep;
compose.checkbtn_autoextedit = checkbtn_autoextedit;
GtkWidget *vbox2;
GtkWidget *chkbtn_swapfrom;
GtkWidget *chkbtn_useaddrbook;
- GtkWidget *chkbtn_expand_thread;
+ GtkWidget *chkbtn_threadsubj;
GtkWidget *vbox3;
GtkWidget *label_datefmt;
GtkWidget *button_datefmt;
(vbox2, chkbtn_useaddrbook,
_("Display sender using address book"));
PACK_CHECK_BUTTON
- (vbox2, chkbtn_expand_thread, _("Expand threads"));
+ (vbox2, chkbtn_threadsubj,
+ _("Thread using subject in addition to standard headers"));
PACK_VSPACER(vbox2, vbox3, VSPACING_NARROW_2);
display.spinbtn_ng_abbrev_len_adj = spinbtn_ng_abbrev_len_adj;
display.chkbtn_swapfrom = chkbtn_swapfrom;
- display.chkbtn_expand_thread = chkbtn_expand_thread;
display.chkbtn_useaddrbook = chkbtn_useaddrbook;
+ display.chkbtn_threadsubj = chkbtn_threadsubj;
display.entry_datefmt = entry_datefmt;
}
GtkWidget *spinbtn_scrollstep;
GtkWidget *chkbtn_halfpage;
- GtkWidget *chkbtn_display_img;
- GtkWidget *chkbtn_resize_image;
+ GtkWidget *chkbtn_attach_desc;
vbox1 = gtk_vbox_new (FALSE, VSPACING);
gtk_widget_show (vbox1);
gtk_widget_show (vbox3);
gtk_box_pack_start (GTK_BOX (vbox1), vbox3, FALSE, FALSE, 0);
- PACK_CHECK_BUTTON(vbox3, chkbtn_display_img,
- _("Automatically display attached images"));
+ PACK_CHECK_BUTTON(vbox3, chkbtn_attach_desc,
+ _("Show attachment descriptions (rather than names)"));
- PACK_CHECK_BUTTON(vbox3, chkbtn_resize_image,
- _("Resize attached images"));
message.chkbtn_enablecol = chkbtn_enablecol;
message.button_edit_col = button_edit_col;
message.spinbtn_scrollstep_adj = spinbtn_scrollstep_adj;
message.chkbtn_halfpage = chkbtn_halfpage;
- message.chkbtn_display_img = chkbtn_display_img;
- message.chkbtn_resize_image = chkbtn_resize_image;
+ message.chkbtn_attach_desc = chkbtn_attach_desc;
}
#if USE_GPGME
GtkWidget *checkbtn_show_msg_with_cursor;
GtkWidget *checkbtn_openunread;
GtkWidget *checkbtn_mark_as_read_on_newwin;
+ GtkWidget *checkbtn_open_on_delete;
GtkWidget *checkbtn_openinbox;
GtkWidget *checkbtn_immedexec;
GtkWidget *frame_dialogs;
(vbox2, checkbtn_mark_as_read_on_newwin,
_("Only mark message as read when opened in new window"));
+ PACK_CHECK_BUTTON
+ (vbox2, checkbtn_open_on_delete,
+ _("Open next message on deletion"));
+
PACK_CHECK_BUTTON
(vbox2, checkbtn_openinbox,
_("Go to inbox after receiving new mail"));
interface.checkbtn_openunread = checkbtn_openunread;
interface.checkbtn_mark_as_read_on_newwin
= checkbtn_mark_as_read_on_newwin;
+ interface.checkbtn_open_on_delete
+ = checkbtn_open_on_delete;
interface.checkbtn_openinbox = checkbtn_openinbox;
interface.checkbtn_immedexec = checkbtn_immedexec;
interface.optmenu_recvdialog = optmenu_recvdialog;
"(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>/File/Save as...\" \"\")\n"
- "(menu-path \"<Main>/File/Print...\" \"\")\n"
- "(menu-path \"<Main>/File/Exit\" \"\")\n"
-
- "(menu-path \"<Main>/Edit/Copy\" \"\")\n"
- "(menu-path \"<Main>/Edit/Select all\" \"\")\n"
- "(menu-path \"<Main>/Edit/Find in current message...\" \"\")\n"
- "(menu-path \"<Main>/Edit/Search folder...\" \"\")\n"
-
- "(menu-path \"<Main>/View/Expand Summary View\" \"\")\n"
- "(menu-path \"<Main>/View/Expand Message View\" \"\")\n"
- "(menu-path \"<Main>/View/Thread view\" \"\")\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...\" \"\")\n"
- "(menu-path \"<Main>/View/Open in new window\" \"\")\n"
- "(menu-path \"<Main>/View/View source\" \"\")\n"
- "(menu-path \"<Main>/View/Show all headers\" \"\")\n"
- "(menu-path \"<Main>/View/Update\" \"\")\n"
-
- "(menu-path \"<Main>/Message/Get new mail\" \"\")\n"
- "(menu-path \"<Main>/Message/Get from all accounts\" \"\")\n"
- "(menu-path \"<Main>/Message/Compose an email message\" \"\")\n"
- "(menu-path \"<Main>/Message/Reply\" \"\")\n"
- "(menu-path \"<Main>/Message/Reply to/all\" \"\")\n"
- "(menu-path \"<Main>/Message/Reply to/sender\" \"\")\n"
- "(menu-path \"<Main>/Message/Reply to/mailing list\" \"\")\n"
- "(menu-path \"<Main>/Message/Forward\" \"\")\n"
- /* "(menu-path \"<Main>/Message/Forward as attachment\" \"\")\n" */
- "(menu-path \"<Main>/Message/Move...\" \"\")\n"
- "(menu-path \"<Main>/Message/Copy...\" \"\")\n"
- "(menu-path \"<Main>/Message/Delete\" \"\")\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>/Tools/Address book\" \"\")\n"
- "(menu-path \"<Main>/Tools/Execute\" \"\")\n"
- "(menu-path \"<Main>/Tools/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")))
else
return;
- gtk_item_factory_parse_rc_string(empty_menurc);
+ menu_factory_clear_rc(rc_str);
gtk_item_factory_parse_rc_string(rc_str);
gtk_widget_destroy(keybind.window);
}
}
+static void prefs_common_encoding_set_data_from_optmenu(PrefParam *pparam)
+{
+ GtkWidget *menu;
+ GtkWidget *menuitem;
+
+ menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(*pparam->widget));
+ menuitem = gtk_menu_get_active(GTK_MENU(menu));
+ *((TransferEncodingMethod *)pparam->data) = GPOINTER_TO_INT
+ (gtk_object_get_user_data(GTK_OBJECT(menuitem)));
+}
+
+static void prefs_common_encoding_set_optmenu(PrefParam *pparam)
+{
+ TransferEncodingMethod method =
+ *((TransferEncodingMethod *)pparam->data);
+ GtkOptionMenu *optmenu = GTK_OPTION_MENU(*pparam->widget);
+ gint index;
+
+ g_return_if_fail(optmenu != NULL);
+
+ index = menu_find_option_menu_index(optmenu, GINT_TO_POINTER(method),
+ NULL);
+ if (index >= 0)
+ gtk_option_menu_set_history(optmenu, index);
+ else {
+ gtk_option_menu_set_history(optmenu, 0);
+ prefs_common_encoding_set_data_from_optmenu(pparam);
+ }
+}
+
static void prefs_common_recv_dialog_set_data_from_optmenu(PrefParam *pparam)
{
GtkWidget *menu;
GtkOptionMenu *optmenu = GTK_OPTION_MENU(*pparam->widget);
GtkWidget *menu;
GtkWidget *menuitem;
+ gint index;
- switch (mode) {
- case RECV_DIALOG_ALWAYS:
+ index = menu_find_option_menu_index(optmenu, GINT_TO_POINTER(mode),
+ NULL);
+ if (index >= 0)
+ gtk_option_menu_set_history(optmenu, index);
+ else {
gtk_option_menu_set_history(optmenu, 0);
- break;
- case RECV_DIALOG_ACTIVE:
- gtk_option_menu_set_history(optmenu, 1);
- break;
- case RECV_DIALOG_NEVER:
- gtk_option_menu_set_history(optmenu, 2);
- break;
- default:
- break;
+ prefs_common_recv_dialog_set_data_from_optmenu(pparam);
}
menu = gtk_option_menu_get_menu(optmenu);
projects / claws.git / blobdiff