diff --git a/ChangeLog b/ChangeLog index b6a30adb3a..d122c547ed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,24 @@ +2004-10-14 Michael Natterer + + * libgimpwidgets/gimpwidgets.c + * app/widgets/gimpenumwidgets.[ch] + * app/widgets/gimppropwidgets.c + * app/actions/layers-commands.c + * app/dialogs/convert-dialog.c + * app/tools/gimpblendoptions.c + * app/tools/gimpbucketfilloptions.c + * app/tools/gimpcolorbalancetool.c + * app/tools/gimpcolorizetool.c + * app/tools/gimpcoloroptions.c + * app/tools/gimpcurvestool.c + * app/tools/gimphuesaturationtool.c + * app/tools/gimpinkoptions-gui.c + * app/tools/gimplevelstool.c + * app/tools/gimppaintoptions-gui.c + * app/tools/gimpselectionoptions.c + * app/tools/gimptransformoptions.c: the child of a GimpFrame must + not have any border width. Fixes many subtle misalignments. + 2004-10-14 Sven Neumann * app/core/gimpprogress.[ch]: added "message" function to the diff --git a/app/actions/layers-commands.c b/app/actions/layers-commands.c index ae8e8a6f60..377b422d2f 100644 --- a/app/actions/layers-commands.c +++ b/app/actions/layers-commands.c @@ -921,7 +921,6 @@ layers_new_layer_query (GimpImage *gimage, GIMP_FOREGROUND_FILL, GIMP_TRANSPARENT_FILL, gtk_label_new (_("Layer Fill Type")), - 2, G_CALLBACK (gimp_radio_button_update), &options->fill_type, &button); @@ -1178,7 +1177,6 @@ layers_add_mask_query (GimpLayer *layer, frame = gimp_enum_radio_frame_new (GIMP_TYPE_ADD_MASK_TYPE, gtk_label_new (_("Initialize Layer Mask to:")), - 6, G_CALLBACK (gimp_radio_button_update), &options->add_mask_type, &button); @@ -1190,13 +1188,13 @@ layers_add_mask_query (GimpLayer *layer, button = gtk_check_button_new_with_mnemonic (_("In_vert Mask")); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), options->invert); + gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0); + gtk_widget_show (button); + g_signal_connect (button, "toggled", G_CALLBACK (gimp_toggle_button_update), &options->invert); - gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0); - gtk_widget_show (button); - gtk_widget_show (options->query_box); } diff --git a/app/dialogs/convert-dialog.c b/app/dialogs/convert-dialog.c index 6a5eaaf6ae..bbf9865d93 100644 --- a/app/dialogs/convert-dialog.c +++ b/app/dialogs/convert-dialog.c @@ -162,7 +162,7 @@ convert_dialog_new (GimpImage *gimage, /* palette */ frame = gimp_enum_radio_frame_new (GIMP_TYPE_CONVERT_PALETTE_TYPE, - gtk_label_new (_("Palette")), 2, + gtk_label_new (_("Palette")), G_CALLBACK (gimp_radio_button_update), &dialog->palette_type, &toggle); diff --git a/app/tools/gimpblendoptions.c b/app/tools/gimpblendoptions.c index 4d8f4c690e..f2ddccd90a 100644 --- a/app/tools/gimpblendoptions.c +++ b/app/tools/gimpblendoptions.c @@ -276,7 +276,6 @@ gimp_blend_options_gui (GimpToolOptions *tool_options) /* table for supersampling options */ table = gtk_table_new (2, 3, FALSE); - gtk_container_set_border_width (GTK_CONTAINER (table), 2); gtk_table_set_col_spacings (GTK_TABLE (table), 2); gtk_table_set_row_spacings (GTK_TABLE (table), 1); gtk_container_add (GTK_CONTAINER (frame), table); diff --git a/app/tools/gimpbucketfilloptions.c b/app/tools/gimpbucketfilloptions.c index 8cb747f520..d2702bf028 100644 --- a/app/tools/gimpbucketfilloptions.c +++ b/app/tools/gimpbucketfilloptions.c @@ -262,13 +262,13 @@ gimp_bucket_fill_options_gui (GimpToolOptions *tool_options) gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0); gtk_widget_show (frame); - gtk_widget_set_sensitive (frame, ! GIMP_BUCKET_FILL_OPTIONS (config)->fill_selection); + gtk_widget_set_sensitive (frame, + ! GIMP_BUCKET_FILL_OPTIONS (config)->fill_selection); g_signal_connect_object (config, "notify::fill-selection", G_CALLBACK (gimp_bucket_fill_options_notify), G_OBJECT (frame), 0); vbox2 = gtk_vbox_new (FALSE, 0); - gtk_container_set_border_width (GTK_CONTAINER (vbox2), 2); gtk_container_add (GTK_CONTAINER (frame), vbox2); gtk_widget_show (vbox2); diff --git a/app/tools/gimpcolorbalancetool.c b/app/tools/gimpcolorbalancetool.c index 7e29e350c4..b65fd2ffe6 100644 --- a/app/tools/gimpcolorbalancetool.c +++ b/app/tools/gimpcolorbalancetool.c @@ -274,7 +274,6 @@ gimp_color_balance_tool_dialog (GimpImageMapTool *image_map_tool) frame = gimp_enum_radio_frame_new (GIMP_TYPE_TRANSFER_MODE, gtk_label_new (_("Select Range to Modify")), - 2, G_CALLBACK (color_balance_range_callback), cb_tool, &toggle); @@ -288,7 +287,6 @@ gimp_color_balance_tool_dialog (GimpImageMapTool *image_map_tool) gtk_widget_show (frame); vbox = gtk_vbox_new (FALSE, 4); - gtk_container_set_border_width (GTK_CONTAINER (vbox), 2); gtk_container_add (GTK_CONTAINER (frame), vbox); gtk_widget_show (vbox); diff --git a/app/tools/gimpcolorizetool.c b/app/tools/gimpcolorizetool.c index 5d6208bd7a..d5ab1c0e97 100644 --- a/app/tools/gimpcolorizetool.c +++ b/app/tools/gimpcolorizetool.c @@ -239,7 +239,6 @@ gimp_colorize_tool_dialog (GimpImageMapTool *image_map_tool) /* The table containing sliders */ vbox = gtk_vbox_new (FALSE, 4); - gtk_container_set_border_width (GTK_CONTAINER (vbox), 2); gtk_container_add (GTK_CONTAINER (frame), vbox); gtk_widget_show (vbox); diff --git a/app/tools/gimpcoloroptions.c b/app/tools/gimpcoloroptions.c index 720a1b7656..014532236f 100644 --- a/app/tools/gimpcoloroptions.c +++ b/app/tools/gimpcoloroptions.c @@ -177,7 +177,6 @@ gimp_color_options_gui (GimpToolOptions *tool_options) table = gtk_table_new (1, 3, FALSE); gtk_table_set_col_spacings (GTK_TABLE (table), 2); - gtk_container_set_border_width (GTK_CONTAINER (table), 2); gtk_container_add (GTK_CONTAINER (frame), table); gtk_widget_show (table); diff --git a/app/tools/gimpcurvestool.c b/app/tools/gimpcurvestool.c index a941940bf1..41128547a8 100644 --- a/app/tools/gimpcurvestool.c +++ b/app/tools/gimpcurvestool.c @@ -598,9 +598,7 @@ gimp_curves_tool_dialog (GimpImageMapTool *image_map_tool) gtk_widget_show (frame); bbox = gtk_hbutton_box_new (); - gtk_container_set_border_width (GTK_CONTAINER (bbox), 2); gtk_box_set_spacing (GTK_BOX (bbox), 4); - gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_SPREAD); gtk_container_add (GTK_CONTAINER (frame), bbox); gtk_widget_show (bbox); diff --git a/app/tools/gimphuesaturationtool.c b/app/tools/gimphuesaturationtool.c index 3033df30dc..c45f346258 100644 --- a/app/tools/gimphuesaturationtool.c +++ b/app/tools/gimphuesaturationtool.c @@ -275,7 +275,6 @@ gimp_hue_saturation_tool_dialog (GimpImageMapTool *image_map_tool) gtk_widget_show (frame); abox = gtk_alignment_new (0.5, 0.5, 0.0, 0.0); - gtk_container_set_border_width (GTK_CONTAINER (abox), 2); gtk_container_add (GTK_CONTAINER (frame), abox); gtk_widget_show (abox); @@ -348,7 +347,6 @@ gimp_hue_saturation_tool_dialog (GimpImageMapTool *image_map_tool) /* The table containing sliders */ vbox = gtk_vbox_new (FALSE, 4); - gtk_container_set_border_width (GTK_CONTAINER (vbox), 2); gtk_container_add (GTK_CONTAINER (frame), vbox); gtk_widget_show (vbox); diff --git a/app/tools/gimpinkoptions-gui.c b/app/tools/gimpinkoptions-gui.c index ec1b7d510e..33eb4f8089 100644 --- a/app/tools/gimpinkoptions-gui.c +++ b/app/tools/gimpinkoptions-gui.c @@ -61,7 +61,6 @@ gimp_ink_options_gui (GimpToolOptions *tool_options) table = gtk_table_new (2, 3, FALSE); gtk_table_set_col_spacings (GTK_TABLE (table), 2); - gtk_container_set_border_width (GTK_CONTAINER (table), 2); gtk_container_add (GTK_CONTAINER (frame), table); gtk_widget_show (table); @@ -86,7 +85,6 @@ gimp_ink_options_gui (GimpToolOptions *tool_options) table = gtk_table_new (3, 3, FALSE); gtk_table_set_col_spacings (GTK_TABLE (table), 2); - gtk_container_set_border_width (GTK_CONTAINER (table), 2); gtk_container_add (GTK_CONTAINER (frame), table); gtk_widget_show (table); @@ -153,7 +151,6 @@ gimp_ink_options_gui (GimpToolOptions *tool_options) gtk_widget_show (frame); blob_vbox = gtk_vbox_new (FALSE, 2); - gtk_container_set_border_width (GTK_CONTAINER (blob_vbox), 2); gtk_container_add (GTK_CONTAINER (frame), blob_vbox); gtk_widget_show (blob_vbox); diff --git a/app/tools/gimplevelstool.c b/app/tools/gimplevelstool.c index c0278a8d59..d2cccb43aa 100644 --- a/app/tools/gimplevelstool.c +++ b/app/tools/gimplevelstool.c @@ -445,7 +445,6 @@ gimp_levels_tool_dialog (GimpImageMapTool *image_map_tool) gtk_widget_show (frame); vbox2 = gtk_vbox_new (FALSE, 2); - gtk_container_set_border_width (GTK_CONTAINER (vbox2), 2); gtk_container_add (GTK_CONTAINER (frame), vbox2); gtk_widget_show (vbox2); @@ -570,7 +569,6 @@ gimp_levels_tool_dialog (GimpImageMapTool *image_map_tool) gtk_widget_show (frame); vbox2 = gtk_vbox_new (FALSE, 4); - gtk_container_set_border_width (GTK_CONTAINER (vbox2), 2); gtk_container_add (GTK_CONTAINER (frame), vbox2); gtk_widget_show (vbox2); @@ -641,15 +639,12 @@ gimp_levels_tool_dialog (GimpImageMapTool *image_map_tool) gtk_box_pack_end (GTK_BOX (vbox), frame, FALSE, FALSE, 0); gtk_widget_show (frame); - hbox = gtk_hbox_new (FALSE, 0); gtk_container_add (GTK_CONTAINER (frame), hbox); gtk_widget_show (hbox); hbbox = gtk_hbutton_box_new (); - gtk_container_set_border_width (GTK_CONTAINER (hbbox), 2); gtk_box_set_spacing (GTK_BOX (hbbox), 4); - gtk_button_box_set_layout (GTK_BUTTON_BOX (hbbox), GTK_BUTTONBOX_SPREAD); gtk_box_pack_start (GTK_BOX (hbox), hbbox, FALSE, FALSE, 0); gtk_widget_show (hbbox); diff --git a/app/tools/gimppaintoptions-gui.c b/app/tools/gimppaintoptions-gui.c index f80e483515..d06cb2be1b 100644 --- a/app/tools/gimppaintoptions-gui.c +++ b/app/tools/gimppaintoptions-gui.c @@ -309,7 +309,6 @@ fade_options_gui (GimpFadeOptions *fade, frame = gimp_frame_new (NULL); table = gtk_table_new (1, 3, FALSE); - gtk_container_set_border_width (GTK_CONTAINER (table), 2); gtk_table_set_col_spacings (GTK_TABLE (table), 2); gtk_container_add (GTK_CONTAINER (frame), table); gtk_widget_show (table); @@ -362,7 +361,6 @@ gradient_options_gui (GimpGradientOptions *gradient, frame = gimp_frame_new (NULL); table = gtk_table_new (3, 3, FALSE); - gtk_container_set_border_width (GTK_CONTAINER (table), 2); gtk_table_set_col_spacings (GTK_TABLE (table), 2); gtk_table_set_row_spacings (GTK_TABLE (table), 2); gtk_container_add (GTK_CONTAINER (frame), table); diff --git a/app/tools/gimpselectionoptions.c b/app/tools/gimpselectionoptions.c index c547d7578e..83ca030840 100644 --- a/app/tools/gimpselectionoptions.c +++ b/app/tools/gimpselectionoptions.c @@ -395,7 +395,6 @@ gimp_selection_options_gui (GimpToolOptions *tool_options) gtk_widget_show (frame); table = gtk_table_new (1, 3, FALSE); - gtk_container_set_border_width (GTK_CONTAINER (table), 2); gtk_table_set_col_spacings (GTK_TABLE (table), 2); gtk_container_add (GTK_CONTAINER (frame), table); gtk_widget_show (table); @@ -438,7 +437,6 @@ gimp_selection_options_gui (GimpToolOptions *tool_options) gtk_widget_show (frame); vbox2 = gtk_vbox_new (FALSE, 0); - gtk_container_set_border_width (GTK_CONTAINER (vbox2), 2); gtk_container_add (GTK_CONTAINER (frame), vbox2); gtk_widget_show (vbox2); @@ -484,7 +482,6 @@ gimp_selection_options_gui (GimpToolOptions *tool_options) gtk_widget_show (frame); vbox2 = gtk_vbox_new (FALSE, 0); - gtk_container_set_border_width (GTK_CONTAINER (vbox2), 2); gtk_container_add (GTK_CONTAINER (frame), vbox2); gtk_widget_show (vbox2); @@ -510,7 +507,6 @@ gimp_selection_options_gui (GimpToolOptions *tool_options) gtk_widget_show (combo); table = gtk_table_new (2, 3, FALSE); - gtk_container_set_border_width (GTK_CONTAINER (table), 2); gtk_table_set_col_spacings (GTK_TABLE (table), 2); gtk_container_add (GTK_CONTAINER (frame), table); diff --git a/app/tools/gimptransformoptions.c b/app/tools/gimptransformoptions.c index 13142fda94..cd9b264ce5 100644 --- a/app/tools/gimptransformoptions.c +++ b/app/tools/gimptransformoptions.c @@ -416,7 +416,6 @@ gimp_transform_options_gui (GimpToolOptions *tool_options) gtk_widget_show (frame); vbox2 = gtk_vbox_new (FALSE, 2); - gtk_container_set_border_width (GTK_CONTAINER (vbox2), 2); gtk_container_add (GTK_CONTAINER (frame), vbox2); gtk_widget_show (vbox2); diff --git a/app/widgets/gimpenumwidgets.c b/app/widgets/gimpenumwidgets.c index 4b951ebaa8..ba8b55fcb2 100644 --- a/app/widgets/gimpenumwidgets.c +++ b/app/widgets/gimpenumwidgets.c @@ -128,7 +128,6 @@ gimp_enum_radio_box_new_with_range (GType enum_type, * gimp_enum_radio_frame_new: * @enum_type: the #GType of an enum. * @label_widget: a widget to put into the frame that will hold the radio box. - * @border_width: the border_width of the vbox inside the frame. * @callback: a callback to connect to the "toggled" signal of each * #GtkRadioButton that is created. * @callback_data: data to pass to the @callback. @@ -142,7 +141,6 @@ gimp_enum_radio_box_new_with_range (GType enum_type, GtkWidget * gimp_enum_radio_frame_new (GType enum_type, GtkWidget *label_widget, - gint border_width, GCallback callback, gpointer callback_data, GtkWidget **first_button) @@ -165,8 +163,6 @@ gimp_enum_radio_frame_new (GType enum_type, radio_box = gimp_enum_radio_box_new (enum_type, callback, callback_data, first_button); - - gtk_container_set_border_width (GTK_CONTAINER (radio_box), border_width); gtk_container_add (GTK_CONTAINER (frame), radio_box); gtk_widget_show (radio_box); @@ -178,7 +174,6 @@ gimp_enum_radio_frame_new_with_range (GType enum_type, gint minimum, gint maximum, GtkWidget *label_widget, - gint border_width, GCallback callback, gpointer callback_data, GtkWidget **first_button) @@ -203,8 +198,6 @@ gimp_enum_radio_frame_new_with_range (GType enum_type, maximum, callback, callback_data, first_button); - - gtk_container_set_border_width (GTK_CONTAINER (radio_box), border_width); gtk_container_add (GTK_CONTAINER (frame), radio_box); gtk_widget_show (radio_box); diff --git a/app/widgets/gimpenumwidgets.h b/app/widgets/gimpenumwidgets.h index a2574168df..24d69d4c2e 100644 --- a/app/widgets/gimpenumwidgets.h +++ b/app/widgets/gimpenumwidgets.h @@ -36,7 +36,6 @@ GtkWidget * gimp_enum_radio_box_new_with_range (GType enum_type, GtkWidget * gimp_enum_radio_frame_new (GType enum_type, GtkWidget *label_widget, - gint border_width, GCallback callback, gpointer callback_data, GtkWidget **first_button); @@ -44,7 +43,6 @@ GtkWidget * gimp_enum_radio_frame_new_with_range (GType enum_type, gint minimum, gint maximum, GtkWidget *label_widget, - gint border_width, GCallback callback, gpointer callback_data, GtkWidget **first_button); diff --git a/app/widgets/gimppropwidgets.c b/app/widgets/gimppropwidgets.c index d2be116360..81a3535d28 100644 --- a/app/widgets/gimppropwidgets.c +++ b/app/widgets/gimppropwidgets.c @@ -631,7 +631,6 @@ gimp_prop_enum_radio_frame_new (GObject *config, frame = gimp_enum_radio_frame_new_with_range (param_spec->value_type, minimum, maximum, gtk_label_new (label), - 2, G_CALLBACK (gimp_prop_radio_button_callback), config, &button); @@ -640,7 +639,6 @@ gimp_prop_enum_radio_frame_new (GObject *config, { frame = gimp_enum_radio_frame_new (param_spec->value_type, gtk_label_new (label), - 2, G_CALLBACK (gimp_prop_radio_button_callback), config, &button); diff --git a/libgimpwidgets/gimpenumwidgets.c b/libgimpwidgets/gimpenumwidgets.c index 4b951ebaa8..ba8b55fcb2 100644 --- a/libgimpwidgets/gimpenumwidgets.c +++ b/libgimpwidgets/gimpenumwidgets.c @@ -128,7 +128,6 @@ gimp_enum_radio_box_new_with_range (GType enum_type, * gimp_enum_radio_frame_new: * @enum_type: the #GType of an enum. * @label_widget: a widget to put into the frame that will hold the radio box. - * @border_width: the border_width of the vbox inside the frame. * @callback: a callback to connect to the "toggled" signal of each * #GtkRadioButton that is created. * @callback_data: data to pass to the @callback. @@ -142,7 +141,6 @@ gimp_enum_radio_box_new_with_range (GType enum_type, GtkWidget * gimp_enum_radio_frame_new (GType enum_type, GtkWidget *label_widget, - gint border_width, GCallback callback, gpointer callback_data, GtkWidget **first_button) @@ -165,8 +163,6 @@ gimp_enum_radio_frame_new (GType enum_type, radio_box = gimp_enum_radio_box_new (enum_type, callback, callback_data, first_button); - - gtk_container_set_border_width (GTK_CONTAINER (radio_box), border_width); gtk_container_add (GTK_CONTAINER (frame), radio_box); gtk_widget_show (radio_box); @@ -178,7 +174,6 @@ gimp_enum_radio_frame_new_with_range (GType enum_type, gint minimum, gint maximum, GtkWidget *label_widget, - gint border_width, GCallback callback, gpointer callback_data, GtkWidget **first_button) @@ -203,8 +198,6 @@ gimp_enum_radio_frame_new_with_range (GType enum_type, maximum, callback, callback_data, first_button); - - gtk_container_set_border_width (GTK_CONTAINER (radio_box), border_width); gtk_container_add (GTK_CONTAINER (frame), radio_box); gtk_widget_show (radio_box); diff --git a/libgimpwidgets/gimpenumwidgets.h b/libgimpwidgets/gimpenumwidgets.h index a2574168df..24d69d4c2e 100644 --- a/libgimpwidgets/gimpenumwidgets.h +++ b/libgimpwidgets/gimpenumwidgets.h @@ -36,7 +36,6 @@ GtkWidget * gimp_enum_radio_box_new_with_range (GType enum_type, GtkWidget * gimp_enum_radio_frame_new (GType enum_type, GtkWidget *label_widget, - gint border_width, GCallback callback, gpointer callback_data, GtkWidget **first_button); @@ -44,7 +43,6 @@ GtkWidget * gimp_enum_radio_frame_new_with_range (GType enum_type, gint minimum, gint maximum, GtkWidget *label_widget, - gint border_width, GCallback callback, gpointer callback_data, GtkWidget **first_button); diff --git a/libgimpwidgets/gimppropwidgets.c b/libgimpwidgets/gimppropwidgets.c index d2be116360..81a3535d28 100644 --- a/libgimpwidgets/gimppropwidgets.c +++ b/libgimpwidgets/gimppropwidgets.c @@ -631,7 +631,6 @@ gimp_prop_enum_radio_frame_new (GObject *config, frame = gimp_enum_radio_frame_new_with_range (param_spec->value_type, minimum, maximum, gtk_label_new (label), - 2, G_CALLBACK (gimp_prop_radio_button_callback), config, &button); @@ -640,7 +639,6 @@ gimp_prop_enum_radio_frame_new (GObject *config, { frame = gimp_enum_radio_frame_new (param_spec->value_type, gtk_label_new (label), - 2, G_CALLBACK (gimp_prop_radio_button_callback), config, &button); diff --git a/libgimpwidgets/gimpwidgets.c b/libgimpwidgets/gimpwidgets.c index ac8dc628e5..2232d80380 100644 --- a/libgimpwidgets/gimpwidgets.c +++ b/libgimpwidgets/gimpwidgets.c @@ -133,8 +133,6 @@ gimp_radio_group_new (gboolean in_frame, { GtkWidget *frame; - gtk_container_set_border_width (GTK_CONTAINER (vbox), 2); - frame = gimp_frame_new (frame_title); gtk_container_add (GTK_CONTAINER (frame), vbox); gtk_widget_show (vbox); @@ -239,8 +237,6 @@ gimp_radio_group_new2 (gboolean in_frame, { GtkWidget *frame; - gtk_container_set_border_width (GTK_CONTAINER (vbox), 2); - frame = gimp_frame_new (frame_title); gtk_container_add (GTK_CONTAINER (frame), vbox); gtk_widget_show (vbox); @@ -351,8 +347,6 @@ gimp_int_radio_group_new (gboolean in_frame, { GtkWidget *frame; - gtk_container_set_border_width (GTK_CONTAINER (vbox), 2); - frame = gimp_frame_new (frame_title); gtk_container_add (GTK_CONTAINER (frame), vbox); gtk_widget_show (vbox);