From 0c0734816c476467965d2cda018eb5a7d0add2db Mon Sep 17 00:00:00 2001 From: Paul Mangan Date: Sun, 9 Sep 2001 14:00:28 +0000 Subject: [PATCH] sync with sylpheed 0.6.1cvs3 --- ChangeLog | 6 ++++++ ChangeLog.claws | 7 +++++++ ChangeLog.jp | 6 ++++++ configure.in | 2 +- src/prefs.c | 4 +--- src/prefs.h | 16 +++++++++++++++- src/prefs_account.c | 37 ++++++++++++++++--------------------- src/prefs_common.c | 41 +++++++++++++++++++---------------------- 8 files changed, 71 insertions(+), 48 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1269f8b9c..f2ba09768 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2001-09-08 + + * src/prefs.[ch] + src/prefs_common.c + src/prefs_account.c: modified the layout. + 2001-09-06 * src/Makefile.am: added extra xpm's. diff --git a/ChangeLog.claws b/ChangeLog.claws index e9639a7ab..ffa3f5f9d 100644 --- a/ChangeLog.claws +++ b/ChangeLog.claws @@ -1,3 +1,10 @@ +2001-09-09 [paul] + + * configure.in + change to version 0.6.1claws2 + + * sync with sylpheed 0.6.1cvs3 + 2001-09-09 [alfons] * src/folderview.c diff --git a/ChangeLog.jp b/ChangeLog.jp index f794384e9..e103a8400 100644 --- a/ChangeLog.jp +++ b/ChangeLog.jp @@ -1,3 +1,9 @@ +2001-09-08 + + * src/prefs.[ch] + src/prefs_common.c + src/prefs_account.c: ¥ì¥¤¥¢¥¦¥È¤ò½¤Àµ¡£ + 2001-09-06 * src/Makefile.am: »Ä¤ê¤Î xpm ¤òÄɲᣠdiff --git a/configure.in b/configure.in index 1fd2f12bc..2d8c069c5 100644 --- a/configure.in +++ b/configure.in @@ -8,7 +8,7 @@ MINOR_VERSION=6 MICRO_VERSION=1 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=claws1 +EXTRA_VERSION=claws2 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION dnl diff --git a/src/prefs.c b/src/prefs.c index 470580638..0cee33eb0 100644 --- a/src/prefs.c +++ b/src/prefs.c @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999,2000 Hiroyuki Yamamoto + * Copyright (C) 1999-2001 Hiroyuki Yamamoto * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -39,8 +39,6 @@ typedef enum DUMMY_PARAM } DummyEnum; -#define PREFSBUFSIZE 1024 - void prefs_read_config(PrefParam *param, const gchar *label, const gchar *rcfile) { diff --git a/src/prefs.h b/src/prefs.h index a11479518..256105c76 100644 --- a/src/prefs.h +++ b/src/prefs.h @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999,2000 Hiroyuki Yamamoto + * Copyright (C) 1999-2001 Hiroyuki Yamamoto * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -35,6 +35,13 @@ typedef struct _PrefsDialog PrefsDialog; #include "account.h" +#define VSPACING 12 +#define VSPACING_NARROW 4 +#define VSPACING_NARROW_2 2 +#define VBOX_BORDER 16 +#define DEFAULT_ENTRY_WIDTH 80 +#define PREFSBUFSIZE 1024 + typedef enum { P_STRING, @@ -108,6 +115,13 @@ struct _PrefsDialog gtk_frame_set_label_align(GTK_FRAME(frame), 0.01, 0.5); \ } +#define PACK_VSPACER(box, vbox, spacing) \ +{ \ + vbox = gtk_vbox_new(FALSE, 0); \ + gtk_widget_show(vbox); \ + gtk_box_pack_start(GTK_BOX(box), vbox, FALSE, TRUE, spacing); \ +} + #define SET_TOGGLE_SENSITIVITY(togglewid, targetwid) \ { \ gtk_widget_set_sensitive(targetwid, FALSE); \ diff --git a/src/prefs_account.c b/src/prefs_account.c index c673fbbb0..0ed4ba3d5 100644 --- a/src/prefs_account.c +++ b/src/prefs_account.c @@ -159,8 +159,8 @@ static void prefs_account_protocol_set_data_from_optmenu(PrefParam *pparam); static void prefs_account_protocol_set_optmenu (PrefParam *pparam); static void prefs_account_protocol_activated (GtkMenuItem *menuitem); #if USE_GPGME || USE_SSL -static void prefs_account_enum_set_data_from_radiobtn (PrefParam *pparam); -static void prefs_account_enum_set_radiobtn (PrefParam *pparam); +static void prefs_account_enum_set_data_from_radiobtn (PrefParam *pparam); +static void prefs_account_enum_set_radiobtn (PrefParam *pparam); #endif /* USE_GPGME || USE_SSL */ static void prefs_account_nntpauth_toggled(GtkToggleButton *button, @@ -384,11 +384,6 @@ static void prefs_account_ok (void); static gint prefs_account_apply (void); static void prefs_account_cancel (void); -#define VSPACING 12 -#define VSPACING_NARROW 3 -#define BOX_BORDER 16 -#define DEFAULT_ENTRY_WIDTH 80 - void prefs_account_read_config(PrefsAccount *ac_prefs, const gchar *label) { const gchar *p = label; @@ -671,7 +666,7 @@ static void prefs_account_basic_create(void) 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), BOX_BORDER); + gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER); hbox = gtk_hbox_new (FALSE, 8); gtk_widget_show (hbox); @@ -943,11 +938,11 @@ static void prefs_account_receive_create(void) 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), BOX_BORDER); + gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER); PACK_FRAME (vbox1, frame1, _("POP3")); - vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW); + 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), 8); @@ -1017,11 +1012,11 @@ static void prefs_account_send_create(void) 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), BOX_BORDER); + gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER); PACK_FRAME (vbox1, frame, _("Header")); - vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW); + 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); @@ -1052,7 +1047,7 @@ static void prefs_account_send_create(void) gtk_widget_show (table); gtk_container_add (GTK_CONTAINER (frame2), table); gtk_container_set_border_width (GTK_CONTAINER (table), 8); - gtk_table_set_row_spacings (GTK_TABLE (table), VSPACING_NARROW); + gtk_table_set_row_spacings (GTK_TABLE (table), VSPACING_NARROW_2); gtk_table_set_col_spacings (GTK_TABLE (table), 8); autocc_chkbtn = gtk_check_button_new_with_label (_("Cc")); @@ -1096,7 +1091,7 @@ static void prefs_account_send_create(void) PACK_FRAME (vbox1, frame3, _("Authentication")); - vbox3 = gtk_vbox_new (FALSE, VSPACING_NARROW); + vbox3 = gtk_vbox_new (FALSE, 0); gtk_widget_show (vbox3); gtk_container_add (GTK_CONTAINER (frame3), vbox3); gtk_container_set_border_width (GTK_CONTAINER (vbox3), 8); @@ -1132,7 +1127,7 @@ static void prefs_account_compose_create(void) 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), BOX_BORDER); + gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER); hbox = gtk_hbox_new (FALSE, 8); gtk_widget_show (hbox); @@ -1165,7 +1160,7 @@ static void prefs_account_privacy_create(void) 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), BOX_BORDER); + gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER); PACK_FRAME (vbox1, frame1, _("Sign key")); @@ -1246,11 +1241,11 @@ static void prefs_account_ssl_create(void) 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), BOX_BORDER); + gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER); PACK_FRAME (vbox1, receive_frame, _("Receive")); - vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW); + vbox2 = gtk_vbox_new (FALSE, 0); gtk_widget_show (vbox2); gtk_container_add (GTK_CONTAINER (receive_frame), vbox2); gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8); @@ -1262,7 +1257,7 @@ static void prefs_account_ssl_create(void) PACK_FRAME (vbox1, send_frame, _("Send (SMTP)")); - vbox3 = gtk_vbox_new (FALSE, VSPACING_NARROW); + vbox3 = gtk_vbox_new (FALSE, 0); gtk_widget_show (vbox3); gtk_container_add (GTK_CONTAINER (send_frame), vbox3); gtk_container_set_border_width (GTK_CONTAINER (vbox3), 8); @@ -1341,9 +1336,9 @@ static void prefs_account_advanced_create(void) 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), BOX_BORDER); + gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER); - vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW); + vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW_2); gtk_widget_show (vbox2); gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0); diff --git a/src/prefs_common.c b/src/prefs_common.c index 1b3f48bd4..1c97a3054 100644 --- a/src/prefs_common.c +++ b/src/prefs_common.c @@ -630,13 +630,6 @@ static PrefParam param[] = { {NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL} }; -#define VSPACING 12 -#define VSPACING_NARROW 3 - -#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); @@ -900,7 +893,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); @@ -1040,7 +1033,7 @@ static void prefs_send_create(void) 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); @@ -1511,11 +1504,11 @@ static void prefs_display_create(void) 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 *vbox3; GtkWidget *button_dispitem; GtkWidget *tmplabel, *tmpbutton, *tmpentry; @@ -1610,7 +1603,7 @@ static void prefs_display_create(void) GTK_SIGNAL_FUNC(prefs_font_select), 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); @@ -1625,7 +1618,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); @@ -1644,6 +1637,8 @@ static void prefs_display_create(void) (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); gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, TRUE, 0); @@ -1663,10 +1658,7 @@ static void prefs_display_create(void) gtk_signal_connect (GTK_OBJECT (button_datefmt), "clicked", GTK_SIGNAL_FUNC (date_format_create), NULL); - /* spacer */ - vbox3 = gtk_vbox_new (FALSE, VSPACING_NARROW); - gtk_widget_show (vbox3); - gtk_box_pack_start (GTK_BOX (vbox2), vbox3, FALSE, TRUE, 0); + PACK_VSPACER(vbox2, vbox3, VSPACING_NARROW); hbox1 = gtk_hbox_new (FALSE, 8); gtk_widget_show (hbox1); @@ -1698,6 +1690,7 @@ static void prefs_message_create(void) { GtkWidget *vbox1; GtkWidget *vbox2; + GtkWidget *vbox3; GtkWidget *hbox1; GtkWidget *chkbtn_enablecol; GtkWidget *button_edit_col; @@ -1743,7 +1736,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); @@ -1770,6 +1763,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); @@ -1801,7 +1796,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); @@ -1874,7 +1869,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); @@ -2007,7 +2002,7 @@ static void prefs_interface_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); @@ -2043,6 +2038,8 @@ 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); @@ -2066,7 +2063,7 @@ static void prefs_interface_create(void) PACK_FRAME (vbox1, frame_addr, _("Address book")); - vbox_addr = gtk_vbox_new (FALSE, VSPACING_NARROW); + 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); @@ -2099,7 +2096,7 @@ static void prefs_interface_create(void) /* 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); -- 2.25.1