From: Paul Mangan Date: Sun, 27 Nov 2005 06:11:22 +0000 (+0000) Subject: 2005-11-27 [paul] 1.9.100cvs37 X-Git-Tag: rel_2_0_0~183 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=65c0c9f032c104c6c65c8566a0424d14721498d2;ds=sidebyside 2005-11-27 [paul] 1.9.100cvs37 * src/prefs_common.c * src/prefs_common.h * src/prefs_receive.c * src/prefs_summaries.c move 'go to inbox after receiving new mail' option from display/sumamaries to mail handling/receive, and rework prefs_summaries dialog a little --- diff --git a/ChangeLog b/ChangeLog index b5a273cc4..75ab5ea08 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2005-11-27 [paul] 1.9.100cvs37 + + * src/prefs_common.c + * src/prefs_common.h + * src/prefs_receive.c + * src/prefs_summaries.c + move 'go to inbox after receiving new mail' + option from display/sumamaries to mail + handling/receive, and rework prefs_summaries + dialog a little + 2005-11-25 [martin] 1.9.100cvs36 * po/de.po diff --git a/PATCHSETS b/PATCHSETS index 768247ff1..164537e3f 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -1020,3 +1020,4 @@ ( cvs diff -u -r 1.13.2.13 -r 1.13.2.14 src/plugins/clamav/clamav_plugin.c; ) > 1.9.100cvs34.patchset ( cvs diff -u -r 1.13.2.14 -r 1.13.2.15 src/plugins/clamav/clamav_plugin.c; ) > 1.9.100cvs35.patchset ( cvs diff -u -r 1.58.2.15 -r 1.58.2.16 po/de.po; ) > 1.9.100cvs36.patchset +( cvs diff -u -r 1.204.2.67 -r 1.204.2.68 src/prefs_common.c; cvs diff -u -r 1.103.2.35 -r 1.103.2.36 src/prefs_common.h; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/prefs_receive.c; cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/prefs_summaries.c; ) > 1.9.100cvs37.patchset diff --git a/configure.ac b/configure.ac index d75ac895e..7e8170f2f 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=9 MICRO_VERSION=100 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=36 +EXTRA_VERSION=37 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/prefs_common.c b/src/prefs_common.c index 345ff7a8e..39611b2ba 100644 --- a/src/prefs_common.c +++ b/src/prefs_common.c @@ -89,6 +89,8 @@ static PrefParam param[] = { NULL, NULL, NULL}, {"check_on_startup", "FALSE", &prefs_common.chk_on_startup, P_BOOL, NULL, NULL, NULL}, + {"open_inbox_on_inc", "FALSE", &prefs_common.open_inbox_on_inc, + P_BOOL, NULL, NULL, NULL}, {"scan_all_after_inc", "FALSE", &prefs_common.scan_all_after_inc, P_BOOL, NULL, NULL, NULL}, {"newmail_notify_manu", "FALSE", &prefs_common.newmail_notify_manu, @@ -492,8 +494,6 @@ static PrefParam param[] = { {"mark_as_read_delay", "0", &prefs_common.mark_as_read_delay, P_INT, NULL, NULL, NULL}, - {"open_inbox_on_inc", "FALSE", &prefs_common.open_inbox_on_inc, - P_BOOL, NULL, NULL, NULL}, {"immediate_execution", "TRUE", &prefs_common.immediate_exec, P_BOOL, NULL, NULL, NULL}, {"nextunreadmsg_dialog", "1", &prefs_common.next_unread_msg_dialog, P_ENUM, diff --git a/src/prefs_common.h b/src/prefs_common.h index 37d1bd83e..873d3bcb6 100644 --- a/src/prefs_common.h +++ b/src/prefs_common.h @@ -76,6 +76,7 @@ struct _PrefsCommon gboolean autochk_newmail; gint autochk_itv; gboolean chk_on_startup; + gboolean open_inbox_on_inc; gboolean newmail_notify_auto; gboolean newmail_notify_manu; gchar *newmail_notify_cmd; @@ -278,7 +279,6 @@ struct _PrefsCommon gboolean always_show_msg; gboolean mark_as_read_on_new_window; gboolean mark_as_read_delay; - gboolean open_inbox_on_inc; gboolean immediate_exec; SelectOnEntry select_on_entry; NextUnreadMsgDialogShow next_unread_msg_dialog; diff --git a/src/prefs_receive.c b/src/prefs_receive.c index 2c4b9712d..b7058773e 100644 --- a/src/prefs_receive.c +++ b/src/prefs_receive.c @@ -52,6 +52,7 @@ typedef struct _ReceivePage GtkWidget *checkbtn_autochk; GtkWidget *spinbtn_autochk; GtkWidget *checkbtn_chkonstartup; + GtkWidget *checkbtn_openinbox; GtkWidget *checkbtn_scan_after_inc; GtkWidget *checkbtn_newmail_auto; GtkWidget *checkbtn_newmail_manu; @@ -96,9 +97,9 @@ void prefs_receive_create_widget(PrefsPage *_page, GtkWindow *window, GtkWidget *spinbtn_autochk; GtkWidget *label_autochk2; GtkWidget *checkbtn_chkonstartup; + GtkWidget *checkbtn_openinbox; GtkWidget *checkbtn_scan_after_inc; - GtkWidget *frame_newmail; GtkWidget *hbox_newmail_notify; GtkWidget *checkbtn_newmail_auto; @@ -176,10 +177,11 @@ void prefs_receive_create_widget(PrefsPage *_page, GtkWindow *window, PACK_CHECK_BUTTON (vbox2, checkbtn_chkonstartup, _("Check new mail on startup")); + PACK_CHECK_BUTTON (vbox2, checkbtn_openinbox, + _("Go to inbox after receiving new mail")); PACK_CHECK_BUTTON (vbox2, checkbtn_scan_after_inc, _("Update all local folders after incorporation")); - /* receive dialog */ hbox_recvdialog = gtk_hbox_new (FALSE, 8); gtk_widget_show (hbox_recvdialog); @@ -254,6 +256,8 @@ void prefs_receive_create_widget(PrefsPage *_page, GtkWindow *window, prefs_common.close_recv_dialog); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_chkonstartup), prefs_common.chk_on_startup); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_openinbox), + prefs_common.open_inbox_on_inc); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_scan_after_inc), prefs_common.scan_all_after_inc); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_newmail_auto), @@ -278,6 +282,7 @@ void prefs_receive_create_widget(PrefsPage *_page, GtkWindow *window, prefs_receive->checkbtn_autochk = checkbtn_autochk; prefs_receive->spinbtn_autochk = spinbtn_autochk; prefs_receive->checkbtn_chkonstartup = checkbtn_chkonstartup; + prefs_receive->checkbtn_openinbox = checkbtn_openinbox; prefs_receive->checkbtn_scan_after_inc = checkbtn_scan_after_inc; prefs_receive->checkbtn_newmail_auto = checkbtn_newmail_auto; prefs_receive->checkbtn_newmail_manu = checkbtn_newmail_manu; @@ -312,6 +317,8 @@ void prefs_receive_save(PrefsPage *_page) GTK_TOGGLE_BUTTON(page->checkbtn_close_recv_dialog)); prefs_common.chk_on_startup = gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(page->checkbtn_chkonstartup)); + prefs_common.open_inbox_on_inc = gtk_toggle_button_get_active( + GTK_TOGGLE_BUTTON(page->checkbtn_openinbox)); prefs_common.scan_all_after_inc = gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(page->checkbtn_scan_after_inc)); prefs_common.newmail_notify_auto = gtk_toggle_button_get_active( diff --git a/src/prefs_summaries.c b/src/prefs_summaries.c index 84b026ee4..2989b2b72 100644 --- a/src/prefs_summaries.c +++ b/src/prefs_summaries.c @@ -58,7 +58,6 @@ typedef struct _SummariesPage GtkWidget *checkbtn_always_show_msg; GtkWidget *checkbtn_mark_as_read_on_newwin; - GtkWidget *checkbtn_openinbox; GtkWidget *checkbtn_immedexec; GtkWidget *checkbtn_ask_mark_all_read; GtkWidget *optmenu_select_on_entry; @@ -707,9 +706,10 @@ void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window, GtkWidget *frame_dispitem; GtkWidget *button_dispitem; + GtkWidget *vbox4; + GtkWidget *hbox2; GtkWidget *checkbtn_always_show_msg; GtkWidget *checkbtn_mark_as_read_on_newwin; - GtkWidget *checkbtn_openinbox; GtkWidget *checkbtn_immedexec; GtkWidget *checkbtn_ask_mark_all_read; GtkTooltips *immedexec_tooltip; @@ -737,7 +737,7 @@ void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window, PACK_CHECK_BUTTON (vbox2, chkbtn_folder_unread, _("Display unread number next to folder name")); - PACK_VSPACER(vbox2, vbox3, VSPACING_NARROW_2); + PACK_VSPACER(vbox1, vbox2, VSPACING_NARROW_2); hbox1 = gtk_hbox_new (FALSE, 8); gtk_widget_show (hbox1); @@ -764,23 +764,23 @@ void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window, /* ---- Summary ---- */ - vbox2 = gtk_vbox_new (FALSE, 0); - gtk_widget_show (vbox2); - gtk_container_add (GTK_CONTAINER (vbox1), vbox2); - gtk_container_set_border_width (GTK_CONTAINER (vbox2), 0); + vbox3 = gtk_vbox_new (FALSE, 0); + gtk_widget_show (vbox3); + gtk_container_add (GTK_CONTAINER (vbox2), vbox3); + gtk_container_set_border_width (GTK_CONTAINER (vbox3), 0); PACK_CHECK_BUTTON - (vbox2, chkbtn_useaddrbook, + (vbox3, chkbtn_useaddrbook, _("Display sender using address book")); PACK_CHECK_BUTTON - (vbox2, chkbtn_threadsubj, + (vbox3, chkbtn_threadsubj, _("Thread using subject in addition to standard headers")); PACK_VSPACER(vbox2, vbox3, VSPACING_NARROW_2); hbox1 = gtk_hbox_new (FALSE, 8); gtk_widget_show (hbox1); - gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (vbox3), hbox1, FALSE, TRUE, 0); label_datefmt = gtk_label_new (_("Date format")); gtk_widget_show (label_datefmt); @@ -799,7 +799,7 @@ void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window, PACK_VSPACER(vbox2, vbox3, VSPACING_NARROW); - PACK_FRAME(vbox2, frame_dispitem, _("Set displayed columns")); + PACK_FRAME(vbox3, frame_dispitem, _("Set displayed columns")); hbox_dispitem = gtk_hbox_new (FALSE, 8); gtk_widget_show (hbox_dispitem); @@ -822,9 +822,9 @@ void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window, G_CALLBACK (prefs_summary_column_open), NULL); - vbox2 = gtk_vbox_new (FALSE, 0); - gtk_widget_show (vbox2); - gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0); + vbox4 = gtk_vbox_new (FALSE, 0); + gtk_widget_show (vbox4); + gtk_box_pack_start (GTK_BOX (vbox1), vbox4, FALSE, FALSE, 0); /* PACK_CHECK_BUTTON (vbox2, checkbtn_emacs, _("Emulate the behavior of mouse operation of\n" @@ -832,26 +832,10 @@ void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window, gtk_label_set_justify (GTK_LABEL (GTK_BIN (checkbtn_emacs)->child), GTK_JUSTIFY_LEFT); */ - PACK_CHECK_BUTTON - (vbox2, checkbtn_always_show_msg, - _("Always open message when selected")); - - PACK_CHECK_BUTTON - (vbox2, checkbtn_mark_as_read_on_newwin, - _("Only mark message as read when opened in new window")); - - PACK_CHECK_BUTTON - (vbox2, checkbtn_openinbox, - _("Go to inbox after receiving new mail")); - - vbox3 = gtk_vbox_new (FALSE, 0); - gtk_widget_show (vbox3); - gtk_box_pack_start (GTK_BOX (vbox2), vbox3, FALSE, FALSE, 0); - immedexec_tooltip = gtk_tooltips_new(); PACK_CHECK_BUTTON - (vbox3, checkbtn_immedexec, + (vbox4, checkbtn_immedexec, _("Execute immediately when moving or deleting messages")); gtk_tooltips_set_tip(GTK_TOOLTIPS(immedexec_tooltip), checkbtn_immedexec, _("Messages will be marked until execution" @@ -859,12 +843,20 @@ void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window, NULL); PACK_CHECK_BUTTON - (vbox3, checkbtn_ask_mark_all_read, + (vbox4, checkbtn_ask_mark_all_read, _("Confirm before marking all mails in a folder as read")); + PACK_CHECK_BUTTON + (vbox4, checkbtn_always_show_msg, + _("Always open message when selected")); + + PACK_CHECK_BUTTON + (vbox4, checkbtn_mark_as_read_on_newwin, + _("Only mark message as read when opened in a new window")); + hbox1 = gtk_hbox_new (FALSE, 0); gtk_widget_show (hbox1); - gtk_box_pack_start (GTK_BOX (vbox3), hbox1, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (vbox4), hbox1, FALSE, FALSE, 0); hbox_select_on_entry = gtk_hbox_new (FALSE, 8); gtk_widget_show (hbox_select_on_entry); @@ -910,13 +902,13 @@ void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window, gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu_nextunreadmsgdialog), menu); - hbox1 = gtk_hbox_new (FALSE, 8); - gtk_widget_show (hbox1); - gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0); + hbox2 = gtk_hbox_new (FALSE, 8); + gtk_widget_show (hbox2); + gtk_box_pack_start (GTK_BOX (vbox1), hbox2, FALSE, FALSE, 0); button_keybind = gtk_button_new_with_label (_(" Set key bindings... ")); gtk_widget_show (button_keybind); - gtk_box_pack_start (GTK_BOX (hbox1), button_keybind, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (hbox2), button_keybind, FALSE, FALSE, 0); g_signal_connect (G_OBJECT (button_keybind), "clicked", G_CALLBACK (prefs_keybind_select), NULL); @@ -940,8 +932,6 @@ void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window, prefs_common.always_show_msg); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_mark_as_read_on_newwin), prefs_common.mark_as_read_on_new_window); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_openinbox), - prefs_common.open_inbox_on_inc); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_immedexec), prefs_common.immediate_exec); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_ask_mark_all_read), @@ -961,7 +951,6 @@ void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window, prefs_summaries->checkbtn_always_show_msg = checkbtn_always_show_msg; prefs_summaries->checkbtn_mark_as_read_on_newwin = checkbtn_mark_as_read_on_newwin; - prefs_summaries->checkbtn_openinbox = checkbtn_openinbox; prefs_summaries->checkbtn_immedexec = checkbtn_immedexec; prefs_summaries->checkbtn_ask_mark_all_read = checkbtn_ask_mark_all_read; prefs_summaries->optmenu_select_on_entry = optmenu_select_on_entry; @@ -995,8 +984,6 @@ void prefs_summaries_save(PrefsPage *_page) GTK_TOGGLE_BUTTON(page->checkbtn_always_show_msg)); prefs_common.mark_as_read_on_new_window = gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(page->checkbtn_mark_as_read_on_newwin)); - prefs_common.open_inbox_on_inc = gtk_toggle_button_get_active( - GTK_TOGGLE_BUTTON(page->checkbtn_openinbox)); prefs_common.immediate_exec = gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(page->checkbtn_immedexec)); prefs_common.ask_mark_all_read = gtk_toggle_button_get_active(