+2007-01-13 [colin] 2.7.0cvs21
+
+ * src/prefs_account.c
+ * src/prefs_compose_writing.c
+ * src/prefs_message.c
+ * src/prefs_msg_colors.c
+ * src/prefs_other.c
+ * src/prefs_receive.c
+ * src/prefs_spelling.c
+ * src/prefs_summaries.c
+ * src/prefs_themes.c
+ * src/gtk/gtkutils.c
+ * src/gtk/gtkutils.h
+ * src/plugins/pgpcore/prefs_gpg.c
+ * src/plugins/spamassassin/spamassassin_gtk.c
+ Factorize gtk frame creation
+ Patch by Pawel
+
2007-01-13 [colin] 2.7.0cvs20
* src/message_search.c
( cvs diff -u -r 1.1.2.33 -r 1.1.2.34 commitHelper; ) > 2.7.0cvs18.patchset
( cvs diff -u -r 1.1.4.64 -r 1.1.4.65 src/etpan/imap-thread.c; ) > 2.7.0cvs19.patchset
( cvs diff -u -r 1.3.12.22 -r 1.3.12.23 src/message_search.c; cvs diff -u -r 1.94.2.117 -r 1.94.2.118 src/messageview.c; cvs diff -u -r 1.15.2.42 -r 1.15.2.43 src/summary_search.c; ) > 2.7.0cvs20.patchset
+( cvs diff -u -r 1.105.2.78 -r 1.105.2.79 src/prefs_account.c; cvs diff -u -r 1.1.2.15 -r 1.1.2.16 src/prefs_compose_writing.c; cvs diff -u -r 1.1.2.21 -r 1.1.2.22 src/prefs_message.c; cvs diff -u -r 1.1.2.28 -r 1.1.2.29 src/prefs_msg_colors.c; cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/prefs_other.c; cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/prefs_receive.c; cvs diff -u -r 1.5.2.30 -r 1.5.2.31 src/prefs_spelling.c; cvs diff -u -r 1.1.2.33 -r 1.1.2.34 src/prefs_summaries.c; cvs diff -u -r 1.3.2.47 -r 1.3.2.48 src/prefs_themes.c; cvs diff -u -r 1.5.2.48 -r 1.5.2.49 src/gtk/gtkutils.c; cvs diff -u -r 1.4.2.29 -r 1.4.2.30 src/gtk/gtkutils.h; cvs diff -u -r 1.1.2.15 -r 1.1.2.16 src/plugins/pgpcore/prefs_gpg.c; cvs diff -u -r 1.23.2.33 -r 1.23.2.34 src/plugins/spamassassin/spamassassin_gtk.c; ) > 2.7.0cvs21.patchset
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=20
+EXTRA_VERSION=21
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
return button;
}
+GtkWidget *gtkut_get_options_frame(GtkWidget *box, GtkWidget **frame,
+ const gchar *frame_label)
+{
+ GtkWidget *vbox;
+
+ *frame = gtk_frame_new(frame_label);
+ gtk_widget_show(*frame);
+ gtk_box_pack_start(GTK_BOX(box), *frame, FALSE, TRUE, 0);
+ gtk_frame_set_label_align(GTK_FRAME(*frame), 0.01, 0.5);
+
+ vbox = gtk_vbox_new (FALSE, 4);
+ gtk_widget_show(vbox);
+ gtk_container_add(GTK_CONTAINER (*frame), vbox);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
+
+ return vbox;
+}
+
#if HAVE_LIBCOMPFACE
gint create_xpm_from_xface(gchar *xpm[], const gchar *xface)
{
GtkWidget *gtkut_get_browse_file_btn(const gchar *label);
GtkWidget *gtkut_get_browse_directory_btn(const gchar *label);
GtkWidget *gtkut_get_replace_btn(const gchar *label);
+GtkWidget *gtkut_get_options_frame(GtkWidget *box, GtkWidget **frame, const gchar *frame_label);
#if HAVE_LIBCOMPFACE
gint create_xpm_from_xface(gchar *xpm[], const gchar *xface);
GtkWidget *xface_get_from_header(const gchar *o_xface, GdkColor *background,
PACK_CHECK_BUTTON (vbox2, checkbtn_auto_check_signatures,
_("Automatically check signatures"));
- PACK_FRAME(vbox1, frame_passphrase, _("Passphrase"));
-
- vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW);
- gtk_widget_show (vbox2);
- gtk_container_add (GTK_CONTAINER (frame_passphrase), vbox2);
- gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8);
+ vbox2 = gtkut_get_options_frame(vbox1, &frame_passphrase, _("Passphrase"));
PACK_CHECK_BUTTON (vbox2, checkbtn_store_passphrase,
_("Store passphrase in memory"));
gtk_container_set_border_width (GTK_CONTAINER (vbox), VBOX_BORDER);
gtk_widget_show(vbox);
- PACK_FRAME (vbox, frame1, _("Sign key"));
-
- vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW);
- gtk_container_set_border_width (GTK_CONTAINER (vbox2), VBOX_BORDER);
- gtk_widget_show (vbox2);
- gtk_container_add (GTK_CONTAINER (frame1), vbox2);
+ vbox2 = gtkut_get_options_frame(vbox, &frame1, _("Sign key"));
hbox = gtk_hbox_new (FALSE, 5);
gtk_widget_show (hbox);
gtk_widget_show(enable_sa_checkbtn);
gtk_box_pack_start(GTK_BOX(vbox2), enable_sa_checkbtn, TRUE, TRUE, 0);
- PACK_FRAME(vbox2, frame_transport, _("Transport"));
- vbox_transport = gtk_vbox_new (FALSE, VSPACING_NARROW);
- gtk_widget_show (vbox_transport);
- gtk_container_add (GTK_CONTAINER (frame_transport), vbox_transport);
- gtk_container_set_border_width (GTK_CONTAINER (vbox_transport), 8);
+ vbox_transport = gtkut_get_options_frame(vbox2, &frame_transport, _("Transport"));
table_transport = gtk_table_new (3, 3, FALSE);
gtk_widget_show (table_transport);
GTK_EXPAND | GTK_SHRINK | GTK_FILL,
GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
- PACK_FRAME (vbox1, serv_frame, _("Server information"));
-
- vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW);
- gtk_widget_show (vbox2);
- gtk_container_add (GTK_CONTAINER (serv_frame), vbox2);
- gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8);
+ vbox2 = gtkut_get_options_frame(vbox1, &serv_frame, _("Server information"));
hbox = gtk_hbox_new (FALSE, 8);
gtk_widget_show (hbox);
gtk_container_add (GTK_CONTAINER (notebook), vbox1);
gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
- PACK_FRAME (vbox1, local_frame, _("Local"));
-
- local_vbox = gtk_vbox_new (FALSE, 0);
- gtk_widget_show (local_vbox);
- gtk_container_add (GTK_CONTAINER (local_frame), local_vbox);
- gtk_container_set_border_width (GTK_CONTAINER (local_vbox), VBOX_BORDER);
+ local_vbox = gtkut_get_options_frame(vbox1, &local_frame, _("Local"));
local_hbox = gtk_hbox_new (FALSE, 8);
gtk_widget_show (local_hbox);
G_CALLBACK (prefs_account_select_folder_cb),
local_inbox_entry);
- PACK_FRAME (vbox1, frame1, _("POP3"));
-
- vbox2 = gtk_vbox_new (FALSE, 0);
- gtk_widget_show (vbox2);
- gtk_container_add (GTK_CONTAINER (frame1), vbox2);
- gtk_container_set_border_width (GTK_CONTAINER (vbox2), VBOX_BORDER);
-
+ vbox2 = gtkut_get_options_frame(vbox1, &frame1, _("POP3"));
PACK_CHECK_BUTTON (vbox2, use_apop_chkbtn,
_("Use secure authentication (APOP)"));
G_CALLBACK (prefs_account_select_folder_cb),
inbox_entry);
- PACK_FRAME(vbox1, frame2, _("NNTP"));
-
- vbox2 = gtk_vbox_new (FALSE, 0);
- gtk_widget_show (vbox2);
- gtk_container_add (GTK_CONTAINER (frame2), vbox2);
- gtk_container_set_border_width (GTK_CONTAINER (vbox2), VBOX_BORDER);
+ vbox2 = gtkut_get_options_frame(vbox1, &frame2, _("NNTP"));
hbox2 = gtk_hbox_new (FALSE, 8);
gtk_widget_show (hbox2);
gtk_spin_button_set_numeric
(GTK_SPIN_BUTTON (maxarticle_spinbtn), TRUE);
- PACK_FRAME (vbox1, imap_frame, _("IMAP4"));
-
- vbox2 = gtk_vbox_new (FALSE, 0);
- gtk_widget_show (vbox2);
- gtk_container_add (GTK_CONTAINER (imap_frame), vbox2);
- gtk_container_set_border_width (GTK_CONTAINER (vbox2), VBOX_BORDER);
+ vbox2 = gtkut_get_options_frame(vbox1, &imap_frame, _("IMAP4"));
hbox1 = gtk_hbox_new (FALSE, 8);
gtk_widget_show (hbox1);
gtk_container_add (GTK_CONTAINER (notebook), vbox1);
gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
- PACK_FRAME (vbox1, frame, _("Header"));
-
- vbox2 = gtk_vbox_new (FALSE, 0);
- gtk_widget_show (vbox2);
- gtk_container_add (GTK_CONTAINER (frame), vbox2);
- gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8);
+ vbox2 = gtkut_get_options_frame(vbox1, &frame, _("Header"));
PACK_CHECK_BUTTON (vbox2, msgid_chkbtn, _("Generate Message-ID"));
SET_TOGGLE_SENSITIVITY (customhdr_chkbtn, customhdr_edit_btn);
- PACK_FRAME (vbox1, frame, _("Authentication"));
-
- vbox3 = gtk_vbox_new (FALSE, 0);
- gtk_widget_show (vbox3);
- gtk_container_add (GTK_CONTAINER (frame), vbox3);
- gtk_container_set_border_width (GTK_CONTAINER (vbox3), 8);
+ vbox3 = gtkut_get_options_frame(vbox1, &frame, _("Authentication"));
PACK_CHECK_BUTTON (vbox3, smtp_auth_chkbtn,
_("SMTP Authentication (SMTP AUTH)"));
gtk_container_add (GTK_CONTAINER (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);
+ vbox_sig = gtkut_get_options_frame(vbox1, &frame_sig, _("Signature"));
PACK_CHECK_BUTTON (vbox_sig, checkbtn_autosig,
_("Insert signature automatically"));
gtk_container_add (GTK_CONTAINER (notebook), vbox1);
gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
- PACK_FRAME (vbox1, pop_frame, _("POP3"));
- vbox2 = gtk_vbox_new (FALSE, 0);
- gtk_widget_show (vbox2);
- gtk_container_add (GTK_CONTAINER (pop_frame), vbox2);
- gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8);
+ vbox2 = gtkut_get_options_frame(vbox1, &pop_frame, _("POP3"));
CREATE_RADIO_BUTTONS(vbox2,
pop_nossl_radiobtn,
_("Use STARTTLS command to start SSL session"),
SSL_STARTTLS);
- PACK_FRAME (vbox1, imap_frame, _("IMAP4"));
- vbox3 = gtk_vbox_new (FALSE, 0);
- gtk_widget_show (vbox3);
- gtk_container_add (GTK_CONTAINER (imap_frame), vbox3);
- gtk_container_set_border_width (GTK_CONTAINER (vbox3), 8);
+ vbox3 = gtkut_get_options_frame(vbox1, &imap_frame, _("IMAP4"));
CREATE_RADIO_BUTTONS(vbox3,
imap_nossl_radiobtn,
_("Use STARTTLS command to start SSL session"),
SSL_STARTTLS);
- PACK_FRAME (vbox1, nntp_frame, _("NNTP"));
- vbox4 = gtk_vbox_new (FALSE, 0);
- gtk_widget_show (vbox4);
- gtk_container_add (GTK_CONTAINER (nntp_frame), vbox4);
- gtk_container_set_border_width (GTK_CONTAINER (vbox4), 8);
+ vbox4 = gtkut_get_options_frame(vbox1, &nntp_frame, _("NNTP"));
nntp_nossl_radiobtn =
gtk_radio_button_new_with_label (NULL, _("Don't use SSL"));
CREATE_RADIO_BUTTON(vbox4, nntp_ssltunnel_radiobtn, nntp_nossl_radiobtn,
_("Use SSL for NNTP connection"), SSL_TUNNEL);
- PACK_FRAME (vbox1, send_frame, _("Send (SMTP)"));
- vbox5 = gtk_vbox_new (FALSE, 0);
- gtk_widget_show (vbox5);
- gtk_container_add (GTK_CONTAINER (send_frame), vbox5);
- gtk_container_set_border_width (GTK_CONTAINER (vbox5), 8);
+ vbox5 = gtkut_get_options_frame(vbox1, &send_frame, _("Send (SMTP)"));
CREATE_RADIO_BUTTONS(vbox5,
smtp_nossl_radiobtn,
/* special folder setting (maybe these options are redundant) */
- PACK_FRAME (vbox1, folder_frame, _("Folder"));
-
- vbox3 = gtk_vbox_new (FALSE, 0);
- gtk_widget_show (vbox3);
- gtk_container_add (GTK_CONTAINER (folder_frame), vbox3);
- gtk_container_set_border_width (GTK_CONTAINER (vbox3), 8);
+ vbox3 = gtkut_get_options_frame(vbox1, &folder_frame, _("Folder"));
table = gtk_table_new (4, 3, FALSE);
gtk_widget_show (table);
PACK_CHECK_BUTTON (hbox_autosel, checkbtn_reedit_account_autosel,
_("when re-editing"));
- PACK_FRAME(vbox1, frame, _("Forwarding"));
-
- vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW);
- gtk_widget_show (vbox2);
- gtk_container_add (GTK_CONTAINER (frame), vbox2);
- gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8);
+ vbox2 = gtkut_get_options_frame(vbox1, &frame, _("Forwarding"));
PACK_CHECK_BUTTON (vbox2, checkbtn_forward_as_attachment,
_("Forward as attachment"));
PACK_CHECK_BUTTON (vbox2, checkbtn_redirect_keep_from,
_("Keep the original 'From' header when redirecting"));
- PACK_FRAME(vbox1, frame, _("Editing"));
-
- vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW);
- gtk_widget_show (vbox2);
- gtk_container_add (GTK_CONTAINER (frame), vbox2);
- gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8);
+ vbox2 = gtkut_get_options_frame(vbox1, &frame, _("Editing"));
PACK_CHECK_BUTTON (vbox2, checkbtn_autoextedit,
_("Automatically launch the external editor"));
PACK_CHECK_BUTTON (vbox1, checkbtn_compose_with_format,
_("Use format when composing new messages"));
- PACK_FRAME (vbox1, frame_format, _("New message format"));
-
- vbox_format = gtk_vbox_new (FALSE, VSPACING_NARROW);
- gtk_widget_show (vbox_format);
- gtk_container_add (GTK_CONTAINER (frame_format), vbox_format);
- gtk_container_set_border_width (GTK_CONTAINER (vbox_format), 8);
+ vbox_format = gtkut_get_options_frame(vbox1, &frame_format, _("New message format"));
hbox_format = gtk_hbox_new (FALSE, 8);
gtk_widget_show (hbox_format);
gtk_widget_show (vbox1);
gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
- PACK_FRAME(vbox1, frame, _("Headers"));
-
- vbox2 = gtk_vbox_new (FALSE, 0);
- gtk_widget_show (vbox2);
- gtk_container_add(GTK_CONTAINER(frame), vbox2);
- gtk_container_set_border_width(GTK_CONTAINER(vbox2), 8);
+ vbox2 = gtkut_get_options_frame(vbox1, &frame, _("Headers"));
PACK_CHECK_BUTTON(vbox2, chkbtn_disphdrpane,
_("Display header pane above message view"));
SET_TOGGLE_SENSITIVITY(chkbtn_disphdr, button_edit_disphdr);
- PACK_FRAME(vbox1, frame, _("HTML messages"));
-
- vbox2 = gtk_vbox_new (FALSE, 0);
- gtk_widget_show (vbox2);
- gtk_container_add(GTK_CONTAINER(frame), vbox2);
- gtk_container_set_border_width(GTK_CONTAINER(vbox2), 8);
+ vbox2 = gtkut_get_options_frame(vbox1, &frame, _("HTML messages"));
PACK_CHECK_BUTTON(vbox2, chkbtn_html,
_("Render HTML messages as text"));
gtk_box_pack_start (GTK_BOX (hbox_linespc), label_linespc,
FALSE, FALSE, 0);
- PACK_FRAME(vbox1, frame, _("Scroll"));
-
- vbox_scr = gtk_vbox_new (FALSE, 0);
- gtk_widget_show (vbox_scr);
- gtk_container_add (GTK_CONTAINER (frame), vbox_scr);
- gtk_container_set_border_width (GTK_CONTAINER (vbox_scr), 8);
+ vbox_scr = gtkut_get_options_frame(vbox1, &frame, _("Scroll"));
PACK_CHECK_BUTTON(vbox_scr, chkbtn_halfpage, _("Half page"));
gtk_widget_show (vbox1);
gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
- PACK_FRAME(vbox1, frame_msg, _("Message view"));
-
- vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW);
- gtk_widget_show (vbox2);
- gtk_container_add (GTK_CONTAINER (frame_msg), vbox2);
- gtk_container_set_border_width (GTK_CONTAINER (vbox2), VBOX_BORDER);
-
+ vbox2 = gtkut_get_options_frame(vbox1, &frame_msg, _("Message view"));
hbox = gtk_hbox_new(FALSE, 8);
gtk_widget_show (hbox);
PACK_CHECK_BUTTON (hbox, chkbtn_enable_colors,
_("Enable coloration of message text"));
- PACK_FRAME(vbox2, frame_quote, _("Quote"));
-
- vbox3 = gtk_vbox_new (FALSE, VSPACING_NARROW);
- gtk_widget_show (vbox3);
- gtk_container_add (GTK_CONTAINER (frame_quote), vbox3);
- gtk_container_set_border_width (GTK_CONTAINER (vbox3), VBOX_BORDER);
+ vbox3 = gtkut_get_options_frame(vbox2, &frame_quote, _("Quote"));
gtk_box_pack_start (GTK_BOX (vbox3), hbox_quote, FALSE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (hbox_quote), vbox_quotefg, FALSE, TRUE, 0);
gtk_box_pack_start (GTK_BOX(hbox), label_signature, FALSE, FALSE, 0);
SET_TOGGLE_SENSITIVITY(chkbtn_enable_colors, label_signature);
- PACK_FRAME(vbox1, frame_folder, _("Folder list"));
-
- vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW);
- gtk_widget_show (vbox2);
- gtk_container_add (GTK_CONTAINER (frame_folder), vbox2);
- gtk_container_set_border_width (GTK_CONTAINER (vbox2), VBOX_BORDER);
+ vbox2 = gtkut_get_options_frame(vbox1, &frame_folder, _("Folder list"));
hbox = gtk_hbox_new(FALSE, 8);
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX(hbox), label_color_new, FALSE, FALSE, 0);
/* custom colors */
- PACK_FRAME (vbox1, frame_custom_colors, _("Color labels"));
-
- vbox_color_labels = gtk_vbox_new (FALSE, VSPACING_NARROW);
- gtk_widget_show (vbox_color_labels);
- gtk_container_add (GTK_CONTAINER (frame_custom_colors), vbox_color_labels);
- gtk_container_set_border_width (GTK_CONTAINER (vbox_color_labels), VBOX_BORDER);
+ vbox_color_labels = gtkut_get_options_frame(vbox1,
+ &frame_custom_colors, _("Color labels"));
vbox_custom_colors = gtk_vbox_new (FALSE, VSPACING_NARROW);
gtk_widget_show (vbox_custom_colors);
gtk_widget_show (vbox1);
gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
- 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);
+ vbox_addr = gtkut_get_options_frame(vbox1, &frame_addr, _("Address book"));
PACK_CHECK_BUTTON
(vbox_addr, checkbtn_addaddrbyclick,
_("Add address to destination when double-clicked"));
/* Clip Log */
- PACK_FRAME (vbox1, frame_cliplog, _("Log Size"));
+ vbox_cliplog = gtkut_get_options_frame(vbox1, &frame_cliplog, _("Log Size"));
- vbox_cliplog = gtk_vbox_new (FALSE, 0);
- gtk_widget_show (vbox_cliplog);
- gtk_container_add (GTK_CONTAINER (frame_cliplog), vbox_cliplog);
- gtk_container_set_border_width (GTK_CONTAINER (vbox_cliplog), 8);
PACK_CHECK_BUTTON (vbox_cliplog, checkbtn_cliplog,
_("Clip the log size"));
hbox_cliplog = gtk_hbox_new (FALSE, 8);
SET_TOGGLE_SENSITIVITY(checkbtn_cliplog, label);
/* On Exit */
- PACK_FRAME (vbox1, frame_exit, _("On exit"));
-
- 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);
+ vbox_exit = gtkut_get_options_frame(vbox1, &frame_exit, _("On exit"));
PACK_CHECK_BUTTON (vbox_exit, checkbtn_confonexit,
_("Confirm on exit"));
gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
/* Use of external incorporation program */
- PACK_FRAME(vbox1, frame, _("External incorporation program"));
- vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW);
- gtk_widget_show (vbox2);
- gtk_container_add(GTK_CONTAINER(frame), vbox2);
- gtk_container_set_border_width(GTK_CONTAINER(vbox2), 8);
+ vbox2 = gtkut_get_options_frame(vbox1, &frame, _("External incorporation program"));
PACK_CHECK_BUTTON (vbox2, checkbtn_incext,
_("Use external program for receiving mail"));
gtk_box_pack_start (GTK_BOX (hbox), entry_incext, TRUE, TRUE, 0);
/* Auto-checking */
- PACK_FRAME(vbox1, frame, _("Automatic checking"));
- vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW);
- gtk_widget_show (vbox2);
- gtk_container_add(GTK_CONTAINER(frame), vbox2);
- gtk_container_set_border_width(GTK_CONTAINER(vbox2), 8);
+ vbox2 = gtkut_get_options_frame(vbox1, &frame, _("Automatic checking"));
hbox_autochk = gtk_hbox_new (FALSE, 8);
gtk_widget_show (hbox_autochk);
_("Check for new mail on startup"));
/* receive dialog */
- PACK_FRAME(vbox1, frame, _("Dialogs"));
- vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW);
- gtk_widget_show (vbox2);
- gtk_container_add (GTK_CONTAINER (frame), vbox2);
- gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8);
+ vbox2 = gtkut_get_options_frame(vbox1, &frame, _("Dialogs"));
label_recvdialog = gtk_label_new (_("Show receive dialog"));
gtk_misc_set_alignment(GTK_MISC(label_recvdialog), 0, 0.5);
PACK_CHECK_BUTTON (vbox2, checkbtn_no_recv_err_panel,
_("Don't popup error dialog on receive error"));
- PACK_FRAME(vbox1, frame, _("After receiving new mail"));
- vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW);
- gtk_widget_show (vbox2);
- gtk_container_add (GTK_CONTAINER (frame), vbox2);
- gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8);
+ vbox2 = gtkut_get_options_frame(vbox1, &frame, _("After receiving new mail"));
PACK_CHECK_BUTTON (vbox2, checkbtn_openinbox, _("Go to inbox"));
PACK_CHECK_BUTTON (vbox2, checkbtn_scan_after_inc,
_("Update all local folders"));
- PACK_FRAME(vbox2, frame, _("Run command"));
- vbox3 = gtk_vbox_new (FALSE, VSPACING_NARROW);
- gtk_widget_show (vbox3);
- gtk_container_add (GTK_CONTAINER (frame), vbox3);
- gtk_container_set_border_width (GTK_CONTAINER (vbox3), 4);
+ vbox3 = gtkut_get_options_frame(vbox2, &frame, _("Run command"));
hbox = gtk_hbox_new (TRUE, 8);
gtk_widget_show (hbox);
gtk_widget_show(aspell_path_select);
gtk_box_pack_start(GTK_BOX(aspell_path_hbox), aspell_path_select, FALSE, FALSE, 0);
- PACK_FRAME(vbox1, automatic_frame, _("Automatic spelling"));
- vbox2 = gtk_vbox_new(FALSE, VSPACING_NARROW);
- gtk_widget_show(vbox2);
- gtk_container_add(GTK_CONTAINER(automatic_frame), vbox2);
- gtk_container_set_border_width(GTK_CONTAINER(vbox2), 8);
+ vbox2 = gtkut_get_options_frame(vbox1, &automatic_frame, _("Automatic spelling"));
check_while_typing_checkbtn = gtk_check_button_new_with_label(
_("Check while typing"));
gtk_widget_show(recheck_when_changing_dict_checkbtn);
gtk_box_pack_start(GTK_BOX(vbox2), recheck_when_changing_dict_checkbtn, TRUE, TRUE, 0);
- PACK_FRAME(vbox1, dictionary_frame, _("Dictionary"));
- vbox2 = gtk_vbox_new(TRUE, VSPACING_NARROW);
- gtk_widget_show(vbox2);
- gtk_container_add(GTK_CONTAINER(dictionary_frame), vbox2);
+ vbox2 = gtkut_get_options_frame(vbox1, &dictionary_frame, _("Dictionary"));
table = gtk_table_new(6, 4, FALSE);
gtk_widget_show(table);
gtk_widget_show (vbox1);
gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
- PACK_FRAME(vbox1, folderview_frame, _("Folder list"));
- vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW);
- gtk_widget_show (vbox2);
- gtk_container_add(GTK_CONTAINER(folderview_frame), vbox2);
- gtk_container_set_border_width(GTK_CONTAINER(vbox2), 8);
+ vbox2 = gtkut_get_options_frame(vbox1, &folderview_frame, _("Folder list"));
PACK_CHECK_BUTTON (vbox2, chkbtn_folder_unread,
_("Display unread number next to folder name"));
G_CALLBACK (prefs_folder_column_open),
NULL);
- PACK_FRAME(vbox1, summaryview_frame, _("Message list"));
- vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW);
- gtk_widget_show (vbox2);
- gtk_container_add(GTK_CONTAINER (summaryview_frame), vbox2);
- gtk_container_set_border_width(GTK_CONTAINER(vbox2), 8);
+ vbox2 = gtkut_get_options_frame(vbox1, &summaryview_frame, _("Message list"));
hbox1 = gtk_hbox_new (FALSE, 10);
gtk_widget_show (hbox1);
gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
gtk_widget_show (vbox1);
- PACK_FRAME (vbox1, frame1, _("Selector"));
-
- vbox2 = gtk_vbox_new (FALSE, VSPACING);
- gtk_container_set_border_width (GTK_CONTAINER (vbox2), VBOX_BORDER);
- gtk_widget_show (vbox2);
- gtk_container_add (GTK_CONTAINER (frame1), vbox2);
+ vbox2 = gtkut_get_options_frame(vbox1, &frame1, _("Selector"));
hbox3 = gtk_hbox_new (FALSE, 5);
gtk_widget_show (hbox3);