From 507b19bc914460c798f63f72e95a2d2c320c8a87 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Thu, 23 Oct 2003 11:39:33 +0000 Subject: [PATCH] properly align the toggle button columns by packing their containers 2003-10-23 Michael Natterer * app/gui/preferences-dialog.c (prefs_display_options_frame_add): properly align the toggle button columns by packing their containers expanding, removed ascii art, cleanup. --- ChangeLog | 6 +++ app/dialogs/preferences-dialog.c | 72 +++++++++++++------------------- app/gui/preferences-dialog.c | 72 +++++++++++++------------------- 3 files changed, 62 insertions(+), 88 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2a449110f2..0db74321eb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2003-10-23 Michael Natterer + + * app/gui/preferences-dialog.c (prefs_display_options_frame_add): + properly align the toggle button columns by packing their + containers expanding, removed ascii art, cleanup. + 2003-10-23 Henrik Brix Andersen * gimp/app/display/gimpdisplayoptions.[ch]: changed diff --git a/app/dialogs/preferences-dialog.c b/app/dialogs/preferences-dialog.c index b6a99e6ecd..a309ad6834 100644 --- a/app/dialogs/preferences-dialog.c +++ b/app/dialogs/preferences-dialog.c @@ -818,68 +818,53 @@ prefs_display_options_frame_add (Gimp *gimp, const gchar *label, GtkContainer *parent) { - /* General sketch: - + Frame VBox + - + Checkbox HBox + - + Checks VBox + + Checks VBox + - Menubar Selection - Rulers Active layer - Scrollbars Guides - Statusbar Grid - + + + + - + + - Canvas padding - Custom color - + + - */ - - GtkBox *box; - GtkWidget *checks_hbox; + GtkWidget *vbox; + GtkWidget *hbox; GtkWidget *checks_vbox; GtkWidget *table; GtkWidget *button; - box = GTK_BOX (prefs_frame_new (label, parent, FALSE)); - - checks_hbox = gtk_hbox_new (FALSE, 4); - gtk_box_pack_start (box, checks_hbox, FALSE, FALSE, 0); - gtk_widget_show (checks_hbox); + vbox = prefs_frame_new (label, parent, FALSE); - checks_vbox = gtk_vbox_new (FALSE, 4); - gtk_box_pack_start (GTK_BOX (checks_hbox), checks_vbox, TRUE, FALSE, 0); + hbox = gtk_hbox_new (FALSE, 4); + gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); + gtk_widget_show (hbox); + + checks_vbox = gtk_vbox_new (FALSE, 2); + gtk_box_pack_start (GTK_BOX (hbox), checks_vbox, TRUE, TRUE, 0); gtk_widget_show (checks_vbox); - prefs_check_button_add (object, - "show-menubar", _("Show _Menubar"), + prefs_check_button_add (object, "show-menubar", + _("Show _Menubar"), GTK_BOX (checks_vbox)); - prefs_check_button_add (object, - "show-rulers", _("Show _Rulers"), + prefs_check_button_add (object, "show-rulers", + _("Show _Rulers"), GTK_BOX (checks_vbox)); - prefs_check_button_add (object, - "show-scrollbars", _("Show Scroll_bars"), + prefs_check_button_add (object, "show-scrollbars", + _("Show Scroll_bars"), GTK_BOX (checks_vbox)); - prefs_check_button_add (object, - "show-statusbar", _("Show S_tatusbar"), + prefs_check_button_add (object, "show-statusbar", + _("Show S_tatusbar"), GTK_BOX (checks_vbox)); - checks_vbox = gtk_vbox_new (FALSE, 4); - gtk_box_pack_start (GTK_BOX (checks_hbox), checks_vbox, TRUE, FALSE, 0); + checks_vbox = gtk_vbox_new (FALSE, 2); + gtk_box_pack_start (GTK_BOX (hbox), checks_vbox, TRUE, TRUE, 0); gtk_widget_show (checks_vbox); - prefs_check_button_add (object, - "show-selection", _("Show S_election"), + prefs_check_button_add (object, "show-selection", + _("Show S_election"), GTK_BOX (checks_vbox)); - prefs_check_button_add (object, - "show-layer-boundary", _("Show _Layer Boundary"), + prefs_check_button_add (object, "show-layer-boundary", + _("Show _Layer Boundary"), GTK_BOX (checks_vbox)); - prefs_check_button_add (object, - "show-guides", _("Show _Guides"), + prefs_check_button_add (object, "show-guides", + _("Show _Guides"), GTK_BOX (checks_vbox)); - prefs_check_button_add (object, - "show-grid", _("Show Gri_d"), + prefs_check_button_add (object, "show-grid", + _("Show Gri_d"), GTK_BOX (checks_vbox)); - table = prefs_table_new (2, GTK_CONTAINER (box), FALSE); + table = prefs_table_new (2, GTK_CONTAINER (vbox), FALSE); prefs_enum_option_menu_add (object, "padding-mode", 0, 0, _("Canvas Padding Mode:"), GTK_TABLE (table), 0); @@ -890,7 +875,6 @@ prefs_display_options_frame_add (Gimp *gimp, GTK_TABLE (table), 1); gimp_color_panel_set_context (GIMP_COLOR_PANEL (button), gimp_get_user_context (gimp)); - } static void diff --git a/app/gui/preferences-dialog.c b/app/gui/preferences-dialog.c index b6a99e6ecd..a309ad6834 100644 --- a/app/gui/preferences-dialog.c +++ b/app/gui/preferences-dialog.c @@ -818,68 +818,53 @@ prefs_display_options_frame_add (Gimp *gimp, const gchar *label, GtkContainer *parent) { - /* General sketch: - + Frame VBox + - + Checkbox HBox + - + Checks VBox + + Checks VBox + - Menubar Selection - Rulers Active layer - Scrollbars Guides - Statusbar Grid - + + + + - + + - Canvas padding - Custom color - + + - */ - - GtkBox *box; - GtkWidget *checks_hbox; + GtkWidget *vbox; + GtkWidget *hbox; GtkWidget *checks_vbox; GtkWidget *table; GtkWidget *button; - box = GTK_BOX (prefs_frame_new (label, parent, FALSE)); - - checks_hbox = gtk_hbox_new (FALSE, 4); - gtk_box_pack_start (box, checks_hbox, FALSE, FALSE, 0); - gtk_widget_show (checks_hbox); + vbox = prefs_frame_new (label, parent, FALSE); - checks_vbox = gtk_vbox_new (FALSE, 4); - gtk_box_pack_start (GTK_BOX (checks_hbox), checks_vbox, TRUE, FALSE, 0); + hbox = gtk_hbox_new (FALSE, 4); + gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); + gtk_widget_show (hbox); + + checks_vbox = gtk_vbox_new (FALSE, 2); + gtk_box_pack_start (GTK_BOX (hbox), checks_vbox, TRUE, TRUE, 0); gtk_widget_show (checks_vbox); - prefs_check_button_add (object, - "show-menubar", _("Show _Menubar"), + prefs_check_button_add (object, "show-menubar", + _("Show _Menubar"), GTK_BOX (checks_vbox)); - prefs_check_button_add (object, - "show-rulers", _("Show _Rulers"), + prefs_check_button_add (object, "show-rulers", + _("Show _Rulers"), GTK_BOX (checks_vbox)); - prefs_check_button_add (object, - "show-scrollbars", _("Show Scroll_bars"), + prefs_check_button_add (object, "show-scrollbars", + _("Show Scroll_bars"), GTK_BOX (checks_vbox)); - prefs_check_button_add (object, - "show-statusbar", _("Show S_tatusbar"), + prefs_check_button_add (object, "show-statusbar", + _("Show S_tatusbar"), GTK_BOX (checks_vbox)); - checks_vbox = gtk_vbox_new (FALSE, 4); - gtk_box_pack_start (GTK_BOX (checks_hbox), checks_vbox, TRUE, FALSE, 0); + checks_vbox = gtk_vbox_new (FALSE, 2); + gtk_box_pack_start (GTK_BOX (hbox), checks_vbox, TRUE, TRUE, 0); gtk_widget_show (checks_vbox); - prefs_check_button_add (object, - "show-selection", _("Show S_election"), + prefs_check_button_add (object, "show-selection", + _("Show S_election"), GTK_BOX (checks_vbox)); - prefs_check_button_add (object, - "show-layer-boundary", _("Show _Layer Boundary"), + prefs_check_button_add (object, "show-layer-boundary", + _("Show _Layer Boundary"), GTK_BOX (checks_vbox)); - prefs_check_button_add (object, - "show-guides", _("Show _Guides"), + prefs_check_button_add (object, "show-guides", + _("Show _Guides"), GTK_BOX (checks_vbox)); - prefs_check_button_add (object, - "show-grid", _("Show Gri_d"), + prefs_check_button_add (object, "show-grid", + _("Show Gri_d"), GTK_BOX (checks_vbox)); - table = prefs_table_new (2, GTK_CONTAINER (box), FALSE); + table = prefs_table_new (2, GTK_CONTAINER (vbox), FALSE); prefs_enum_option_menu_add (object, "padding-mode", 0, 0, _("Canvas Padding Mode:"), GTK_TABLE (table), 0); @@ -890,7 +875,6 @@ prefs_display_options_frame_add (Gimp *gimp, GTK_TABLE (table), 1); gimp_color_panel_set_context (GIMP_COLOR_PANEL (button), gimp_get_user_context (gimp)); - } static void