diff options
author | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2005-03-31 08:20:46 +0000 |
---|---|---|
committer | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2005-03-31 08:20:46 +0000 |
commit | f2fb12c728f8c2e4f83e7ef151d93284b74562c2 (patch) | |
tree | 9e3bc05445a42758fbd06d2e9b6fc256017ec949 /src/colorlabel.c | |
parent | e9dbffb788479d941aa7503ca6b3686061cb2828 (diff) |
modified prefs_filter_edit.c.
git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@198 ee746299-78ed-0310-b773-934348b2243d
Diffstat (limited to 'src/colorlabel.c')
-rw-r--r-- | src/colorlabel.c | 37 |
1 files changed, 17 insertions, 20 deletions
diff --git a/src/colorlabel.c b/src/colorlabel.c index 40b27d06..5de4fe43 100644 --- a/src/colorlabel.c +++ b/src/colorlabel.c @@ -34,6 +34,7 @@ #include <gtk/gtkmenuitem.h> #include <gtk/gtkalignment.h> #include <gtk/gtkhbox.h> +#include <gtk/gtkvbox.h> #include <gtk/gtkwindow.h> #include <gtk/gtkdrawingarea.h> @@ -228,7 +229,7 @@ GtkWidget *colorlabel_create_check_color_menu_item(gint color_index) { GtkWidget *label; GtkWidget *hbox; - GtkWidget *align; + GtkWidget *vbox; GtkWidget *item; G_RETURN_VAL_IF_INVALID_COLOR(color_index, NULL); @@ -241,22 +242,20 @@ GtkWidget *colorlabel_create_check_color_menu_item(gint color_index) * how to create pixmap menus */ label = gtk_label_new(label_colors[color_index].label); - gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); gtk_widget_show(label); hbox = gtk_hbox_new(FALSE, 0); gtk_widget_show(hbox); gtk_container_add(GTK_CONTAINER(item), hbox); - align = gtk_alignment_new(0.5, 0.5, 0.0, 0.0); - gtk_widget_show(align); - gtk_container_set_border_width(GTK_CONTAINER(align), 1); + vbox = gtk_vbox_new(TRUE, 0); + gtk_widget_show(vbox); + gtk_container_set_border_width(GTK_CONTAINER(vbox), 1); - gtk_container_add(GTK_CONTAINER(align), label_colors[color_index].widget); + gtk_container_add(GTK_CONTAINER(vbox), + label_colors[color_index].widget); gtk_widget_show(label_colors[color_index].widget); - gtk_widget_set_size_request - (align, LABEL_COLOR_WIDTH, LABEL_COLOR_HEIGHT); - gtk_box_pack_start(GTK_BOX(hbox), align, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 4); return item; @@ -267,8 +266,6 @@ GtkWidget *colorlabel_create_check_color_menu_item(gint color_index) GtkWidget *colorlabel_create_color_menu(void) { GtkWidget *label; - GtkWidget *hbox; - GtkWidget *align; GtkWidget *item; GtkWidget *menu; gint i; @@ -288,7 +285,9 @@ GtkWidget *colorlabel_create_color_menu(void) /* and the color items */ for (i = 0; i < LABEL_COLORS_ELEMS; i++) { - GtkWidget *widget = colorlabel_create_color_widget(label_colors[i].color); + GtkWidget *hbox; + GtkWidget *vbox; + GtkWidget *widget; item = gtk_menu_item_new(); g_object_set_data(G_OBJECT(item), "color", @@ -296,22 +295,20 @@ GtkWidget *colorlabel_create_color_menu(void) label = gtk_label_new(label_colors[i].label); - gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); gtk_widget_show(label); hbox = gtk_hbox_new(FALSE, 0); gtk_widget_show(hbox); gtk_container_add(GTK_CONTAINER(item), hbox); - align = gtk_alignment_new(0.5, 0.5, 0.0, 0.0); - gtk_widget_show(align); - gtk_container_set_border_width(GTK_CONTAINER(align), 1); + vbox = gtk_vbox_new(TRUE, 0); + gtk_widget_show(vbox); + gtk_container_set_border_width(GTK_CONTAINER(vbox), 1); - gtk_container_add(GTK_CONTAINER(align), widget); + widget = colorlabel_create_color_widget(label_colors[i].color); gtk_widget_show(widget); - gtk_widget_set_size_request - (align, LABEL_COLOR_WIDTH, LABEL_COLOR_HEIGHT); + gtk_box_pack_start(GTK_BOX(vbox), widget, FALSE, FALSE, 0); - gtk_box_pack_start(GTK_BOX(hbox), align, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 4); gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); |