2006-09-04 [paul] 2.4.0cvs141
authorPaul Mangan <paul@claws-mail.org>
Mon, 4 Sep 2006 16:35:43 +0000 (16:35 +0000)
committerPaul Mangan <paul@claws-mail.org>
Mon, 4 Sep 2006 16:35:43 +0000 (16:35 +0000)
* src/gtk/icon_legend.c
straighten up columns
Patch by Fabien Vantard

ChangeLog
PATCHSETS
configure.ac
src/gtk/icon_legend.c

index dc116bd90e1044c96bebdd52d6088d5b18d80c21..717e5c882c411865f7db8ff5cba38801d669518f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-04 [paul]      2.4.0cvs141
+
+       * src/gtk/icon_legend.c
+               straighten up columns
+               Patch by Fabien Vantard
+
 2006-09-04 [wwp]       2.4.0cvs140
 
        * src/prefs_filtering.c
index ffa6693cdab6ef956f623c365539b67df2b6c81c..4ac3b91e4134d3c5db6e8eb5adf981da463337ed 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.207.2.118 -r 1.207.2.119 src/folderview.c;  ) > 2.4.0cvs138.patchset
 ( cvs diff -u -r 1.1.2.2 -r 1.1.2.3 tools/make.themes.project;  ) > 2.4.0cvs139.patchset
 ( cvs diff -u -r 1.59.2.41 -r 1.59.2.42 src/prefs_filtering.c;  ) > 2.4.0cvs140.patchset
+( cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/gtk/icon_legend.c;  ) > 2.4.0cvs141.patchset
index abad4b9b5a5b50d710e657755c020b1eaded5251..21572ed6ae7096b00641021198d7ffc3b51a75d4 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=140
+EXTRA_VERSION=141
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 17df6c7d4f8d9bff636bd7a3aabf96088ef98936..92f279a19803b90f6f29508d5ee79d218228e3a5 100644 (file)
@@ -115,6 +115,7 @@ static void legend_create(void)
        GtkWidget *label;
        GtkWidget *icon_label;
        GtkWidget *desc_label;
+       GtkWidget *table;
        gint i;
 
        window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
@@ -144,18 +145,26 @@ static void legend_create(void)
        gtk_widget_show(label);
        gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
 
+       table = gtk_table_new(ICONS, 2, FALSE);
+       gtk_container_set_border_width(GTK_CONTAINER(table), 8);
+       gtk_table_set_row_spacings(GTK_TABLE(table), 4);
+       gtk_table_set_col_spacings(GTK_TABLE(table), 8);
+
        for (i = 0; i < ICONS; ++i) {
                icon_label = stock_pixmap_widget(window, legend_icons[i]);
+               gtk_misc_set_alignment (GTK_MISC (icon_label), 0.5, 0.5);
+               gtk_table_attach(GTK_TABLE(table), icon_label, 0, 1, i, i+1,
+                               GTK_FILL, 0, 0, 0);
+
                desc_label = gtk_label_new(gettext(legend_icon_desc[i]));
+               gtk_misc_set_alignment (GTK_MISC (desc_label), 0, 0.5);
                gtk_label_set_line_wrap(GTK_LABEL(desc_label), TRUE);
-
-               hbox = gtk_hbox_new(FALSE, 4);
-               gtk_widget_show(hbox);
-               gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
-               gtk_box_pack_start(GTK_BOX(hbox), icon_label, FALSE, FALSE, 0);
-               gtk_box_pack_start(GTK_BOX(hbox), desc_label, FALSE, FALSE, 0);
+               gtk_table_attach(GTK_TABLE(table), desc_label, 1, 2, i, i+1,
+                               GTK_FILL, 0, 0, 0);
        }       
 
+       gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0);
+
        gtkut_stock_button_set_create(&confirm_area, &close_button, GTK_STOCK_CLOSE,
                                      NULL, NULL, NULL, NULL);
        gtk_box_pack_end(GTK_BOX(vbox), confirm_area, FALSE, FALSE, 4);