2007-11-19 [wwp] 3.1.0cvs2
authorTristan Chabredier <wwp@claws-mail.org>
Mon, 19 Nov 2007 14:23:03 +0000 (14:23 +0000)
committerTristan Chabredier <wwp@claws-mail.org>
Mon, 19 Nov 2007 14:23:03 +0000 (14:23 +0000)
* src/compose.c
* src/compose.h
* src/prefs_logging.c
* src/prefs_summaries.c
GUI improvements, thanks to Pawel Pekala <c0rn@o2.pl>:
wrap some long label in prefs/summaries, layout checkboxes
in a more compact form in prefs/loggin, make account and
header's combos have the same size/spacing in compose
window.

ChangeLog
PATCHSETS
configure.ac
src/compose.c
src/compose.h
src/prefs_logging.c
src/prefs_summaries.c

index e97e3ac8b7ca76cfe919c08c3b863a2cf6ea2f75..79eb56355e00d3ef5bd2b9a663385ea655d17cbd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2007-11-19 [wwp]       3.1.0cvs2
+
+       * src/compose.c
+       * src/compose.h
+       * src/prefs_logging.c
+       * src/prefs_summaries.c
+               GUI improvements, thanks to Pawel Pekala <c0rn@o2.pl>:
+               wrap some long label in prefs/summaries, layout checkboxes
+               in a more compact form in prefs/loggin, make account and
+               header's combos have the same size/spacing in compose
+               window.
+
 2007-11-19 [wwp]       3.1.0cvs1
 
        * src/edittags.c
index d3e3e2f7ed2a507442f5d5ee97eaf2ff71161e20..714cde2c4b8c52081aa31f10135da56bacf75f4d 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.60.2.46 -r 1.60.2.47 po/es.po;  ) > 3.0.2cvs144.patchset
 ( cvs diff -u -r 1.58.2.33 -r 1.58.2.34 po/de.po;  cvs diff -u -r 1.1.2.15 -r 1.1.2.16 po/fi.po;  cvs diff -u -r 1.42.2.33 -r 1.42.2.34 po/fr.po;  cvs diff -u -r 1.5.2.7 -r 1.5.2.8 po/hu.po;  cvs diff -u -r 1.34.2.23 -r 1.34.2.24 po/it.po;  cvs diff -u -r 1.10.2.14 -r 1.10.2.15 po/pl.po;  cvs diff -u -r 1.50.2.27 -r 1.50.2.28 po/pt_BR.po;  cvs diff -u -r 1.2.2.26 -r 1.2.2.27 po/sk.po;  cvs diff -u -r 1.5.2.25 -r 1.5.2.26 po/zh_CN.po;  ) > 3.0.2cvs145.patchset
 ( cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/edittags.c;  ) > 3.1.0cvs1.patchset
+( cvs diff -u -r 1.382.2.421 -r 1.382.2.422 src/compose.c;  cvs diff -u -r 1.50.2.43 -r 1.50.2.44 src/compose.h;  cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/prefs_logging.c;  cvs diff -u -r 1.1.2.47 -r 1.1.2.48 src/prefs_summaries.c;  ) > 3.1.0cvs2.patchset
index 8b85061e9cb61bdfb4f21487396391295f2f3c52..3e09e90aeec756cf3737830259c36b062255ac82 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=1
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=1
+EXTRA_VERSION=2
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index eb27cb5697fe093e6a54083f0f7b4cb8bc55872c..eaa7eb3656f5e3622fd0a938b8bbf04e7cac5848 100644 (file)
@@ -6035,6 +6035,7 @@ static void compose_create_header_entry(Compose *compose)
 
        /* Combo box */
        combo = gtk_combo_box_entry_new_text();
+       gtk_size_group_add_widget(compose->size_group, combo);
        string = headers; 
        while(*string != NULL) {
                gtk_combo_box_append_text(GTK_COMBO_BOX(combo),
@@ -6157,6 +6158,8 @@ static GtkWidget *compose_create_header(Compose *compose)
 
        gint count = 0;
 
+       compose->size_group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
+
        /* header labels and entries */
        header_scrolledwin = gtk_scrolled_window_new(NULL, NULL);
        gtk_widget_show(header_scrolledwin);
@@ -6165,6 +6168,7 @@ static GtkWidget *compose_create_header(Compose *compose)
        header_table = gtk_table_new(2, 2, FALSE);
        gtk_widget_show(header_table);
        gtk_container_set_border_width(GTK_CONTAINER(header_table), BORDER_WIDTH);
+       gtk_table_set_col_spacings(GTK_TABLE(header_table), 6);
        gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(header_scrolledwin), header_table);
        gtk_viewport_set_shadow_type(GTK_VIEWPORT(GTK_BIN(header_scrolledwin)->child), GTK_SHADOW_NONE);
        count = 0;
@@ -6956,6 +6960,7 @@ static GtkWidget *compose_account_option_menu_create(Compose *compose)
 
        optmenubox = gtk_event_box_new();
        optmenu = gtkut_sc_combobox_create(optmenubox, FALSE);
+       gtk_size_group_add_widget(compose->size_group, optmenu);
        menu = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(optmenu)));
 
        hbox = gtk_hbox_new(FALSE, 6);
index 5fe568cb4b93f1ef11d71aea5941c11052518e77..3c37d2dc98c8ff5d44314a38d4365135407b3e45 100644 (file)
@@ -97,6 +97,7 @@ struct _Compose
        Toolbar *toolbar;
        
        GtkWidget *vbox2;
+       GtkSizeGroup *size_group;
 
        /* Header */
        GtkWidget *table_vbox;
index 634beef1ed9a3f8b0178d6b7438b807e33381c49..bb09d56cd2af16a35f5619bcf159649821bba1d0 100644 (file)
@@ -66,6 +66,25 @@ typedef struct _LoggingPage
        GtkWidget *optmenu_filtering_log_level;
 } LoggingPage;
 
+static GtkWidget *prefs_logging_create_check_buttons(GtkWidget **checkbtn1,
+                       gchar *label1, GtkWidget **checkbtn2, gchar *label2)
+{
+       GtkWidget *hbox_checkbtn;
+
+       hbox_checkbtn = gtk_hbox_new(TRUE, VBOX_BORDER);
+       gtk_widget_show(hbox_checkbtn);
+       
+       PACK_CHECK_BUTTON (hbox_checkbtn, *checkbtn1, label1); 
+       gtk_widget_set_size_request(GTK_BIN(*checkbtn1)->child, 200, -1);
+       gtk_label_set_line_wrap(GTK_LABEL(GTK_BIN(*checkbtn1)->child), TRUE);
+
+       PACK_CHECK_BUTTON (hbox_checkbtn, *checkbtn2, label2);
+       gtk_widget_set_size_request(GTK_BIN(*checkbtn2)->child, 200, -1);
+       gtk_label_set_line_wrap(GTK_LABEL(GTK_BIN(*checkbtn2)->child), TRUE);
+       
+       return hbox_checkbtn;
+}
+
 static void prefs_logging_create_widget(PrefsPage *_page, GtkWindow *window, 
                                  gpointer data)
 {
@@ -90,15 +109,11 @@ static void prefs_logging_create_widget(PrefsPage *_page, GtkWindow *window,
        GtkWidget *checkbtn_filtering_log;
        GtkWidget *frame_filtering_log;
        GtkWidget *vbox2_filtering_log;
-       GtkWidget *hbox_filtering_log_inc;
+       GtkWidget *hbox_checkbtn;
        GtkWidget *checkbtn_filtering_log_inc;
-       GtkWidget *hbox_filtering_log_manual;
        GtkWidget *checkbtn_filtering_log_manual;
-       GtkWidget *hbox_filtering_log_folder_proc;
        GtkWidget *checkbtn_filtering_log_folder_proc;
-       GtkWidget *hbox_filtering_log_pre_proc;
        GtkWidget *checkbtn_filtering_log_pre_proc;
-       GtkWidget *hbox_filtering_log_post_proc;
        GtkWidget *checkbtn_filtering_log_post_proc;
        GtkTooltips *filtering_log_tooltip;
        GtkWidget *hbox_filtering_log_level;
@@ -112,13 +127,9 @@ static void prefs_logging_create_widget(PrefsPage *_page, GtkWindow *window,
        GtkWidget *label;
        GtkWidget *hbox;
        GtkWidget *checkbtn_log_standard;
-       GtkWidget *hbox_log_standard;
        GtkWidget *checkbtn_log_warning;
-       GtkWidget *hbox_log_warning;
        GtkWidget *checkbtn_log_error;
-       GtkWidget *hbox_log_error;
        GtkWidget *checkbtn_log_status;
-       GtkWidget *hbox_log_status;
 
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
        gtk_widget_show (vbox1);
@@ -179,35 +190,27 @@ static void prefs_logging_create_widget(PrefsPage *_page, GtkWindow *window,
        vbox2_filtering_log = gtkut_get_options_frame(vbox1_filtering_log, &frame_filtering_log,
                                                        _("Log filtering/processing when..."));
 
-       PACK_CHECK_BUTTON (vbox2_filtering_log, checkbtn_filtering_log_inc,
-                          _("filtering at incorporation"));
-       hbox_filtering_log_inc = gtk_hbox_new (FALSE, 8);
-       gtk_container_add (GTK_CONTAINER (vbox2_filtering_log), hbox_filtering_log_inc);
-       gtk_widget_show (hbox_filtering_log_inc);
-
-       PACK_CHECK_BUTTON (vbox2_filtering_log, checkbtn_filtering_log_manual,
-                          _("manually filtering"));
-       hbox_filtering_log_manual = gtk_hbox_new (FALSE, 8);
-       gtk_container_add (GTK_CONTAINER (vbox2_filtering_log), hbox_filtering_log_manual);
-       gtk_widget_show (hbox_filtering_log_manual);
-
-       PACK_CHECK_BUTTON (vbox2_filtering_log, checkbtn_filtering_log_folder_proc,
+       hbox_checkbtn = prefs_logging_create_check_buttons(
+                                               &checkbtn_filtering_log_inc,
+                                               _("filtering at incorporation"),
+                                               &checkbtn_filtering_log_pre_proc,
+                                               _("pre-processing folders"));
+       gtk_box_pack_start(GTK_BOX(vbox2_filtering_log), hbox_checkbtn, FALSE, FALSE, 0);
+
+       hbox_checkbtn = prefs_logging_create_check_buttons(
+                                               &checkbtn_filtering_log_manual,
+                                               _("manually filtering"),
+                                               &checkbtn_filtering_log_post_proc,
+                                               _("post-processing folders"));
+       gtk_box_pack_start(GTK_BOX(vbox2_filtering_log), hbox_checkbtn, FALSE, FALSE, 0);
+       
+       hbox_checkbtn = gtk_hbox_new(TRUE, VBOX_BORDER);
+       gtk_widget_show(hbox_checkbtn);
+       gtk_box_pack_start(GTK_BOX(vbox2_filtering_log), hbox_checkbtn, FALSE, FALSE, 0);
+       PACK_CHECK_BUTTON (hbox_checkbtn, checkbtn_filtering_log_folder_proc,
                           _("processing folders"));
-       hbox_filtering_log_folder_proc = gtk_hbox_new (FALSE, 8);
-       gtk_container_add (GTK_CONTAINER (vbox2_filtering_log), hbox_filtering_log_folder_proc);
-       gtk_widget_show (hbox_filtering_log_folder_proc);
-
-       PACK_CHECK_BUTTON (vbox2_filtering_log, checkbtn_filtering_log_pre_proc,
-                          _("pre-processing folders"));
-       hbox_filtering_log_pre_proc = gtk_hbox_new (FALSE, 8);
-       gtk_container_add (GTK_CONTAINER (vbox2_filtering_log), hbox_filtering_log_pre_proc);
-       gtk_widget_show (hbox_filtering_log_pre_proc);
-
-       PACK_CHECK_BUTTON (vbox2_filtering_log, checkbtn_filtering_log_post_proc,
-                          _("post-processing folders"));
-       hbox_filtering_log_post_proc = gtk_hbox_new (FALSE, 8);
-       gtk_container_add (GTK_CONTAINER (vbox2_filtering_log), hbox_filtering_log_post_proc);
-       gtk_widget_show (hbox_filtering_log_post_proc);
+       gtk_box_pack_start(GTK_BOX(hbox_checkbtn), gtk_label_new(""),
+                          FALSE, TRUE, 0);
 
        SET_TOGGLE_SENSITIVITY(checkbtn_filtering_log, frame_filtering_log);
 
@@ -288,29 +291,15 @@ static void prefs_logging_create_widget(PrefsPage *_page, GtkWindow *window,
        gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
        gtk_widget_show (hbox);
 
-       PACK_CHECK_BUTTON (vbox_disc_log, checkbtn_log_standard,
-                          _("Network protocol messages"));
-       hbox_log_standard = gtk_hbox_new (FALSE, 8);
-       gtk_container_add (GTK_CONTAINER (vbox_disc_log), hbox_log_standard);
-       gtk_widget_show (hbox_log_standard);
-
-       PACK_CHECK_BUTTON (vbox_disc_log, checkbtn_log_warning,
-                          _("Warning messages"));
-       hbox_log_warning = gtk_hbox_new (FALSE, 8);
-       gtk_container_add (GTK_CONTAINER (vbox_disc_log), hbox_log_warning);
-       gtk_widget_show (hbox_log_warning);
-
-       PACK_CHECK_BUTTON (vbox_disc_log, checkbtn_log_error,
-                          _("Error messages"));
-       hbox_log_error = gtk_hbox_new (FALSE, 8);
-       gtk_container_add (GTK_CONTAINER (vbox_disc_log), hbox_log_error);
-       gtk_widget_show (hbox_log_error);
-
-       PACK_CHECK_BUTTON (vbox_disc_log, checkbtn_log_status,
-                          _("Status messages for filtering/processing log"));
-       hbox_log_status = gtk_hbox_new (FALSE, 8);
-       gtk_container_add (GTK_CONTAINER (vbox_disc_log), hbox_log_status);
-       gtk_widget_show (hbox_log_status);
+       hbox_checkbtn = prefs_logging_create_check_buttons(&checkbtn_log_warning,
+                               _("Warning messages"), &checkbtn_log_standard,
+                               _("Network protocol messages"));
+       gtk_box_pack_start(GTK_BOX(vbox_disc_log), hbox_checkbtn, FALSE, FALSE, 0);
+
+       hbox_checkbtn = prefs_logging_create_check_buttons(&checkbtn_log_error, 
+                               _("Error messages"), &checkbtn_log_status,
+                               _("Status messages for filtering/processing log"));
+       gtk_box_pack_start(GTK_BOX(vbox_disc_log), hbox_checkbtn, FALSE, FALSE, 0);
 
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_clip_network_log), 
                prefs_common.cliplog);
index 4c0ab30f998ed69db34df34431905169e488346b..76f7347db8af8723087e696ddad1974a49ea17c7 100644 (file)
@@ -358,6 +358,8 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
        gtk_box_pack_start(GTK_BOX (vbox2), hbox0, FALSE, FALSE, 0);
 
        label = gtk_label_new (_("Display message number next to folder name"));
+       gtk_widget_set_size_request(label, 200, -1);
+       gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
        gtk_widget_show (label);
        gtk_box_pack_start(GTK_BOX(hbox0), label, FALSE, FALSE, 0);