X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=blobdiff_plain;f=src%2Fprefs_common.c;h=c9c3d59ffb27ef429e51544a57e6245104d5b5ce;hp=411c9190f0586e71a4525df45b066e26f6a43ddd;hb=3d0233b94adb5c2c694f9e2e8160fc2073aaae69;hpb=8815e45818bd8266fa467794db0e71807fddb724 diff --git a/src/prefs_common.c b/src/prefs_common.c index 411c9190f..c9c3d59ff 100644 --- a/src/prefs_common.c +++ b/src/prefs_common.c @@ -49,6 +49,12 @@ #include "gtkutils.h" #include "alertpanel.h" #include "folder.h" +#include "filesel.h" +#include "folderview.h" + +#if USE_PSPELL +#include "gtkspell.h" +#endif PrefsCommon prefs_common; @@ -69,15 +75,17 @@ static struct Receive { GtkWidget *checkbtn_chkonstartup; GtkWidget *checkbtn_noerrorpanel; + GtkWidget *checkbtn_scan_after_inc; + GtkWidget *spinbtn_maxarticle; GtkObject *spinbtn_maxarticle_adj; } receive; static struct Send { - GtkWidget *checkbtn_sendext; - GtkWidget *entry_sendext; - GtkWidget *button_sendext; + GtkWidget *checkbtn_extsend; + GtkWidget *entry_extsend; + GtkWidget *button_extsend; GtkWidget *checkbtn_savemsg; GtkWidget *checkbtn_queuemsg; @@ -97,13 +105,28 @@ static struct Compose { GtkWidget *entry_fw_quotemark; GtkWidget *text_fw_quotefmt; + GtkWidget *checkbtn_autoextedit; + GtkWidget *checkbtn_reply_account_autosel; + GtkWidget *checkbtn_forward_account_autosel; + GtkWidget *checkbtn_reedit_account_autosel; + GtkWidget *spinbtn_linewrap; GtkObject *spinbtn_linewrap_adj; GtkWidget *checkbtn_wrapquote; GtkWidget *checkbtn_wrapatsend; GtkWidget * checkbtn_forward_as_attachment; - GtkWidget * checkbtn_reply_account_autoselect; + GtkWidget * checkbtn_smart_wrapping; + GtkWidget * checkbtn_block_cursor; + + /* spelling */ +#if USE_PSPELL + GtkWidget *checkbtn_enable_pspell; + GtkWidget *entry_pspell_path; + GtkWidget *btn_pspell_path; + GtkWidget *optmenu_dictionary; +#endif + } compose; static struct Display { @@ -121,6 +144,8 @@ static struct Display { GtkWidget *chkbtn_swapfrom; GtkWidget *chkbtn_hscrollbar; GtkWidget *chkbtn_useaddrbook; + GtkWidget *chkbtn_expand_thread; + GtkWidget *chkbtn_bold_unread; GtkWidget *entry_datefmt; } display; @@ -154,7 +179,7 @@ static struct Privacy { #endif static struct Interface { - GtkWidget *checkbtn_emacs; + /* GtkWidget *checkbtn_emacs; */ GtkWidget *checkbtn_openunread; GtkWidget *checkbtn_openinbox; GtkWidget *checkbtn_immedexec; @@ -163,7 +188,8 @@ static struct Interface { GtkWidget *checkbtn_askonclean; GtkWidget *checkbtn_warnqueued; GtkWidget *checkbtn_addaddrbyclick; - GtkWidget *recvdialog_optmenu; + GtkWidget *optmenu_recvdialog; + GtkWidget *optmenu_nextunreadmsgdialog; } interface; static struct Other { @@ -179,10 +205,12 @@ static struct MessageColorButtons { GtkWidget *quote_level2_btn; GtkWidget *quote_level3_btn; GtkWidget *uri_btn; + GtkWidget *tgt_folder_btn; } color_buttons; static GtkWidget *quote_desc_win; static GtkWidget *font_sel_win; +static guint font_sel_conn_id; static GtkWidget *quote_color_win; static GtkWidget *color_dialog; @@ -193,8 +221,16 @@ static void prefs_common_default_signkey_set_data_from_optmenu (PrefParam *pparam); static void prefs_common_default_signkey_set_optmenu (PrefParam *pparam); #endif -static void prefs_recvdialog_set_data_from_optmenu(PrefParam *pparam); -static void prefs_recvdialog_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_nextunreadmsgdialog_set_data_from_optmenu(PrefParam *pparam); +static void prefs_nextunreadmsgdialog_set_optmenu(PrefParam *pparam); + +#if USE_PSPELL +static void prefs_dictionary_set_data_from_optmenu(PrefParam *param); +static void prefs_dictionary_set_optmenu(PrefParam *pparam); +#endif + /* parameter name, default value, pointer to the prefs variable, data type, @@ -208,7 +244,7 @@ static PrefParam param[] = { {"use_ext_inc", "FALSE", &prefs_common.use_extinc, P_BOOL, &receive.checkbtn_incext, prefs_set_data_from_toggle, prefs_set_toggle}, - {"ext_inc_path", DEFAULT_INC_PATH, &prefs_common.extinc_path, P_STRING, + {"ext_inc_path", DEFAULT_INC_PATH, &prefs_common.extinc_cmd, P_STRING, &receive.entry_incext, prefs_set_data_from_entry, prefs_set_entry}, @@ -234,17 +270,20 @@ static PrefParam param[] = { {"noerrorpanel", "FALSE", &prefs_common.noerrorpanel, P_BOOL, &receive.checkbtn_noerrorpanel, prefs_set_data_from_toggle, prefs_set_toggle}, - + {"scan_all_after_inc", "FALSE", &prefs_common.scan_all_after_inc, + P_BOOL, &receive.checkbtn_scan_after_inc, + prefs_set_data_from_toggle, prefs_set_toggle}, {"max_news_articles", "300", &prefs_common.max_articles, P_INT, &receive.spinbtn_maxarticle, prefs_set_data_from_spinbtn, prefs_set_spinbtn}, /* Send */ - {"use_ext_send", "FALSE", &prefs_common.use_extsend, P_BOOL, - &send.checkbtn_sendext, + {"use_ext_sendmail", "FALSE", &prefs_common.use_extsend, P_BOOL, + &send.checkbtn_extsend, prefs_set_data_from_toggle, prefs_set_toggle}, - {"ext_send_path", NULL, &prefs_common.extsend_path, P_STRING, - &send.entry_sendext, prefs_set_data_from_entry, prefs_set_entry}, + {"ext_sendmail_cmd", DEFAULT_SENDMAIL_CMD, + &prefs_common.extsend_cmd, P_STRING, + &send.entry_extsend, prefs_set_data_from_entry, prefs_set_entry}, {"save_message", "TRUE", &prefs_common.savemsg, P_BOOL, &send.checkbtn_savemsg, prefs_set_data_from_toggle, prefs_set_toggle}, @@ -264,6 +303,7 @@ static PrefParam param[] = { {"quote_mark", "> ", &prefs_common.quotemark, P_STRING, &compose.entry_quotemark, prefs_set_data_from_entry, prefs_set_entry}, {"quote_format", "On %d\\n%f wrote:\\n\\n%Q", + &prefs_common.quotefmt, P_STRING, &compose.text_quotefmt, prefs_set_data_from_text, prefs_set_text}, {"fw_quote_mark", "> ", &prefs_common.fw_quotemark, P_STRING, @@ -278,6 +318,22 @@ static PrefParam param[] = { {"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}, + {"reply_account_autoselect", "TRUE", + &prefs_common.reply_account_autosel, P_BOOL, + &compose.checkbtn_reply_account_autosel, + prefs_set_data_from_toggle, prefs_set_toggle}, + {"forward_account_autoselect", "TRUE", + &prefs_common.forward_account_autosel, P_BOOL, + &compose.checkbtn_forward_account_autosel, + prefs_set_data_from_toggle, prefs_set_toggle}, + {"reedit_account_autoselect", "TRUE", + &prefs_common.reedit_account_autosel, P_BOOL, + &compose.checkbtn_reedit_account_autosel, + prefs_set_data_from_toggle, prefs_set_toggle}, + {"linewrap_length", "74", &prefs_common.linewrap_len, P_INT, &compose.spinbtn_linewrap, prefs_set_data_from_spinbtn, prefs_set_spinbtn}, @@ -291,10 +347,23 @@ static PrefParam param[] = { {"forward_as_attachment", "FALSE", &prefs_common.forward_as_attachment, P_BOOL, &compose.checkbtn_forward_as_attachment, prefs_set_data_from_toggle, prefs_set_toggle}, - {"reply_account_autoselect", "TRUE", &prefs_common.reply_account_autoselect, - P_BOOL, &compose.checkbtn_reply_account_autoselect, + {"smart_wrapping", "TRUE", &prefs_common.smart_wrapping, + P_BOOL, &compose.checkbtn_smart_wrapping, prefs_set_data_from_toggle, prefs_set_toggle}, - + {"block_cursor", "FALSE", &prefs_common.block_cursor, + P_BOOL, &compose.checkbtn_block_cursor, + prefs_set_data_from_toggle, prefs_set_toggle}, +#if USE_PSPELL + {"enable_pspell", "TRUE", &prefs_common.enable_pspell, + P_BOOL, &compose.checkbtn_enable_pspell, + prefs_set_data_from_toggle, prefs_set_toggle}, + {"pspell_path", "/usr/local/share/pspell/", &prefs_common.pspell_path, + P_STRING, &compose.entry_pspell_path, + prefs_set_data_from_entry, prefs_set_entry}, + {"dictionary", "", &prefs_common.dictionary, + P_STRING, &compose.optmenu_dictionary, + prefs_dictionary_set_data_from_optmenu, prefs_dictionary_set_optmenu }, +#endif {"show_ruler", "TRUE", &prefs_common.show_ruler, P_BOOL, NULL, NULL, NULL}, @@ -318,6 +387,7 @@ static PrefParam param[] = { &display.entry_normalfont, prefs_set_data_from_entry, prefs_set_entry}, + {"display_folder_unread_num", "TRUE", &prefs_common.display_folder_unread, P_BOOL, &display.chkbtn_folder_unread, @@ -340,11 +410,16 @@ static PrefParam param[] = { {"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}, + {"bold_unread", "TRUE", &prefs_common.bold_unread, P_BOOL, + &display.chkbtn_bold_unread, + prefs_set_data_from_toggle, prefs_set_toggle}, - /* {"enable_thread", "TRUE", &prefs_common.enable_thread, P_BOOL, NULL, NULL, NULL}, - */ + {"toolbar_style", "3", &prefs_common.toolbar_style, P_ENUM, NULL, NULL, NULL}, {"show_statusbar", "TRUE", &prefs_common.show_statusbar, P_BOOL, @@ -356,7 +431,7 @@ static PrefParam param[] = { NULL, NULL, NULL}, {"show_mime", "TRUE", &prefs_common.show_mime, P_BOOL, NULL, NULL, NULL}, - {"show_number", "TRUE", &prefs_common.show_number, P_BOOL, + {"show_number", "FALSE", &prefs_common.show_number, P_BOOL, NULL, NULL, NULL}, {"show_score", "TRUE", &prefs_common.show_score, P_BOOL, NULL, NULL, NULL}, @@ -442,6 +517,8 @@ static PrefParam param[] = { NULL, NULL, NULL}, {"uri_color", "32512", &prefs_common.uri_col, P_INT, NULL, NULL, NULL}, + {"target_folder_color", "14294218", &prefs_common.tgt_folder_col, P_INT, + NULL, NULL, NULL}, {"signature_color", "0", &prefs_common.sig_col, P_USHORT, NULL, NULL, NULL}, {"recycle_quote_colors", "FALSE", &prefs_common.recycle_quote_colors, @@ -519,9 +596,9 @@ static PrefParam param[] = { {"separate_message", "FALSE", &prefs_common.sep_msg, P_BOOL, NULL, NULL, NULL}, - {"emulate_emacs", "FALSE", &prefs_common.emulate_emacs, P_BOOL, - &interface.checkbtn_emacs, - prefs_set_data_from_toggle, prefs_set_toggle}, + /* {"emulate_emacs", "FALSE", &prefs_common.emulate_emacs, P_BOOL, + NULL, NULL, NULL}, */ + {"open_unread_on_enter", "FALSE", &prefs_common.open_unread_on_enter, P_BOOL, &interface.checkbtn_openunread, prefs_set_data_from_toggle, prefs_set_toggle}, @@ -531,14 +608,18 @@ static PrefParam param[] = { {"immediate_execution", "TRUE", &prefs_common.immediate_exec, P_BOOL, &interface.checkbtn_immedexec, prefs_set_data_from_toggle, prefs_set_toggle}, + {"receive_dialog_mode", "1", &prefs_common.recv_dialog_mode, P_ENUM, + &interface.optmenu_recvdialog, + prefs_common_recv_dialog_set_data_from_optmenu, + prefs_common_recv_dialog_set_optmenu}, + {"nextunreadmsg_dialog", NULL, &prefs_common.next_unread_msg_dialog, P_ENUM, + &interface.optmenu_nextunreadmsgdialog, + prefs_nextunreadmsgdialog_set_data_from_optmenu, + prefs_nextunreadmsgdialog_set_optmenu}, + {"add_address_by_click", "FALSE", &prefs_common.add_address_by_click, P_BOOL, &interface.checkbtn_addaddrbyclick, prefs_set_data_from_toggle, prefs_set_toggle}, - {"receive_dialog", NULL, &prefs_common.receive_dialog, P_ENUM, - &interface.recvdialog_optmenu, - prefs_recvdialog_set_data_from_optmenu, - prefs_recvdialog_set_optmenu}, - {"confirm_on_exit", "TRUE", &prefs_common.confirm_on_exit, P_BOOL, &interface.checkbtn_confonexit, prefs_set_data_from_toggle, prefs_set_toggle}, @@ -573,12 +654,6 @@ static PrefParam param[] = { {NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL} }; -#define VSPACING 12 -#define VSPACING_NARROW 4 -#define VBOX_BORDER 16 -#define DEFAULT_ENTRY_WIDTH 80 -#define PREFSBUFSIZE 1024 - /* widget creating functions */ static void prefs_common_create (void); static void prefs_receive_create (void); @@ -592,6 +667,26 @@ static void prefs_privacy_create (void); static void prefs_interface_create (void); static void prefs_other_create (void); +static void date_format_ok_btn_clicked (GtkButton *button, + GtkWidget **widget); +static void date_format_cancel_btn_clicked (GtkButton *button, + GtkWidget **widget); +static void date_format_key_pressed (GtkWidget *keywidget, + GdkEventKey *event, + GtkWidget **widget); +static gboolean date_format_on_delete (GtkWidget *dialogwidget, + GdkEventAny *event, + GtkWidget **widget); +static void date_format_entry_on_change (GtkEditable *editable, + GtkLabel *example); +static void date_format_select_row (GtkWidget *date_format_list, + gint row, + gint column, + GdkEventButton *event, + GtkWidget *date_format); +static GtkWidget *date_format_create (GtkButton *button, + void *data); + static void prefs_quote_description (void); static void prefs_quote_description_create (void); static void prefs_quote_colors_dialog (void); @@ -628,6 +723,7 @@ static void display_item_key_pressed (GtkWidget *widget, gboolean *cancelled); static void prefs_font_select (GtkButton *button, GtkEntry *entry); + static void prefs_font_selection_key_pressed (GtkWidget *widget, GdkEventKey *event, gpointer data); @@ -661,7 +757,7 @@ void prefs_common_open(void) if (prefs_rc_is_readonly(COMMON_RC)) return; - inc_autocheck_timer_remove(); + inc_lock(); if (!dialog.window) { prefs_common_create(); @@ -735,7 +831,7 @@ static void prefs_receive_create(void) GtkWidget *hbox; GtkWidget *label_incext; GtkWidget *entry_incext; - GtkWidget *button_incext; + /* GtkWidget *button_incext; */ GtkWidget *frame_spool; GtkWidget *checkbtn_local; @@ -751,6 +847,8 @@ static void prefs_receive_create(void) GtkWidget *label_autochk2; GtkWidget *checkbtn_chkonstartup; GtkWidget *checkbtn_noerrorpanel; + GtkWidget *checkbtn_scan_after_inc; + GtkWidget *frame_news; GtkWidget *label_maxarticle; @@ -785,11 +883,11 @@ static void prefs_receive_create(void) entry_incext = gtk_entry_new (); gtk_widget_show (entry_incext); gtk_box_pack_start (GTK_BOX (hbox), entry_incext, TRUE, TRUE, 0); - +#if 0 button_incext = gtk_button_new_with_label ("... "); gtk_widget_show (button_incext); gtk_box_pack_start (GTK_BOX (hbox), button_incext, FALSE, FALSE, 0); - +#endif PACK_FRAME(vbox1, frame_spool, _("Local spool")); vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW); @@ -819,7 +917,7 @@ static void prefs_receive_create(void) gtk_widget_show (entry_spool); gtk_box_pack_start (GTK_BOX (hbox), entry_spool, TRUE, TRUE, 0); - vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW); + vbox2 = gtk_vbox_new (FALSE, 0); gtk_widget_show (vbox2); gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0); @@ -831,7 +929,7 @@ static void prefs_receive_create(void) PACK_CHECK_BUTTON (hbox_autochk, checkbtn_autochk, _("Auto-check new mail")); - label_autochk1 = gtk_label_new (_("each")); + label_autochk1 = gtk_label_new (_("every")); gtk_widget_show (label_autochk1); gtk_box_pack_start (GTK_BOX (hbox_autochk), label_autochk1, FALSE, FALSE, 0); @@ -856,6 +954,9 @@ static void prefs_receive_create(void) PACK_CHECK_BUTTON (vbox2, checkbtn_noerrorpanel, _("No error popup on receive error")); + PACK_CHECK_BUTTON (vbox2, checkbtn_scan_after_inc, + _("Update all local folders after incorporation")); + PACK_FRAME(vbox1, frame_news, _("News")); @@ -884,7 +985,7 @@ static void prefs_receive_create(void) receive.checkbtn_incext = checkbtn_incext; receive.entry_incext = entry_incext; - receive.button_incext = button_incext; + /* receive.button_incext = button_incext; */ receive.checkbtn_local = checkbtn_local; receive.checkbtn_filter_on_inc = checkbtn_filter_on_inc; @@ -896,6 +997,8 @@ static void prefs_receive_create(void) receive.checkbtn_chkonstartup = checkbtn_chkonstartup; receive.checkbtn_noerrorpanel = checkbtn_noerrorpanel; + receive.checkbtn_scan_after_inc = checkbtn_scan_after_inc; + receive.spinbtn_maxarticle = spinbtn_maxarticle; receive.spinbtn_maxarticle_adj = spinbtn_maxarticle_adj; @@ -905,13 +1008,13 @@ static void prefs_send_create(void) { GtkWidget *vbox1; GtkWidget *vbox2; - GtkWidget *frame_sendext; - GtkWidget *vbox_sendext; - GtkWidget *checkbtn_sendext; + GtkWidget *frame_extsend; + GtkWidget *vbox_extsend; + GtkWidget *checkbtn_extsend; GtkWidget *hbox1; - GtkWidget *label_sendext; - GtkWidget *entry_sendext; - GtkWidget *button_sendext; + GtkWidget *label_extsend; + GtkWidget *entry_extsend; + /* GtkWidget *button_extsend; */ GtkWidget *checkbtn_savemsg; GtkWidget *checkbtn_queuemsg; GtkWidget *label_outcharset; @@ -925,36 +1028,36 @@ static void prefs_send_create(void) gtk_container_add (GTK_CONTAINER (dialog.notebook), vbox1); gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER); - PACK_FRAME(vbox1, frame_sendext, _("External program")); + PACK_FRAME(vbox1, frame_extsend, _("External program")); - gtk_widget_set_sensitive(frame_sendext, FALSE); + vbox_extsend = gtk_vbox_new (FALSE, VSPACING_NARROW); + gtk_widget_show (vbox_extsend); + gtk_container_add (GTK_CONTAINER (frame_extsend), vbox_extsend); + gtk_container_set_border_width (GTK_CONTAINER (vbox_extsend), 8); - vbox_sendext = gtk_vbox_new (FALSE, VSPACING_NARROW); - gtk_widget_show (vbox_sendext); - gtk_container_add (GTK_CONTAINER (frame_sendext), vbox_sendext); - gtk_container_set_border_width (GTK_CONTAINER (vbox_sendext), 8); - - PACK_CHECK_BUTTON (vbox_sendext, checkbtn_sendext, + PACK_CHECK_BUTTON (vbox_extsend, checkbtn_extsend, _("Use external program for sending")); hbox1 = gtk_hbox_new (FALSE, 8); gtk_widget_show (hbox1); - gtk_box_pack_start (GTK_BOX (vbox_sendext), hbox1, FALSE, FALSE, 0); - SET_TOGGLE_SENSITIVITY(checkbtn_sendext, hbox1); + gtk_box_pack_start (GTK_BOX (vbox_extsend), hbox1, FALSE, FALSE, 0); + SET_TOGGLE_SENSITIVITY(checkbtn_extsend, hbox1); - label_sendext = gtk_label_new (_("Program path")); - gtk_widget_show (label_sendext); - gtk_box_pack_start (GTK_BOX (hbox1), label_sendext, FALSE, FALSE, 0); + label_extsend = gtk_label_new (_("Program path")); + gtk_widget_show (label_extsend); + gtk_box_pack_start (GTK_BOX (hbox1), label_extsend, FALSE, FALSE, 0); - entry_sendext = gtk_entry_new (); - gtk_widget_show (entry_sendext); - gtk_box_pack_start (GTK_BOX (hbox1), entry_sendext, TRUE, TRUE, 0); + entry_extsend = gtk_entry_new (); + gtk_widget_show (entry_extsend); + gtk_box_pack_start (GTK_BOX (hbox1), entry_extsend, TRUE, TRUE, 0); - button_sendext = gtk_button_new_with_label ("... "); - gtk_widget_show (button_sendext); - gtk_box_pack_start (GTK_BOX (hbox1), button_sendext, FALSE, FALSE, 0); +#if 0 + button_extsend = gtk_button_new_with_label ("... "); + gtk_widget_show (button_extsend); + gtk_box_pack_start (GTK_BOX (hbox1), button_extsend, FALSE, FALSE, 0); +#endif - vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW); + vbox2 = gtk_vbox_new (FALSE, 0); gtk_widget_show (vbox2); gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0); @@ -984,29 +1087,30 @@ static void prefs_send_create(void) MENUITEM_ADD(optmenu_menu, menuitem, str, charset); \ } - SET_MENUITEM(_("Automatic"), CS_AUTO); + SET_MENUITEM(_("Automatic (Recommended)"), CS_AUTO); SET_MENUITEM(_("7bit ascii (US-ASCII)"), CS_US_ASCII); #if HAVE_LIBJCONV SET_MENUITEM(_("Unicode (UTF-8)"), CS_UTF_8); #endif SET_MENUITEM(_("Western European (ISO-8859-1)"), CS_ISO_8859_1); -#if HAVE_LIBJCONV SET_MENUITEM(_("Central European (ISO-8859-2)"), CS_ISO_8859_2); SET_MENUITEM(_("Baltic (ISO-8859-13)"), CS_ISO_8859_13); 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 SET_MENUITEM(_("Cyrillic (ISO-8859-5)"), CS_ISO_8859_5); +#endif SET_MENUITEM(_("Cyrillic (KOI8-R)"), CS_KOI8_R); +#if HAVE_LIBJCONV SET_MENUITEM(_("Cyrillic (Windows-1251)"), CS_CP1251); SET_MENUITEM(_("Cyrillic (KOI8-U)"), CS_KOI8_U); -#endif /* HAVE_LIBJCONV */ +#endif SET_MENUITEM(_("Japanese (ISO-2022-JP)"), CS_ISO_2022_JP); #if 0 SET_MENUITEM(_("Japanese (EUC-JP)"), CS_EUC_JP); SET_MENUITEM(_("Japanese (Shift_JIS)"), CS_SHIFT_JIS); #endif /* 0 */ -#if HAVE_LIBJCONV SET_MENUITEM(_("Simplified Chinese (GB2312)"), CS_GB2312); SET_MENUITEM(_("Traditional Chinese (Big5)"), CS_BIG5); #if 0 @@ -1014,13 +1118,12 @@ static void prefs_send_create(void) SET_MENUITEM(_("Chinese (ISO-2022-CN)"), CS_ISO_2022_CN); #endif /* 0 */ SET_MENUITEM(_("Korean (EUC-KR)"), CS_EUC_KR); -#endif /* HAVE_LIBJCONV */ gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu), optmenu_menu); - send.checkbtn_sendext = checkbtn_sendext; - send.entry_sendext = entry_sendext; - send.button_sendext = button_sendext; + send.checkbtn_extsend = checkbtn_extsend; + send.entry_extsend = entry_extsend; + /* send.button_extsend = button_extsend; */ send.checkbtn_savemsg = checkbtn_savemsg; send.checkbtn_queuemsg = checkbtn_queuemsg; @@ -1029,9 +1132,107 @@ static void prefs_send_create(void) send.optmenu_charset = optmenu; } +#if USE_PSPELL +static void prefs_dictionary_set_data_from_optmenu(PrefParam *param) +{ + gchar *str; + gchar *dict_name; + + g_return_if_fail(param); + g_return_if_fail(param->data); + g_return_if_fail(param->widget); + g_return_if_fail(*(param->widget)); + + dict_name = gtkpspell_get_dictionary_menu_active_item + (gtk_option_menu_get_menu(GTK_OPTION_MENU(*(param->widget)))); + str = *((gchar **) param->data); + if (str) + g_free(str); + *((gchar **) param->data) = dict_name; +} + +static void prefs_dictionary_set_optmenu(PrefParam *pparam) +{ + GList *cur; + GtkOptionMenu *optmenu = GTK_OPTION_MENU(*pparam->widget); + GtkWidget *menu; + GtkWidget *menuitem; + gchar *dict_name; + gint n = 0; + + g_return_if_fail(optmenu != NULL); + g_return_if_fail(pparam->data != NULL); + + if (*(gchar **) pparam->data) { + menu = gtk_option_menu_get_menu(optmenu); + for (cur = GTK_MENU_SHELL(menu)->children; + cur != NULL; cur = cur->next) { + menuitem = GTK_WIDGET(cur->data); + dict_name = gtk_object_get_data(GTK_OBJECT(menuitem), "dict_name"); + if (!strcmp2(dict_name, *((gchar **)pparam->data))) { + gtk_option_menu_set_history(optmenu, n); + return; + } + n++; + } + } + + gtk_option_menu_set_history(optmenu, 0); + prefs_dictionary_set_data_from_optmenu(pparam); +} + +static void prefs_compose_checkbtn_enable_pspell_toggle_cb + (GtkWidget *widget, + gpointer data) +{ + gboolean toggled; + + toggled = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + gtk_widget_set_sensitive(compose.entry_pspell_path, toggled); + gtk_widget_set_sensitive(compose.optmenu_dictionary, toggled); + gtk_widget_set_sensitive(compose.btn_pspell_path, toggled); +} + +static void prefs_compose_btn_pspell_path_clicked_cb(GtkWidget *widget, + gpointer data) +{ + gchar *file_path, *tmp; + GtkWidget *new_menu; + + file_path = filesel_select_file(_("Select dictionaries location"), + prefs_common.pspell_path); + if (file_path == NULL) { + /* don't change */ + } + else { + tmp=g_dirname(file_path); + + if (prefs_common.pspell_path) + g_free(prefs_common.pspell_path); + prefs_common.pspell_path = g_strdup_printf("%s%s",tmp,G_DIR_SEPARATOR_S); + + new_menu = gtkpspell_dictionary_option_menu_new(prefs_common.pspell_path); + gtk_option_menu_set_menu(GTK_OPTION_MENU(compose.optmenu_dictionary), + new_menu); + + gtk_entry_set_text(GTK_ENTRY(compose.entry_pspell_path), prefs_common.pspell_path); + /* select first one */ + gtk_option_menu_set_history(GTK_OPTION_MENU(compose.optmenu_dictionary), 0); + + prefs_common.dictionary = gtkpspell_get_dictionary_menu_active_item( + gtk_option_menu_get_menu(GTK_OPTION_MENU(compose.optmenu_dictionary))); + g_free(tmp); + + + } +} +#endif + static void prefs_compose_create(void) { GtkWidget *vbox1; + GtkWidget *vbox2; + GtkWidget *vbox3; /* GtkWidget *frame_quote; @@ -1057,9 +1258,20 @@ static void prefs_compose_create(void) GtkWidget *label_sigsep; GtkWidget *entry_sigsep; - GtkWidget *vbox_linewrap; - GtkWidget *hbox3; + GtkWidget *frame_autosel; + GtkWidget *hbox_autosel; + GtkWidget *vbox_autosel; + GtkWidget *checkbtn_reply_account_autosel; + GtkWidget *checkbtn_forward_account_autosel; + GtkWidget *checkbtn_reedit_account_autosel; + + GtkWidget *checkbtn_autoextedit; + + GtkWidget *vbox_linewrap; + + GtkWidget *hbox3; GtkWidget *hbox4; + GtkWidget *hbox5; GtkWidget *label_linewrap; GtkObject *spinbtn_linewrap_adj; GtkWidget *spinbtn_linewrap; @@ -1067,8 +1279,22 @@ static void prefs_compose_create(void) GtkWidget *checkbtn_wrapatsend; GtkWidget *checkbtn_forward_as_attachment; - GtkWidget *checkbtn_reply_account_autoselect; - + GtkWidget *checkbtn_smart_wrapping; + GtkWidget *checkbtn_block_cursor; + +#if USE_PSPELL + GtkWidget *frame_spell; + GtkWidget *hbox_spell; + GtkWidget *vbox_spell; + GtkWidget *hbox_pspell_path; + GtkWidget *checkbtn_enable_pspell; + GtkWidget *label_pspell_path; + GtkWidget *entry_pspell_path; + GtkWidget *btn_pspell_path; + GtkWidget *hbox_dictionary; + GtkWidget *label_dictionary; + GtkWidget *optmenu_dictionary; +#endif vbox1 = gtk_vbox_new (FALSE, VSPACING); gtk_widget_show (vbox1); gtk_container_add (GTK_CONTAINER (dialog.notebook), vbox1); @@ -1082,22 +1308,26 @@ static void prefs_compose_create(void) gtk_container_add (GTK_CONTAINER (frame_quote), vbox_quote); gtk_container_set_border_width (GTK_CONTAINER (vbox_quote), 8); - PACK_CHECK_BUTTON (vbox_quote, checkbtn_quote, - _("Quote message when replying")); - - hbox1 = gtk_hbox_new (FALSE, 8); + hbox1 = gtk_hbox_new (FALSE, 32); gtk_widget_show (hbox1); - gtk_box_pack_start (GTK_BOX (vbox_quote), hbox1, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (vbox_quote), hbox1, FALSE, FALSE, 0); + + hbox2 = gtk_hbox_new (FALSE, 8); + gtk_widget_show (hbox2); + gtk_box_pack_start (GTK_BOX (hbox1), hbox2, FALSE, FALSE, 0); label_quotemark = gtk_label_new (_("Quotation mark")); gtk_widget_show (label_quotemark); - gtk_box_pack_start (GTK_BOX (hbox1), label_quotemark, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (hbox2), label_quotemark, FALSE, FALSE, 0); entry_quotemark = gtk_entry_new (); gtk_widget_show (entry_quotemark); - gtk_box_pack_start (GTK_BOX (hbox1), entry_quotemark, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (hbox2), entry_quotemark, FALSE, FALSE, 0); gtk_widget_set_usize (entry_quotemark, 64, -1); + PACK_CHECK_BUTTON (hbox1, checkbtn_quote, + _("Quote message when replying")); + hbox2 = gtk_hbox_new (FALSE, 0); gtk_widget_show (hbox2); gtk_box_pack_start (GTK_BOX (vbox_quote), hbox2, TRUE, TRUE, 0); @@ -1107,11 +1337,13 @@ static void prefs_compose_create(void) gtk_box_pack_start (GTK_BOX (hbox2), label_quotefmt, FALSE, FALSE, 0); btn_quotedesc = - gtk_button_new_with_label (_(" Quote format ")); + gtk_button_new_with_label (_(" Description of symbols ")); + gtk_widget_show (btn_quotedesc); gtk_box_pack_end (GTK_BOX (hbox2), btn_quotedesc, FALSE, FALSE, 0); gtk_signal_connect(GTK_OBJECT(btn_quotedesc), "clicked", - GTK_SIGNAL_FUNC(compose_prefs_fmt_open), &cancelled); + GTK_SIGNAL_FUNC(prefs_quote_description), NULL); + scrolledwin_quotefmt = gtk_scrolled_window_new (NULL, NULL); gtk_widget_show (scrolledwin_quotefmt); @@ -1150,7 +1382,6 @@ static void prefs_compose_create(void) 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); @@ -1158,9 +1389,34 @@ static void prefs_compose_create(void) 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); - /* line-wrapping */ + /* Automatic (Smart) Account Selection */ + PACK_FRAME(vbox1, frame_autosel, _("Automatic Account Selection")); + + hbox_autosel = gtk_hbox_new (FALSE, VSPACING_NARROW); + gtk_widget_show (hbox_autosel); + gtk_container_add (GTK_CONTAINER (frame_autosel), hbox_autosel); + gtk_container_set_border_width (GTK_CONTAINER (hbox_autosel), 8); + + PACK_CHECK_BUTTON (hbox_autosel, checkbtn_reply_account_autosel, + _("when replying")); + PACK_CHECK_BUTTON (hbox_autosel, checkbtn_forward_account_autosel, + _("when forwarding")); + PACK_CHECK_BUTTON (hbox_autosel, checkbtn_reedit_account_autosel, + _("when re-editing")); + + vbox2 = gtk_vbox_new (FALSE, 0); + gtk_widget_show (vbox2); + gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0); + + PACK_CHECK_BUTTON (vbox2, checkbtn_autoextedit, + _("Automatically launch the external editor")); + + PACK_VSPACER (vbox2, vbox3, VSPACING_NARROW_2); + + /* line-wrapping */ vbox_linewrap = gtk_vbox_new (FALSE, VSPACING_NARROW); gtk_widget_show (vbox_linewrap); gtk_box_pack_start (GTK_BOX (vbox1), vbox_linewrap, FALSE, FALSE, 0); @@ -1169,6 +1425,7 @@ static void prefs_compose_create(void) gtk_widget_show (hbox3); gtk_box_pack_start (GTK_BOX (vbox_linewrap), hbox3, FALSE, FALSE, 0); + label_linewrap = gtk_label_new (_("Wrap messages at")); gtk_widget_show (label_linewrap); gtk_box_pack_start (GTK_BOX (hbox3), label_linewrap, FALSE, FALSE, 0); @@ -1185,6 +1442,8 @@ static void prefs_compose_create(void) gtk_widget_show (label_linewrap); gtk_box_pack_start (GTK_BOX (hbox3), label_linewrap, FALSE, FALSE, 0); + PACK_VSPACER (vbox2, vbox3, VSPACING_NARROW_2); + hbox4 = gtk_hbox_new (FALSE, 32); gtk_widget_show (hbox4); gtk_box_pack_start (GTK_BOX (vbox_linewrap), hbox4, FALSE, FALSE, 0); @@ -1196,10 +1455,67 @@ static void prefs_compose_create(void) PACK_CHECK_BUTTON (vbox1, checkbtn_forward_as_attachment, _("Forward as attachment")); - PACK_CHECK_BUTTON (vbox1, checkbtn_reply_account_autoselect, - _("Automatically select account for mail replies")); + PACK_CHECK_BUTTON (vbox1, checkbtn_smart_wrapping, + _("Smart wrapping (EXPERIMENTAL)")); + + PACK_CHECK_BUTTON (vbox1, checkbtn_block_cursor, + _("Block cursor")); + +#if USE_PSPELL + /* spell checker defaults */ + PACK_FRAME(vbox1, frame_spell, _("Global spelling checker settings")); + vbox_spell = gtk_vbox_new(FALSE, VSPACING_NARROW); + gtk_widget_show (vbox_spell); + gtk_container_add(GTK_CONTAINER(frame_spell), vbox_spell); + gtk_container_set_border_width(GTK_CONTAINER(vbox_spell), 8); + + PACK_CHECK_BUTTON(vbox_spell, checkbtn_enable_pspell, + _("Enable spell checker (EXPERIMENTAL)")); + + gtk_signal_connect(GTK_OBJECT(checkbtn_enable_pspell), "toggled", + GTK_SIGNAL_FUNC(prefs_compose_checkbtn_enable_pspell_toggle_cb), + NULL); - /* + hbox_pspell_path = gtk_hbox_new (FALSE, 8); + gtk_widget_show(hbox_pspell_path); + gtk_box_pack_start(GTK_BOX(vbox_spell), hbox_pspell_path, TRUE, TRUE, 0); + + label_pspell_path = gtk_label_new (_("Dictionaries path")); + gtk_widget_show(label_pspell_path); + gtk_box_pack_start(GTK_BOX(hbox_pspell_path), label_pspell_path, FALSE, FALSE, 0); + + entry_pspell_path = gtk_entry_new(); + gtk_widget_show(entry_pspell_path); + gtk_box_pack_start(GTK_BOX(hbox_pspell_path), entry_pspell_path, FALSE, FALSE, 0); + gtk_widget_set_usize(entry_pspell_path, 150, -1); + gtk_widget_set_sensitive(entry_pspell_path, prefs_common.enable_pspell); + + btn_pspell_path = gtk_button_new_with_label(_("...")); + gtk_widget_show(btn_pspell_path); + gtk_box_pack_start(GTK_BOX(hbox_pspell_path), btn_pspell_path, FALSE, FALSE, 0); + gtk_widget_set_sensitive(btn_pspell_path, prefs_common.enable_pspell); + + gtk_signal_connect(GTK_OBJECT(btn_pspell_path), "clicked", + GTK_SIGNAL_FUNC(prefs_compose_btn_pspell_path_clicked_cb), + NULL); + + hbox_dictionary = gtk_hbox_new(FALSE, 8); + gtk_widget_show(hbox_dictionary); + gtk_box_pack_start(GTK_BOX(vbox_spell), hbox_dictionary, TRUE, TRUE, 0); + + label_dictionary = gtk_label_new(_("Dictionary")); + gtk_widget_show(label_dictionary); + gtk_box_pack_start(GTK_BOX(hbox_dictionary), label_dictionary, FALSE, FALSE, 0); + + optmenu_dictionary = gtk_option_menu_new(); + gtk_widget_show(optmenu_dictionary); + gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu_dictionary), + gtkpspell_dictionary_option_menu_new(prefs_common.pspell_path)); + gtk_box_pack_start(GTK_BOX(hbox_dictionary), optmenu_dictionary, FALSE, FALSE, 0); + gtk_widget_set_sensitive(optmenu_dictionary, prefs_common.enable_pspell); +#endif + + /* compose.checkbtn_quote = checkbtn_quote; compose.entry_quotemark = entry_quotemark; compose.text_quotefmt = text_quotefmt; @@ -1207,6 +1523,11 @@ static void prefs_compose_create(void) compose.checkbtn_autosig = checkbtn_autosig; compose.entry_sigsep = entry_sigsep; + compose.checkbtn_autoextedit = checkbtn_autoextedit; + compose.checkbtn_reply_account_autosel = checkbtn_reply_account_autosel; + compose.checkbtn_forward_account_autosel = checkbtn_forward_account_autosel; + compose.checkbtn_reedit_account_autosel = checkbtn_reedit_account_autosel; + compose.spinbtn_linewrap = spinbtn_linewrap; compose.spinbtn_linewrap_adj = spinbtn_linewrap_adj; compose.checkbtn_wrapquote = checkbtn_wrapquote; @@ -1214,369 +1535,118 @@ static void prefs_compose_create(void) compose.checkbtn_forward_as_attachment = checkbtn_forward_as_attachment; - compose.checkbtn_reply_account_autoselect = - checkbtn_reply_account_autoselect; + compose.checkbtn_smart_wrapping = + checkbtn_smart_wrapping; + compose.checkbtn_block_cursor = + checkbtn_block_cursor; + +#if USE_PSPELL + compose.checkbtn_enable_pspell = checkbtn_enable_pspell; + compose.entry_pspell_path = entry_pspell_path; + compose.btn_pspell_path = btn_pspell_path; + compose.optmenu_dictionary = optmenu_dictionary; +#endif } -static void date_format_ok_btn_clicked(GtkButton *button, GtkWidget **widget) +static void prefs_display_create(void) { - gchar *text; - GtkWidget *datefmt_sample = NULL; - - g_return_if_fail(widget != NULL); - g_return_if_fail(*widget != NULL); - g_return_if_fail(display.entry_datefmt != NULL); + GtkWidget *vbox1; + GtkWidget *frame_font; + GtkWidget *table1; + GtkWidget *label_textfont; + GtkWidget *entry_textfont; + GtkWidget *button_textfont; + GtkWidget *chkbtn_folder_unread; + GtkWidget *chkbtn_transhdr; + GtkWidget *frame_summary; + GtkWidget *vbox2; + GtkWidget *chkbtn_swapfrom; + GtkWidget *chkbtn_hscrollbar; + GtkWidget *chkbtn_useaddrbook; + GtkWidget *chkbtn_expand_thread; + GtkWidget *chkbtn_bold_unread; + GtkWidget *vbox3; + GtkWidget *hbox1; + GtkWidget *label_datefmt; + GtkWidget *button_datefmt; + GtkWidget *entry_datefmt; + GtkWidget *button_dispitem; + GtkWidget *tmplabel, *tmpbutton, *tmpentry; - datefmt_sample = (GtkWidget *)gtk_object_get_data(GTK_OBJECT(*widget), "datefmt_sample"); - g_return_if_fail(datefmt_sample != NULL); + vbox1 = gtk_vbox_new (FALSE, VSPACING); + gtk_widget_show (vbox1); + gtk_container_add (GTK_CONTAINER (dialog.notebook), vbox1); + gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER); - text = gtk_editable_get_chars(GTK_EDITABLE(datefmt_sample), 0, -1); - g_free(prefs_common.date_format); - prefs_common.date_format = text; - gtk_entry_set_text(GTK_ENTRY(display.entry_datefmt), text); + PACK_FRAME(vbox1, frame_font, _("Font")); - gtk_widget_destroy(*widget); - *widget = NULL; -} + table1 = gtk_table_new (4, 3, FALSE); -static void date_format_cancel_btn_clicked(GtkButton *button, - GtkWidget **widget) -{ - g_return_if_fail(widget != NULL); - g_return_if_fail(*widget != NULL); + gtk_widget_show (table1); + gtk_container_add (GTK_CONTAINER (frame_font), table1); + gtk_container_set_border_width (GTK_CONTAINER (table1), 8); + gtk_table_set_row_spacings (GTK_TABLE (table1), 8); + gtk_table_set_col_spacings (GTK_TABLE (table1), 8); - gtk_widget_destroy(*widget); - *widget = NULL; -} + label_textfont = gtk_label_new (_("Text")); + gtk_misc_set_alignment(GTK_MISC(label_textfont), 0, 0.5); + gtk_widget_show (label_textfont); + gtk_table_attach (GTK_TABLE (table1), label_textfont, 0, 1, 0, 1, + GTK_FILL, (GTK_EXPAND | GTK_FILL), 0, 0); -static gboolean date_format_on_delete(GtkWidget *dialogwidget, gpointer d1, GtkWidget **widget) -{ - g_return_val_if_fail(widget != NULL, FALSE); - g_return_val_if_fail(*widget != NULL, FALSE); - *widget = NULL; - return FALSE; -} + entry_textfont = gtk_entry_new (); + gtk_widget_show (entry_textfont); + gtk_table_attach (GTK_TABLE (table1), entry_textfont, 1, 2, 0, 1, + (GTK_EXPAND | GTK_FILL), 0, 0, 0); -static void date_format_entry_on_change(GtkEditable *editable, GtkLabel *example) -{ - time_t cur_time; - struct tm *cal_time; - char buffer[100]; - char *text; - cur_time = time(NULL); - cal_time = localtime(&cur_time); - buffer[0] = 0; - text = gtk_editable_get_chars(editable, 0, -1); - if (text) { - strftime(buffer, sizeof buffer, text, cal_time); - } - gtk_label_set_text(example, buffer); -} + button_textfont = gtk_button_new_with_label ("... "); -static void date_format_select_row(GtkWidget *date_format_list, gint row, - gint column, GdkEventButton *event, - GtkWidget *date_format) -{ - gint curs_pos; - gchar *format; - gchar *old_format; - gchar *new_format; - GtkWidget *datefmt_sample = (GtkWidget *) gtk_object_get_data(GTK_OBJECT(date_format), "datefmt_sample"); + gtk_widget_show (button_textfont); + gtk_table_attach (GTK_TABLE (table1), button_textfont, 2, 3, 0, 1, + 0, 0, 0, 0); + gtk_signal_connect (GTK_OBJECT (button_textfont), "clicked", + GTK_SIGNAL_FUNC (prefs_font_select), entry_textfont); - g_return_if_fail(date_format_list != NULL); - g_return_if_fail(date_format != NULL); - g_return_if_fail(datefmt_sample != NULL); + tmplabel = gtk_label_new (_("Small")); + gtk_misc_set_alignment(GTK_MISC(tmplabel), 0, 0.5); + gtk_widget_show (tmplabel); + gtk_table_attach (GTK_TABLE (table1), tmplabel, 0, 1, 1, 2, + GTK_FILL, (GTK_EXPAND | GTK_FILL), 0, 0); - /* only on double click */ - if (event->type != GDK_2BUTTON_PRESS) - return; + tmpentry = gtk_entry_new (); + gtk_widget_show (tmpentry); + gtk_table_attach (GTK_TABLE (table1), tmpentry, 1, 2, 1, 2, + (GTK_EXPAND | GTK_FILL), 0, 0, 0); - /* get format from clist */ - gtk_clist_get_text(GTK_CLIST(date_format_list), row, 0, &format); + tmpbutton = gtk_button_new_with_label (" ... "); + gtk_widget_show (tmpbutton); + gtk_table_attach (GTK_TABLE (table1), tmpbutton, 2, 3, 1, 2, + 0, 0, 0, 0); + gtk_signal_connect (GTK_OBJECT(tmpbutton), "clicked", + GTK_SIGNAL_FUNC(prefs_font_select), tmpentry); + display.entry_smallfont = tmpentry; - curs_pos = gtk_editable_get_position(GTK_EDITABLE(datefmt_sample)); - old_format = gtk_entry_get_text(GTK_ENTRY(datefmt_sample)); + tmplabel = gtk_label_new (_("Normal")); + gtk_misc_set_alignment(GTK_MISC(tmplabel), 0, 0.5); + gtk_widget_show (tmplabel); + gtk_table_attach (GTK_TABLE (table1), tmplabel, 0, 1, 2, 3, + GTK_FILL, (GTK_EXPAND | GTK_FILL), 0, 0); - /* insert the format into the text entry */ - new_format = g_malloc(strlen(old_format) + 3); + tmpentry = gtk_entry_new (); + gtk_widget_show (tmpentry); + gtk_table_attach (GTK_TABLE (table1), tmpentry, 1, 2, 2, 3, + (GTK_EXPAND | GTK_FILL), 0, 0, 0); - strncpy(new_format, old_format, curs_pos); - new_format[curs_pos] = '\0'; - strcat(new_format, format); - strcat(new_format, &old_format[curs_pos]); - - gtk_entry_set_text(GTK_ENTRY(datefmt_sample), new_format); - gtk_editable_set_position(GTK_EDITABLE(datefmt_sample), curs_pos + 2); - - g_free(new_format); -} - -static GtkWidget *create_date_format(GtkButton *button, void *data) -{ - static GtkWidget *date_format = NULL; - GtkWidget *vbox1; - GtkWidget *scrolledwindow1; - GtkWidget *date_format_list; - GtkWidget *label3; - GtkWidget *label4; - GtkWidget *table2; - GtkWidget *vbox2; - GtkWidget *vbox3; - GtkWidget *hbox2; - GtkWidget *label5; - GtkWidget *hbox1; - GtkWidget *label6; - GtkWidget *label7; - GtkWidget *confirm_area; - GtkWidget *ok_btn; - GtkWidget *cancel_btn; - GtkWidget *datefmt_sample = NULL; - - const struct { - gchar *fmt; - gchar *txt; - } time_format[] = { - { "%a", _("the full abbreviated weekday name") }, - { "%A", _("the full weekday name") }, - { "%b", _("the abbreviated month name") }, - { "%B", _("the full month name") }, - { "%c", _("the preferred date and time for the current locale") }, - { "%C", _("the century number (year/100)") }, - { "%d", _("the day of the month as a decimal number") }, - { "%H", _("the hour as a decimal number using a 24-hour clock") }, - { "%I", _("the hour as a decimal number using a 12-hour clock") }, - { "%j", _("the day of the year as a decimal number") }, - { "%m", _("the month as a decimal number") }, - { "%M", _("the minute as a decimal number") }, - { "%p", _("either AM or PM") }, - { "%S", _("the second as a decimal number") }, - { "%w", _("the day of the week as a decimal number") }, - { "%x", _("the preferred date for the current locale") }, - { "%y", _("the last two digits of a year") }, - { "%Y", _("the year as a decimal number") }, - { "%Z", _("the time zone or name or abbreviation") } - }; - int tmp; - const int TIME_FORMAT_ELEMS = sizeof time_format / sizeof time_format[0]; - - if (date_format) return date_format; - - date_format = gtk_window_new(GTK_WINDOW_DIALOG); - gtk_window_set_title(GTK_WINDOW(date_format), _("Date format")); - gtk_window_set_position(GTK_WINDOW(date_format), GTK_WIN_POS_CENTER); - gtk_window_set_default_size(GTK_WINDOW(date_format), 440, 280); - - vbox1 = gtk_vbox_new(FALSE, 10); - gtk_widget_show(vbox1); - gtk_container_add(GTK_CONTAINER(date_format), vbox1); - - scrolledwindow1 = gtk_scrolled_window_new(NULL, NULL); - gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwindow1), - GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_widget_show(scrolledwindow1); - gtk_box_pack_start(GTK_BOX(vbox1), scrolledwindow1, TRUE, TRUE, 0); - - date_format_list = gtk_clist_new(2); - gtk_widget_show(date_format_list); - gtk_container_add(GTK_CONTAINER(scrolledwindow1), date_format_list); - gtk_clist_set_column_width(GTK_CLIST(date_format_list), 0, 80); - gtk_clist_set_column_width(GTK_CLIST(date_format_list), 1, 80); - gtk_clist_column_titles_show(GTK_CLIST(date_format_list)); - - label3 = gtk_label_new(_("Date Format")); - gtk_widget_show(label3); - gtk_clist_set_column_widget(GTK_CLIST(date_format_list), 0, label3); - - label4 = gtk_label_new(_("Date Format Description")); - gtk_widget_show(label4); - gtk_clist_set_column_widget(GTK_CLIST(date_format_list), 1, label4); - - for (tmp = 0; tmp < TIME_FORMAT_ELEMS; tmp++) { - gchar *text[3]; - /* phoney casting necessary because of gtk... */ - text[0] = (gchar *) time_format[tmp].fmt; - text[1] = (gchar *) time_format[tmp].txt; - text[2] = NULL; - gtk_clist_append(GTK_CLIST(date_format_list), text); - } - - table2 = gtk_table_new(1, 1, TRUE); - gtk_widget_show(table2); - gtk_box_pack_start(GTK_BOX(vbox1), table2, FALSE, TRUE, 0); - - vbox2 = gtk_vbox_new(FALSE, 0); - gtk_widget_show(vbox2); - gtk_table_attach(GTK_TABLE(table2), vbox2, 0, 1, 0, 1, - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0); - - vbox3 = gtk_vbox_new(TRUE, 4); - gtk_widget_show(vbox3); - gtk_box_pack_end(GTK_BOX(vbox2), vbox3, FALSE, FALSE, 10); - - hbox2 = gtk_hbox_new(FALSE, 0); - gtk_widget_show(hbox2); - gtk_box_pack_start(GTK_BOX(vbox3), hbox2, TRUE, TRUE, 0); - - label5 = gtk_label_new(_("Date format")); - gtk_widget_show(label5); - gtk_box_pack_start(GTK_BOX(hbox2), label5, FALSE, FALSE, 0); - gtk_misc_set_padding(GTK_MISC(label5), 8, 0); - - datefmt_sample = gtk_entry_new_with_max_length(300); - gtk_widget_show(datefmt_sample); - gtk_box_pack_start(GTK_BOX(hbox2), datefmt_sample, TRUE, TRUE, 40); - - /* we need the "sample" entry box; add it as data so callbacks can - * get the entry box */ - gtk_object_set_data(GTK_OBJECT(date_format), "datefmt_sample", datefmt_sample); - - hbox1 = gtk_hbox_new(FALSE, 0); - gtk_widget_show(hbox1); - gtk_box_pack_start(GTK_BOX(vbox3), hbox1, TRUE, TRUE, 0); - - label6 = gtk_label_new(_("Example")); - gtk_widget_show(label6); - gtk_box_pack_start(GTK_BOX(hbox1), label6, FALSE, TRUE, 0); - gtk_misc_set_padding(GTK_MISC(label6), 8, 0); - - label7 = gtk_label_new(""); - gtk_widget_show(label7); - gtk_box_pack_start(GTK_BOX(hbox1), label7, TRUE, TRUE, 60); - gtk_label_set_justify(GTK_LABEL(label7), GTK_JUSTIFY_LEFT); - - gtkut_button_set_create(&confirm_area, &ok_btn, _("OK"), - &cancel_btn, _("Cancel"), NULL, NULL); - gtk_widget_grab_default(ok_btn); - - gtk_widget_show(confirm_area); - - gtk_box_pack_start(GTK_BOX(vbox1), confirm_area, FALSE, FALSE, 0); - - /* set the current format */ - gtk_entry_set_text(GTK_ENTRY(datefmt_sample), prefs_common.date_format); - date_format_entry_on_change(GTK_EDITABLE(datefmt_sample), - GTK_LABEL(label7)); - - gtk_signal_connect(GTK_OBJECT(ok_btn), "clicked", - GTK_SIGNAL_FUNC(date_format_ok_btn_clicked), - &date_format); - - gtk_signal_connect(GTK_OBJECT(cancel_btn), "clicked", - GTK_SIGNAL_FUNC(date_format_cancel_btn_clicked), - &date_format); - - gtk_signal_connect(GTK_OBJECT(date_format), "delete_event", - GTK_SIGNAL_FUNC(date_format_on_delete), - &date_format); - - gtk_signal_connect(GTK_OBJECT(datefmt_sample), "changed", - GTK_SIGNAL_FUNC(date_format_entry_on_change), - label7); - - gtk_window_set_position(GTK_WINDOW(date_format), GTK_WIN_POS_CENTER); - gtk_window_set_modal(GTK_WINDOW(date_format), TRUE); - - gtk_widget_show(date_format); - - gtk_signal_connect(GTK_OBJECT(date_format_list), "select_row", - GTK_SIGNAL_FUNC(date_format_select_row), - date_format); - - return date_format; -} - -static void prefs_display_create(void) -{ - GtkWidget *vbox1; - GtkWidget *frame_font; - GtkWidget *table1; - GtkWidget *label_textfont; - GtkWidget *entry_textfont; - GtkWidget *button_textfont; - GtkWidget *chkbtn_folder_unread; - GtkWidget *chkbtn_transhdr; - GtkWidget *frame_summary; - GtkWidget *vbox2; - GtkWidget *chkbtn_swapfrom; - GtkWidget *chkbtn_hscrollbar; - GtkWidget *chkbtn_useaddrbook; - GtkWidget *hbox1; - GtkWidget *label_datefmt; - GtkWidget *label_datefmt_btn; - GtkWidget *tmplabel, *tmpentry, *tmpbutton; - GtkWidget *entry_datefmt; - GtkTooltips *tooltips_datefmt; - GtkWidget *button_dispitem; - - vbox1 = gtk_vbox_new (FALSE, VSPACING); - gtk_widget_show (vbox1); - gtk_container_add (GTK_CONTAINER (dialog.notebook), vbox1); - gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER); - - PACK_FRAME(vbox1, frame_font, _("Font")); - - table1 = gtk_table_new (1, 3, FALSE); - gtk_widget_show (table1); - gtk_container_add (GTK_CONTAINER (frame_font), table1); - gtk_container_set_border_width (GTK_CONTAINER (table1), 8); - gtk_table_set_row_spacings (GTK_TABLE (table1), 8); - gtk_table_set_col_spacings (GTK_TABLE (table1), 8); - - label_textfont = gtk_label_new (_("Text")); - gtk_widget_show (label_textfont); - gtk_table_attach (GTK_TABLE (table1), label_textfont, 0, 1, 0, 1, - GTK_FILL, (GTK_EXPAND | GTK_FILL), 0, 0); - - entry_textfont = gtk_entry_new (); - gtk_widget_show (entry_textfont); - gtk_table_attach (GTK_TABLE (table1), entry_textfont, 1, 2, 0, 1, - (GTK_EXPAND | GTK_FILL), 0, 0, 0); - - button_textfont = gtk_button_new_with_label ("... "); - gtk_widget_show (button_textfont); - gtk_table_attach (GTK_TABLE (table1), button_textfont, 2, 3, 0, 1, - 0, 0, 0, 0); - gtk_signal_connect (GTK_OBJECT (button_textfont), "clicked", - GTK_SIGNAL_FUNC (prefs_font_select), entry_textfont); - - tmplabel = gtk_label_new (_("Small")); - gtk_widget_show (tmplabel); - gtk_table_attach (GTK_TABLE (table1), tmplabel, 0, 1, 1, 2, - GTK_FILL, (GTK_EXPAND | GTK_FILL), 0, 0); - - tmpentry = gtk_entry_new (); - gtk_widget_show (tmpentry); - gtk_table_attach (GTK_TABLE (table1), tmpentry, 1, 2, 1, 2, - (GTK_EXPAND | GTK_FILL), 0, 0, 0); - - tmpbutton = gtk_button_new_with_label ("... "); - gtk_widget_show (tmpbutton); - gtk_table_attach (GTK_TABLE (table1), tmpbutton, 2, 3, 1, 2, - 0, 0, 0, 0); - gtk_signal_connect (GTK_OBJECT(tmpbutton), "clicked", - GTK_SIGNAL_FUNC(prefs_font_select), tmpentry); - display.entry_smallfont = tmpentry; - - tmplabel = gtk_label_new (_("Normal")); - gtk_widget_show (tmplabel); - gtk_table_attach (GTK_TABLE (table1), tmplabel, 0, 1, 2, 3, - GTK_FILL, (GTK_EXPAND | GTK_FILL), 0, 0); - - tmpentry = gtk_entry_new (); - gtk_widget_show (tmpentry); - gtk_table_attach (GTK_TABLE (table1), tmpentry, 1, 2, 2, 3, - (GTK_EXPAND | GTK_FILL), 0, 0, 0); - - tmpbutton = gtk_button_new_with_label ("... "); - gtk_widget_show (tmpbutton); - gtk_table_attach (GTK_TABLE (table1), tmpbutton, 2, 3, 2, 3, - 0, 0, 0, 0); - gtk_signal_connect (GTK_OBJECT(tmpbutton), "clicked", - GTK_SIGNAL_FUNC(prefs_font_select), tmpentry); - display.entry_normalfont = tmpentry; + tmpbutton = gtk_button_new_with_label (" ... "); + gtk_widget_show (tmpbutton); + gtk_table_attach (GTK_TABLE (table1), tmpbutton, 2, 3, 2, 3, + 0, 0, 0, 0); + gtk_signal_connect (GTK_OBJECT(tmpbutton), "clicked", + GTK_SIGNAL_FUNC(prefs_font_select), tmpentry); + display.entry_normalfont = tmpentry; tmplabel = gtk_label_new (_("Bold")); + gtk_misc_set_alignment(GTK_MISC(tmplabel), 0, 0.5); gtk_widget_show (tmplabel); gtk_table_attach (GTK_TABLE (table1), tmplabel, 0, 1, 3, 4, GTK_FILL, (GTK_EXPAND | GTK_FILL), 0, 0); @@ -1586,15 +1656,15 @@ static void prefs_display_create(void) gtk_table_attach (GTK_TABLE (table1), tmpentry, 1, 2, 3, 4, (GTK_EXPAND | GTK_FILL), 0, 0, 0); - tmpbutton = gtk_button_new_with_label ("... "); + tmpbutton = gtk_button_new_with_label (" ... "); gtk_widget_show (tmpbutton); gtk_table_attach (GTK_TABLE (table1), tmpbutton, 2, 3, 3, 4, 0, 0, 0, 0); gtk_signal_connect (GTK_OBJECT(tmpbutton), "clicked", GTK_SIGNAL_FUNC(prefs_font_select), tmpentry); - display.entry_boldfont = tmpentry; + display.entry_boldfont = tmpentry; - vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW); + vbox2 = gtk_vbox_new (FALSE, 0); gtk_widget_show (vbox2); gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, TRUE, 0); @@ -1609,7 +1679,7 @@ static void prefs_display_create(void) PACK_FRAME(vbox1, frame_summary, _("Summary View")); - vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW); + vbox2 = gtk_vbox_new (FALSE, 0); gtk_widget_show (vbox2); gtk_container_add (GTK_CONTAINER (frame_summary), vbox2); gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8); @@ -1622,6 +1692,13 @@ static void prefs_display_create(void) _("Display sender using address book")); PACK_CHECK_BUTTON (vbox2, chkbtn_hscrollbar, _("Enable horizontal scroll bar")); + PACK_CHECK_BUTTON + (vbox2, chkbtn_expand_thread, _("Expand threads")); + PACK_CHECK_BUTTON + (vbox2, chkbtn_bold_unread, + _("Display unread messages with bold font")); + + PACK_VSPACER(vbox2, vbox3, VSPACING_NARROW_2); hbox1 = gtk_hbox_new (FALSE, 8); gtk_widget_show (hbox1); @@ -1634,12 +1711,15 @@ static void prefs_display_create(void) entry_datefmt = gtk_entry_new (); gtk_widget_show (entry_datefmt); gtk_box_pack_start (GTK_BOX (hbox1), entry_datefmt, TRUE, TRUE, 0); - - label_datefmt_btn = gtk_button_new_with_label(_("Customize")); - gtk_widget_show(label_datefmt_btn); - gtk_box_pack_start(GTK_BOX (hbox1), label_datefmt_btn, FALSE, FALSE, 0); - gtk_signal_connect(GTK_OBJECT(label_datefmt_btn), "clicked", - GTK_SIGNAL_FUNC(create_date_format), NULL); + + button_datefmt = gtk_button_new_with_label ("... "); + + gtk_widget_show (button_datefmt); + gtk_box_pack_start (GTK_BOX (hbox1), button_datefmt, FALSE, FALSE, 0); + gtk_signal_connect (GTK_OBJECT (button_datefmt), "clicked", + GTK_SIGNAL_FUNC (date_format_create), NULL); + + PACK_VSPACER(vbox2, vbox3, VSPACING_NARROW); hbox1 = gtk_hbox_new (FALSE, 8); gtk_widget_show (hbox1); @@ -1659,16 +1739,19 @@ static void prefs_display_create(void) display.chkbtn_folder_unread = chkbtn_folder_unread; display.chkbtn_transhdr = chkbtn_transhdr; - display.chkbtn_swapfrom = chkbtn_swapfrom; - display.chkbtn_hscrollbar = chkbtn_hscrollbar; - display.chkbtn_useaddrbook = chkbtn_useaddrbook; - display.entry_datefmt = entry_datefmt; + display.chkbtn_swapfrom = chkbtn_swapfrom; + display.chkbtn_hscrollbar = chkbtn_hscrollbar; + display.chkbtn_expand_thread = chkbtn_expand_thread; + display.chkbtn_bold_unread = chkbtn_bold_unread; + display.chkbtn_useaddrbook = chkbtn_useaddrbook; + display.entry_datefmt = entry_datefmt; } static void prefs_message_create(void) { GtkWidget *vbox1; GtkWidget *vbox2; + GtkWidget *vbox3; GtkWidget *hbox1; GtkWidget *chkbtn_enablecol; GtkWidget *button_edit_col; @@ -1714,7 +1797,7 @@ static void prefs_message_create(void) SET_TOGGLE_SENSITIVITY(chkbtn_enablecol, button_edit_col); - vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW); + vbox2 = gtk_vbox_new (FALSE, 0); gtk_widget_show (vbox2); gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0); @@ -1741,6 +1824,8 @@ static void prefs_message_create(void) SET_TOGGLE_SENSITIVITY(chkbtn_disphdr, button_edit_disphdr); + PACK_VSPACER(vbox2, vbox3, VSPACING_NARROW_2); + hbox1 = gtk_hbox_new (FALSE, 32); gtk_widget_show (hbox1); gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, TRUE, 0); @@ -1772,7 +1857,7 @@ static void prefs_message_create(void) PACK_FRAME(vbox1, frame_scr, _("Scroll")); - vbox_scr = gtk_vbox_new (FALSE, VSPACING_NARROW); + vbox_scr = gtk_vbox_new (FALSE, 0); gtk_widget_show (vbox_scr); gtk_container_add (GTK_CONTAINER (frame_scr), vbox_scr); gtk_container_set_border_width (GTK_CONTAINER (vbox_scr), 8); @@ -1845,7 +1930,7 @@ static void prefs_privacy_create(void) gtk_container_add (GTK_CONTAINER (dialog.notebook), vbox1); gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER); - vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW); + vbox2 = gtk_vbox_new (FALSE, 0); gtk_widget_show (vbox2); gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0); @@ -1952,39 +2037,46 @@ static void prefs_interface_create(void) GtkWidget *vbox1; GtkWidget *vbox2; GtkWidget *vbox3; - GtkWidget *checkbtn_emacs; + /* GtkWidget *checkbtn_emacs; */ GtkWidget *checkbtn_openunread; GtkWidget *checkbtn_openinbox; GtkWidget *checkbtn_immedexec; - GtkWidget *checkbtn_addaddrbyclick; - GtkWidget *hbox; - GtkWidget *recvdialog_optmenu; - GtkWidget *recvdialog_optmenu_menu; - GtkWidget *recvdialog_menuitem; + GtkWidget *hbox1; GtkWidget *label; + GtkWidget *optmenu_recvdialog; + GtkWidget *menu; + GtkWidget *menuitem; + + GtkWidget *frame_addr; + GtkWidget *vbox_addr; + GtkWidget *checkbtn_addaddrbyclick; GtkWidget *frame_exit; GtkWidget *vbox_exit; - GtkWidget *hbox1; GtkWidget *checkbtn_confonexit; GtkWidget *checkbtn_cleanonexit; GtkWidget *checkbtn_askonclean; GtkWidget *checkbtn_warnqueued; + GtkWidget *hbox2; + GtkWidget *optmenu_nextunreadmsgdialog; + GtkWidget *optmenu_nextunreadmsgdialog_menu; + GtkWidget *nextunreadmsgdialog_menuitem; + vbox1 = gtk_vbox_new (FALSE, VSPACING); gtk_widget_show (vbox1); gtk_container_add (GTK_CONTAINER (dialog.notebook), vbox1); gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER); - vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW); + vbox2 = gtk_vbox_new (FALSE, 0); gtk_widget_show (vbox2); gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0); - PACK_CHECK_BUTTON (vbox2, checkbtn_emacs, + /* PACK_CHECK_BUTTON (vbox2, checkbtn_emacs, _("Emulate the behavior of mouse operation of\n" "Emacs-based mailer")); gtk_label_set_justify (GTK_LABEL (GTK_BIN (checkbtn_emacs)->child), - GTK_JUSTIFY_LEFT); + GTK_JUSTIFY_LEFT); */ PACK_CHECK_BUTTON (vbox2, checkbtn_openunread, @@ -2012,12 +2104,68 @@ static void prefs_interface_create(void) gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 8); gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT); + PACK_VSPACER(vbox2, vbox3, VSPACING_NARROW); + + hbox1 = gtk_hbox_new (FALSE, 8); + gtk_widget_show (hbox1); + gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, FALSE, 0); + + label = gtk_label_new (_("Show receive dialog")); + gtk_widget_show (label); + gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 0); + + optmenu_recvdialog = gtk_option_menu_new (); + gtk_widget_show (optmenu_recvdialog); + gtk_box_pack_start (GTK_BOX (hbox1), optmenu_recvdialog, + FALSE, FALSE, 0); + + menu = gtk_menu_new (); + MENUITEM_ADD (menu, menuitem, _("Always"), RECV_DIALOG_ALWAYS); + MENUITEM_ADD (menu, menuitem, _("Only if a window is active"), + RECV_DIALOG_ACTIVE); + MENUITEM_ADD (menu, menuitem, _("Never"), RECV_DIALOG_NEVER); + + gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu_recvdialog), menu); + + PACK_FRAME (vbox1, frame_addr, _("Address book")); + + vbox_addr = gtk_vbox_new (FALSE, 0); + gtk_widget_show (vbox_addr); + gtk_container_add (GTK_CONTAINER (frame_addr), vbox_addr); + gtk_container_set_border_width (GTK_CONTAINER (vbox_addr), 8); + PACK_CHECK_BUTTON - (vbox2, checkbtn_addaddrbyclick, + (vbox_addr, checkbtn_addaddrbyclick, _("Add address to destination when double-clicked")); + /* Next Unread Message Dialog */ + hbox2 = gtk_hbox_new (FALSE, 8); + gtk_widget_show (hbox2); + gtk_box_pack_start (GTK_BOX (vbox2), hbox2, FALSE, FALSE, 0); + + label = gtk_label_new (_("Show no-unread-message dialog")); + gtk_widget_show (label); + gtk_box_pack_start (GTK_BOX (hbox2), label, FALSE, FALSE, 0); + + optmenu_nextunreadmsgdialog = gtk_option_menu_new (); + gtk_widget_show (optmenu_nextunreadmsgdialog); + gtk_box_pack_start (GTK_BOX (hbox2), optmenu_nextunreadmsgdialog, + FALSE, FALSE, 0); + + optmenu_nextunreadmsgdialog_menu = gtk_menu_new (); + MENUITEM_ADD (optmenu_nextunreadmsgdialog_menu, nextunreadmsgdialog_menuitem, + _("Always"), NEXTUNREADMSGDIALOG_ALWAYS); + MENUITEM_ADD (optmenu_nextunreadmsgdialog_menu, nextunreadmsgdialog_menuitem, + _("Assume 'Yes'"), NEXTUNREADMSGDIALOG_ASSUME_YES); + MENUITEM_ADD (optmenu_nextunreadmsgdialog_menu, nextunreadmsgdialog_menuitem, + _("Assume 'No'"), NEXTUNREADMSGDIALOG_ASSUME_NO); + + gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu_nextunreadmsgdialog), + optmenu_nextunreadmsgdialog_menu); + + /* Receive Dialog */ - hbox = gtk_hbox_new (FALSE, 8); +/* hbox = gtk_hbox_new (FALSE, 8); gtk_widget_show (hbox); gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0); @@ -2035,12 +2183,12 @@ static void prefs_interface_create(void) MENUITEM_ADD (recvdialog_optmenu_menu, recvdialog_menuitem, _("Only if a sylpheed window is active"), RECVDIALOG_WINDOW_ACTIVE); MENUITEM_ADD (recvdialog_optmenu_menu, recvdialog_menuitem, _("Never"), RECVDIALOG_NEVER); - gtk_option_menu_set_menu (GTK_OPTION_MENU (recvdialog_optmenu), recvdialog_optmenu_menu); + gtk_option_menu_set_menu (GTK_OPTION_MENU (recvdialog_optmenu), recvdialog_optmenu_menu); */ /* On Exit */ PACK_FRAME (vbox1, frame_exit, _("On exit")); - vbox_exit = gtk_vbox_new (FALSE, VSPACING_NARROW); + vbox_exit = gtk_vbox_new (FALSE, 0); gtk_widget_show (vbox_exit); gtk_container_add (GTK_CONTAINER (frame_exit), vbox_exit); gtk_container_set_border_width (GTK_CONTAINER (vbox_exit), 8); @@ -2061,16 +2209,17 @@ static void prefs_interface_create(void) PACK_CHECK_BUTTON (vbox_exit, checkbtn_warnqueued, _("Warn if there are queued messages")); - interface.checkbtn_emacs = checkbtn_emacs; - interface.checkbtn_openunread = checkbtn_openunread; - interface.checkbtn_openinbox = checkbtn_openinbox; - interface.checkbtn_immedexec = checkbtn_immedexec; - interface.checkbtn_addaddrbyclick = checkbtn_addaddrbyclick; - interface.recvdialog_optmenu = recvdialog_optmenu; - interface.checkbtn_confonexit = checkbtn_confonexit; - interface.checkbtn_cleanonexit = checkbtn_cleanonexit; - interface.checkbtn_askonclean = checkbtn_askonclean; - interface.checkbtn_warnqueued = checkbtn_warnqueued; + /* interface.checkbtn_emacs = checkbtn_emacs; */ + interface.checkbtn_openunread = checkbtn_openunread; + interface.checkbtn_openinbox = checkbtn_openinbox; + interface.checkbtn_immedexec = checkbtn_immedexec; + interface.optmenu_recvdialog = optmenu_recvdialog; + interface.checkbtn_addaddrbyclick = checkbtn_addaddrbyclick; + interface.optmenu_nextunreadmsgdialog = optmenu_nextunreadmsgdialog; + interface.checkbtn_confonexit = checkbtn_confonexit; + interface.checkbtn_cleanonexit = checkbtn_cleanonexit; + interface.checkbtn_askonclean = checkbtn_askonclean; + interface.checkbtn_warnqueued = checkbtn_warnqueued; } static void prefs_other_create(void) @@ -2155,6 +2304,7 @@ static void prefs_other_create(void) gtk_box_pack_start (GTK_BOX (hbox1), exteditor_combo, TRUE, TRUE, 0); gtkut_combo_set_items (GTK_COMBO (exteditor_combo), "gedit %s", + "kedit %s", "mgedit --no-fork %s", "emacs %s", "xemacs %s", @@ -2171,6 +2321,275 @@ static void prefs_other_create(void) other.exteditor_entry = exteditor_entry; } +static void date_format_ok_btn_clicked(GtkButton *button, GtkWidget **widget) +{ + GtkWidget *datefmt_sample = NULL; + gchar *text; + + g_return_if_fail(widget != NULL); + g_return_if_fail(*widget != NULL); + g_return_if_fail(display.entry_datefmt != NULL); + + datefmt_sample = GTK_WIDGET(gtk_object_get_data + (GTK_OBJECT(*widget), "datefmt_sample")); + g_return_if_fail(datefmt_sample != NULL); + + text = gtk_editable_get_chars(GTK_EDITABLE(datefmt_sample), 0, -1); + g_free(prefs_common.date_format); + prefs_common.date_format = text; + gtk_entry_set_text(GTK_ENTRY(display.entry_datefmt), text); + + gtk_widget_destroy(*widget); + *widget = NULL; +} + +static void date_format_cancel_btn_clicked(GtkButton *button, + GtkWidget **widget) +{ + g_return_if_fail(widget != NULL); + g_return_if_fail(*widget != NULL); + + gtk_widget_destroy(*widget); + *widget = NULL; +} + +static void date_format_key_pressed(GtkWidget *keywidget, GdkEventKey *event, + GtkWidget **widget) +{ + if (event && event->keyval == GDK_Escape) + date_format_cancel_btn_clicked(NULL, widget); +} + +static gboolean date_format_on_delete(GtkWidget *dialogwidget, + GdkEventAny *event, GtkWidget **widget) +{ + g_return_val_if_fail(widget != NULL, FALSE); + g_return_val_if_fail(*widget != NULL, FALSE); + + *widget = NULL; + return FALSE; +} + +static void date_format_entry_on_change(GtkEditable *editable, + GtkLabel *example) +{ + time_t cur_time; + struct tm *cal_time; + gchar buffer[100]; + gchar *text; + + cur_time = time(NULL); + cal_time = localtime(&cur_time); + buffer[0] = 0; + text = gtk_editable_get_chars(editable, 0, -1); + if (text) + strftime(buffer, sizeof buffer, text, cal_time); + gtk_label_set_text(example, buffer); +} + +static void date_format_select_row(GtkWidget *date_format_list, gint row, + gint column, GdkEventButton *event, + GtkWidget *date_format) +{ + gint cur_pos; + gchar *format; + gchar *old_format; + gchar *new_format; + GtkWidget *datefmt_sample; + + /* only on double click */ + if (!event || event->type != GDK_2BUTTON_PRESS) return; + + + datefmt_sample = GTK_WIDGET(gtk_object_get_data + (GTK_OBJECT(date_format), "datefmt_sample")); + + g_return_if_fail(date_format_list != NULL); + g_return_if_fail(date_format != NULL); + g_return_if_fail(datefmt_sample != NULL); + + /* get format from clist */ + gtk_clist_get_text(GTK_CLIST(date_format_list), row, 0, &format); + + cur_pos = gtk_editable_get_position(GTK_EDITABLE(datefmt_sample)); + old_format = gtk_entry_get_text(GTK_ENTRY(datefmt_sample)); + + /* insert the format into the text entry */ + new_format = g_malloc(strlen(old_format) + 3); + + strncpy(new_format, old_format, cur_pos); + new_format[cur_pos] = '\0'; + strcat(new_format, format); + strcat(new_format, &old_format[cur_pos]); + + gtk_entry_set_text(GTK_ENTRY(datefmt_sample), new_format); + gtk_editable_set_position(GTK_EDITABLE(datefmt_sample), cur_pos + 2); + + g_free(new_format); +} + +static GtkWidget *date_format_create(GtkButton *button, void *data) +{ + static GtkWidget *datefmt_win = NULL; + GtkWidget *vbox1; + GtkWidget *scrolledwindow1; + GtkWidget *datefmt_clist; + GtkWidget *table; + GtkWidget *label1; + GtkWidget *label2; + GtkWidget *label3; + GtkWidget *confirm_area; + GtkWidget *ok_btn; + GtkWidget *cancel_btn; + GtkWidget *datefmt_entry; + + const struct { + gchar *fmt; + gchar *txt; + } time_format[] = { + { "%a", _("the full abbreviated weekday name") }, + { "%A", _("the full weekday name") }, + { "%b", _("the abbreviated month name") }, + { "%B", _("the full month name") }, + { "%c", _("the preferred date and time for the current locale") }, + { "%C", _("the century number (year/100)") }, + { "%d", _("the day of the month as a decimal number") }, + { "%H", _("the hour as a decimal number using a 24-hour clock") }, + { "%I", _("the hour as a decimal number using a 12-hour clock") }, + { "%j", _("the day of the year as a decimal number") }, + { "%m", _("the month as a decimal number") }, + { "%M", _("the minute as a decimal number") }, + { "%p", _("either AM or PM") }, + { "%S", _("the second as a decimal number") }, + { "%w", _("the day of the week as a decimal number") }, + { "%x", _("the preferred date for the current locale") }, + { "%y", _("the last two digits of a year") }, + { "%Y", _("the year as a decimal number") }, + { "%Z", _("the time zone or name or abbreviation") } + }; + + gchar *titles[2]; + gint i; + const gint TIME_FORMAT_ELEMS = + sizeof time_format / sizeof time_format[0]; + + if (datefmt_win) return datefmt_win; + + datefmt_win = gtk_window_new(GTK_WINDOW_DIALOG); + gtk_container_set_border_width(GTK_CONTAINER(datefmt_win), 8); + gtk_window_set_title(GTK_WINDOW(datefmt_win), _("Date format")); + gtk_window_set_position(GTK_WINDOW(datefmt_win), GTK_WIN_POS_CENTER); + gtk_widget_set_usize(datefmt_win, 440, 280); + + vbox1 = gtk_vbox_new(FALSE, 10); + gtk_widget_show(vbox1); + gtk_container_add(GTK_CONTAINER(datefmt_win), vbox1); + + scrolledwindow1 = gtk_scrolled_window_new(NULL, NULL); + gtk_scrolled_window_set_policy + (GTK_SCROLLED_WINDOW(scrolledwindow1), + GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + gtk_widget_show(scrolledwindow1); + gtk_box_pack_start(GTK_BOX(vbox1), scrolledwindow1, TRUE, TRUE, 0); + + titles[0] = _("Specifier"); + titles[1] = _("Description"); + datefmt_clist = gtk_clist_new_with_titles(2, titles); + gtk_widget_show(datefmt_clist); + gtk_container_add(GTK_CONTAINER(scrolledwindow1), datefmt_clist); +/* gtk_clist_set_column_width(GTK_CLIST(datefmt_clist), 0, 80); */ + + gtk_clist_set_selection_mode(GTK_CLIST(datefmt_clist), + GTK_SELECTION_BROWSE); + + for (i = 0; i < TIME_FORMAT_ELEMS; i++) { + gchar *text[2]; + /* phoney casting necessary because of gtk... */ + text[0] = (gchar *)time_format[i].fmt; + text[1] = (gchar *)time_format[i].txt; + gtk_clist_append(GTK_CLIST(datefmt_clist), text); + } + + table = gtk_table_new(2, 2, FALSE); + gtk_widget_show(table); + gtk_box_pack_start(GTK_BOX(vbox1), table, FALSE, FALSE, 0); + gtk_table_set_row_spacings(GTK_TABLE(table), 4); + gtk_table_set_col_spacings(GTK_TABLE(table), 8); + + label1 = gtk_label_new(_("Date format")); + gtk_widget_show(label1); + gtk_table_attach(GTK_TABLE(table), label1, 0, 1, 0, 1, + GTK_FILL, 0, 0, 0); + gtk_label_set_justify(GTK_LABEL(label1), GTK_JUSTIFY_LEFT); + gtk_misc_set_alignment(GTK_MISC(label1), 0, 0.5); + + datefmt_entry = gtk_entry_new_with_max_length(256); + gtk_widget_show(datefmt_entry); + gtk_table_attach(GTK_TABLE(table), datefmt_entry, 1, 2, 0, 1, + (GTK_EXPAND | GTK_FILL), 0, 0, 0); + + /* we need the "sample" entry box; add it as data so callbacks can + * get the entry box */ + gtk_object_set_data(GTK_OBJECT(datefmt_win), "datefmt_sample", + datefmt_entry); + + label2 = gtk_label_new(_("Example")); + gtk_widget_show(label2); + gtk_table_attach(GTK_TABLE(table), label2, 0, 1, 1, 2, + GTK_FILL, 0, 0, 0); + gtk_label_set_justify(GTK_LABEL(label2), GTK_JUSTIFY_LEFT); + gtk_misc_set_alignment(GTK_MISC(label2), 0, 0.5); + + label3 = gtk_label_new(""); + gtk_widget_show(label3); + gtk_table_attach(GTK_TABLE(table), label3, 1, 2, 1, 2, + (GTK_EXPAND | GTK_FILL), 0, 0, 0); + gtk_label_set_justify(GTK_LABEL(label3), GTK_JUSTIFY_LEFT); + gtk_misc_set_alignment(GTK_MISC(label3), 0, 0.5); + + gtkut_button_set_create(&confirm_area, &ok_btn, _("OK"), + &cancel_btn, _("Cancel"), NULL, NULL); + gtk_widget_grab_default(ok_btn); + gtk_widget_show(confirm_area); + + gtk_box_pack_start(GTK_BOX(vbox1), confirm_area, FALSE, FALSE, 0); + + /* set the current format */ + gtk_entry_set_text(GTK_ENTRY(datefmt_entry), prefs_common.date_format); + date_format_entry_on_change(GTK_EDITABLE(datefmt_entry), + GTK_LABEL(label3)); + + gtk_signal_connect(GTK_OBJECT(ok_btn), "clicked", + GTK_SIGNAL_FUNC(date_format_ok_btn_clicked), + &datefmt_win); + gtk_signal_connect(GTK_OBJECT(cancel_btn), "clicked", + GTK_SIGNAL_FUNC(date_format_cancel_btn_clicked), + &datefmt_win); + gtk_signal_connect(GTK_OBJECT(datefmt_win), "key_press_event", + GTK_SIGNAL_FUNC(date_format_key_pressed), + &datefmt_win); + gtk_signal_connect(GTK_OBJECT(datefmt_win), "delete_event", + GTK_SIGNAL_FUNC(date_format_on_delete), + &datefmt_win); + gtk_signal_connect(GTK_OBJECT(datefmt_entry), "changed", + GTK_SIGNAL_FUNC(date_format_entry_on_change), + label3); + + gtk_signal_connect(GTK_OBJECT(datefmt_clist), "select_row", + GTK_SIGNAL_FUNC(date_format_select_row), + datefmt_win); + + gtk_window_set_position(GTK_WINDOW(datefmt_win), GTK_WIN_POS_CENTER); + gtk_window_set_modal(GTK_WINDOW(datefmt_win), TRUE); + + gtk_widget_show(datefmt_win); + manage_window_set_transient(GTK_WINDOW(datefmt_win)); + + gtk_widget_grab_focus(ok_btn); + + return datefmt_win; +} + void prefs_quote_colors_dialog(void) { if (!quote_color_win) @@ -2194,6 +2613,7 @@ static void prefs_quote_colors_dialog_create(void) GtkWidget *quotelevel2_label; GtkWidget *quotelevel3_label; GtkWidget *uri_label; + GtkWidget *tgt_folder_label; GtkWidget *hbbox; GtkWidget *ok_btn; //GtkWidget *cancel_btn; @@ -2216,7 +2636,8 @@ static void prefs_quote_colors_dialog_create(void) gtk_container_add (GTK_CONTAINER (frame_colors), table); gtk_container_set_border_width (GTK_CONTAINER (table), 8); gtk_table_set_row_spacings (GTK_TABLE (table), 2); - gtk_table_set_col_spacings (GTK_TABLE (table), 4); + gtk_table_set_col_spacings (GTK_TABLE (table), 5); + color_buttons.quote_level1_btn = gtk_button_new(); gtk_table_attach (GTK_TABLE (table), color_buttons.quote_level1_btn, @@ -2244,6 +2665,12 @@ static void prefs_quote_colors_dialog_create(void) gtk_widget_set_usize (color_buttons.uri_btn, 40, 30); gtk_container_set_border_width (GTK_CONTAINER (color_buttons.uri_btn), 5); + color_buttons.tgt_folder_btn = gtk_button_new_with_label (""); + gtk_table_attach (GTK_TABLE (table), color_buttons.tgt_folder_btn, + 0, 1, 4, 5, 0, 0, 0, 0); + gtk_widget_set_usize (color_buttons.tgt_folder_btn, 40, 30); + gtk_container_set_border_width (GTK_CONTAINER (color_buttons.tgt_folder_btn), 5); + quotelevel1_label = gtk_label_new (_("Quoted Text - First Level")); gtk_table_attach (GTK_TABLE (table), quotelevel1_label, 1, 2, 0, 1, (GTK_EXPAND | GTK_FILL), 0, 0, 0); @@ -2268,6 +2695,12 @@ static void prefs_quote_colors_dialog_create(void) gtk_label_set_justify (GTK_LABEL (uri_label), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (uri_label), 0, 0.5); + tgt_folder_label = gtk_label_new (_("Target folder")); + gtk_table_attach (GTK_TABLE (table), tgt_folder_label, 1, 2, 4, 5, + (GTK_EXPAND | GTK_FILL), 0, 0, 0); + gtk_label_set_justify (GTK_LABEL (tgt_folder_label), GTK_JUSTIFY_LEFT); + gtk_misc_set_alignment (GTK_MISC (tgt_folder_label), 0, 0.5); + PACK_CHECK_BUTTON (vbox, recycle_colors_btn, _("Recycle quote colors")); @@ -2294,6 +2727,8 @@ static void prefs_quote_colors_dialog_create(void) GTK_SIGNAL_FUNC(quote_color_set_dialog), "LEVEL3"); gtk_signal_connect(GTK_OBJECT(color_buttons.uri_btn), "clicked", GTK_SIGNAL_FUNC(quote_color_set_dialog), "URI"); + gtk_signal_connect(GTK_OBJECT(color_buttons.tgt_folder_btn), "clicked", + GTK_SIGNAL_FUNC(quote_color_set_dialog), "TGTFLD"); gtk_signal_connect(GTK_OBJECT(recycle_colors_btn), "toggled", GTK_SIGNAL_FUNC(prefs_recycle_colors_toggled), NULL); gtk_signal_connect(GTK_OBJECT(ok_btn), "clicked", @@ -2308,6 +2743,8 @@ static void prefs_quote_colors_dialog_create(void) prefs_common.quote_level3_col); set_button_bg_color(color_buttons.uri_btn, prefs_common.uri_col); + set_button_bg_color(color_buttons.tgt_folder_btn, + prefs_common.tgt_folder_col); gtk_toggle_button_set_active((GtkToggleButton *)recycle_colors_btn, prefs_common.recycle_quote_colors); @@ -2342,6 +2779,9 @@ static void quote_color_set_dialog(GtkWidget *widget, gpointer data) } else if(g_strcasecmp(type, "URI") == 0) { title = _("Pick color for URI"); rgbvalue = prefs_common.uri_col; + } else if(g_strcasecmp(type, "TGTFLD") == 0) { + title = _("Pick color for target folder"); + rgbvalue = prefs_common.tgt_folder_col; } else { /* Should never be called */ g_warning("Unrecognized datatype '%s' in quote_color_set_dialog\n", type); return; @@ -2405,6 +2845,10 @@ static void quote_colors_set_dialog_ok(GtkWidget *widget, gpointer data) } else if (g_strcasecmp(type, "URI") == 0) { prefs_common.uri_col = rgbvalue; set_button_bg_color(color_buttons.uri_btn, rgbvalue); + } else if (g_strcasecmp(type, "TGTFLD") == 0) { + prefs_common.tgt_folder_col = rgbvalue; + set_button_bg_color(color_buttons.tgt_folder_btn, rgbvalue); + folderview_set_target_folder_color(prefs_common.tgt_folder_col); } else fprintf( stderr, "Unrecognized datatype '%s' in quote_color_set_dialog_ok\n", type ); @@ -2723,11 +3167,6 @@ static void prefs_font_select(GtkButton *button, GtkEntry *entry) (GTK_OBJECT(font_sel_win), "key_press_event", GTK_SIGNAL_FUNC(prefs_font_selection_key_pressed), NULL); - gtk_signal_connect - (GTK_OBJECT(GTK_FONT_SELECTION_DIALOG(font_sel_win)->ok_button), - "clicked", - GTK_SIGNAL_FUNC(prefs_font_selection_ok), - entry); gtk_signal_connect_object (GTK_OBJECT(GTK_FONT_SELECTION_DIALOG(font_sel_win)->cancel_button), "clicked", @@ -2735,6 +3174,16 @@ static void prefs_font_select(GtkButton *button, GtkEntry *entry) GTK_OBJECT(font_sel_win)); } + if(font_sel_conn_id) { + gtk_signal_disconnect(GTK_OBJECT(GTK_FONT_SELECTION_DIALOG(font_sel_win)->ok_button), font_sel_conn_id); + } + font_sel_conn_id = gtk_signal_connect + (GTK_OBJECT(GTK_FONT_SELECTION_DIALOG(font_sel_win)->ok_button), + "clicked", + GTK_SIGNAL_FUNC(prefs_font_selection_ok), + entry); + printf("%i\n", font_sel_conn_id); + font_name = gtk_editable_get_chars(GTK_EDITABLE(entry), 0, -1); gtk_font_selection_dialog_set_font_name(GTK_FONT_SELECTION_DIALOG(font_sel_win), font_name); g_free(font_name); @@ -2762,6 +3211,7 @@ static void prefs_font_selection_ok(GtkButton *button, GtkEntry *entry) if (fontname) { gtk_entry_set_text(entry, fontname); + g_free(fontname); } @@ -2809,6 +3259,42 @@ static void prefs_common_charset_set_optmenu(PrefParam *pparam) prefs_common_charset_set_data_from_optmenu(pparam); } +static void prefs_common_recv_dialog_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)); + *((RecvDialogMode *)pparam->data) = GPOINTER_TO_INT + (gtk_object_get_user_data(GTK_OBJECT(menuitem))); +} + +static void prefs_common_recv_dialog_set_optmenu(PrefParam *pparam) +{ + RecvDialogMode mode = *((RecvDialogMode *)pparam->data); + GtkOptionMenu *optmenu = GTK_OPTION_MENU(*pparam->widget); + GtkWidget *menu; + GtkWidget *menuitem; + + switch (mode) { + case RECV_DIALOG_ALWAYS: + 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: + } + + menu = gtk_option_menu_get_menu(optmenu); + menuitem = gtk_menu_get_active(GTK_MENU(menu)); + gtk_menu_item_activate(GTK_MENU_ITEM(menuitem)); +} + static gint prefs_common_deleted(GtkWidget *widget, GdkEventAny *event, gpointer data) { @@ -2830,7 +3316,7 @@ static void prefs_common_ok(void) if (quote_desc_win && GTK_WIDGET_VISIBLE(quote_desc_win)) gtk_widget_hide(quote_desc_win); - inc_autocheck_timer_set(); + inc_unlock(); } static void prefs_common_apply(void) @@ -2838,12 +3324,53 @@ static void prefs_common_apply(void) prefs_set_data_from_dialog(param); main_window_reflect_prefs_all(); prefs_common_save_config(); + + inc_autocheck_timer_remove(); + inc_autocheck_timer_set(); +} + +static void prefs_nextunreadmsgdialog_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)); + *((NextUnreadMsgDialogShow *)pparam->data) = GPOINTER_TO_INT + (gtk_object_get_user_data(GTK_OBJECT(menuitem))); +} + +static void prefs_nextunreadmsgdialog_set_optmenu(PrefParam *pparam) +{ + NextUnreadMsgDialogShow dialog_show; + GtkOptionMenu *optmenu = GTK_OPTION_MENU(*pparam->widget); + GtkWidget *menu; + GtkWidget *menuitem; + + dialog_show = *((NextUnreadMsgDialogShow *)pparam->data); + + switch (dialog_show) { + case NEXTUNREADMSGDIALOG_ALWAYS: + gtk_option_menu_set_history(optmenu, 0); + break; + case NEXTUNREADMSGDIALOG_ASSUME_YES: + gtk_option_menu_set_history(optmenu, 1); + break; + case NEXTUNREADMSGDIALOG_ASSUME_NO: + gtk_option_menu_set_history(optmenu, 2); + break; + default: + } + + menu = gtk_option_menu_get_menu(optmenu); + menuitem = gtk_menu_get_active(GTK_MENU(menu)); + gtk_menu_item_activate(GTK_MENU_ITEM(menuitem)); } static void prefs_common_cancel(void) { gtk_widget_hide(dialog.window); - inc_autocheck_timer_set(); + inc_unlock(); } @@ -3028,7 +3555,7 @@ static void compose_prefs_key_pressed(GtkWidget *widget, GdkEventKey *event) } } -static void prefs_recvdialog_set_data_from_optmenu(PrefParam *pparam) +/* static void prefs_recvdialog_set_data_from_optmenu(PrefParam *pparam) { GtkWidget *menu; GtkWidget *menuitem; @@ -3037,9 +3564,9 @@ static void prefs_recvdialog_set_data_from_optmenu(PrefParam *pparam) menuitem = gtk_menu_get_active(GTK_MENU(menu)); *((RecvDialogShow *)pparam->data) = GPOINTER_TO_INT (gtk_object_get_user_data(GTK_OBJECT(menuitem))); -} +} */ -static void prefs_recvdialog_set_optmenu(PrefParam *pparam) +/* static void prefs_recvdialog_set_optmenu(PrefParam *pparam) { RecvDialogShow dialog_show; GtkOptionMenu *optmenu = GTK_OPTION_MENU(*pparam->widget); @@ -3064,4 +3591,4 @@ static void prefs_recvdialog_set_optmenu(PrefParam *pparam) menu = gtk_option_menu_get_menu(optmenu); menuitem = gtk_menu_get_active(GTK_MENU(menu)); gtk_menu_item_activate(GTK_MENU_ITEM(menuitem)); -} +} */