From c9c025c8d94a7e8bf53f2bd196780971532e35d1 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Fri, 8 Mar 2002 18:30:40 +0000 Subject: [PATCH] return the crated label from gimp_table_attach_aligned(), doc fixes. 2002-03-08 Michael Natterer * libgimpwidgets/gimpwidgets.[ch]: return the crated label from gimp_table_attach_aligned(), doc fixes. * app/gui/channels-commands.c * app/tools/gimpairbrushtool.c * app/tools/gimpblendtool.c * app/tools/gimpbucketfilltool.c * app/tools/gimpcolorpickertool.c * app/tools/gimpconvolvetool.c * app/tools/gimpdodgeburntool.c * app/tools/gimpinktool.c * app/tools/gimpmagnifytool.c * app/tools/gimpsmudgetool.c * app/tools/paint_options.c * app/tools/selection_options.c * app/widgets/gimpbrushfactoryview.c * app/widgets/gimplayerlistview.c: use gimp_scale_entries instead of just hscales in lots of places, so the values are keyboard input-able. --- ChangeLog | 22 +++ app/actions/channels-commands.c | 72 +++----- app/gui/channels-commands.c | 72 +++----- app/paint/gimpink.c | 79 ++++---- app/tools/gimpairbrushtool.c | 39 ++-- app/tools/gimpblendtool.c | 173 ++++++++++-------- app/tools/gimpbucketfilltool.c | 34 ++-- app/tools/gimpcolorpickertool.c | 64 +++---- app/tools/gimpconvolvetool.c | 42 ++--- app/tools/gimpdodgeburntool.c | 44 ++--- app/tools/gimpinktool.c | 79 ++++---- app/tools/gimpmagnifytool.c | 35 ++-- app/tools/gimppaintoptions-gui.c | 65 +++---- app/tools/gimpselectionoptions.c | 63 +++---- app/tools/gimpsmudgetool.c | 29 ++- app/tools/paint_options.c | 65 +++---- app/tools/selection_options.c | 63 +++---- app/widgets/gimpbrushfactoryview.c | 20 +- app/widgets/gimplayerlistview.c | 43 ++--- app/widgets/gimplayertreeview.c | 43 ++--- devel-docs/ChangeLog | 4 + .../libgimpwidgets/tmpl/gimpwidgets.sgml | 1 + libgimpwidgets/gimpwidgets.c | 12 +- libgimpwidgets/gimpwidgets.h | 18 +- 24 files changed, 514 insertions(+), 667 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2cb7514406..bdfb0b5ac4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,25 @@ +2002-03-08 Michael Natterer + + * libgimpwidgets/gimpwidgets.[ch]: return the crated label from + gimp_table_attach_aligned(), doc fixes. + + * app/gui/channels-commands.c + * app/tools/gimpairbrushtool.c + * app/tools/gimpblendtool.c + * app/tools/gimpbucketfilltool.c + * app/tools/gimpcolorpickertool.c + * app/tools/gimpconvolvetool.c + * app/tools/gimpdodgeburntool.c + * app/tools/gimpinktool.c + * app/tools/gimpmagnifytool.c + * app/tools/gimpsmudgetool.c + * app/tools/paint_options.c + * app/tools/selection_options.c + * app/widgets/gimpbrushfactoryview.c + * app/widgets/gimplayerlistview.c: use gimp_scale_entries instead + of just hscales in lots of places, so the values are keyboard + input-able. + 2002-03-08 Sven Neumann * configure.in: reorder AC_OUTPUT to make intltool happy, check diff --git a/app/actions/channels-commands.c b/app/actions/channels-commands.c index e26e525a5e..197ab16d1f 100644 --- a/app/actions/channels-commands.c +++ b/app/actions/channels-commands.c @@ -249,8 +249,6 @@ channels_new_channel_query (GimpImage *gimage, GtkWidget *hbox; GtkWidget *vbox; GtkWidget *table; - GtkWidget *label; - GtkWidget *opacity_scale; GtkObject *opacity_scale_data; g_return_if_fail (GIMP_IS_IMAGE (gimage)); @@ -325,38 +323,27 @@ channels_new_channel_query (GimpImage *gimage, /* The table */ table = gtk_table_new (2, 3, FALSE); - gtk_table_set_col_spacings (GTK_TABLE (table), 4); + gtk_table_set_col_spacings (GTK_TABLE (table), 2); gtk_table_set_row_spacings (GTK_TABLE (table), 2); gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0); - /* The name entry hbox, label and entry */ - label = gtk_label_new (_("Channel name:")); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); - gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, - GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); - gtk_widget_show (label); - + /* The name entry */ options->name_entry = gtk_entry_new (); gtk_widget_set_size_request (options->name_entry, 150, -1); - gtk_table_attach_defaults (GTK_TABLE (table), options->name_entry, - 1, 2, 0, 1); gtk_entry_set_text (GTK_ENTRY (options->name_entry), (channel_name ? channel_name : _("New Channel"))); - gtk_widget_show (options->name_entry); + + gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, + _("Channel Name:"), 1.0, 0.5, + options->name_entry, 2, FALSE); /* The opacity scale */ - label = gtk_label_new (_("Fill Opacity:")); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 1.0); - gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, - GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); - gtk_widget_show (label); - - opacity_scale_data = - gtk_adjustment_new (channel_color.a * 100.0, 0.0, 100.0, 1.0, 1.0, 0.0); - opacity_scale = gtk_hscale_new (GTK_ADJUSTMENT (opacity_scale_data)); - gtk_table_attach_defaults (GTK_TABLE (table), opacity_scale, 1, 2, 1, 2); - gtk_scale_set_value_pos (GTK_SCALE (opacity_scale), GTK_POS_TOP); - gtk_widget_show (opacity_scale); + opacity_scale_data = gimp_scale_entry_new (GTK_TABLE (table), 0, 1, + _("Fill Opacity:"), -1, 50, + channel_color.a * 100.0, + 0.0, 100.0, 1.0, 10.0, 1, + TRUE, 0.0, 0.0, + NULL, NULL); g_signal_connect (G_OBJECT (opacity_scale_data), "value_changed", G_CALLBACK (channels_opacity_update), @@ -438,8 +425,6 @@ channels_edit_channel_query (GimpChannel *channel) GtkWidget *hbox; GtkWidget *vbox; GtkWidget *table; - GtkWidget *label; - GtkWidget *opacity_scale; GtkObject *opacity_scale_data; options = g_new0 (EditChannelOptions, 1); @@ -491,38 +476,27 @@ channels_edit_channel_query (GimpChannel *channel) /* The table */ table = gtk_table_new (2, 3, FALSE); - gtk_table_set_col_spacings (GTK_TABLE (table), 4); + gtk_table_set_col_spacings (GTK_TABLE (table), 2); gtk_table_set_row_spacings (GTK_TABLE (table), 2); gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0); /* The name entry */ - label = gtk_label_new (_("Channel name:")); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); - gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, - GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); - gtk_widget_show (label); - options->name_entry = gtk_entry_new (); gtk_widget_set_size_request (options->name_entry, 150, -1); - gtk_table_attach_defaults (GTK_TABLE (table), options->name_entry, - 1, 2, 0, 1); gtk_entry_set_text (GTK_ENTRY (options->name_entry), gimp_object_get_name (GIMP_OBJECT (channel))); - gtk_widget_show (options->name_entry); + + gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, + _("Channel Name:"), 1.0, 0.5, + options->name_entry, 2, FALSE); /* The opacity scale */ - label = gtk_label_new (_("Fill Opacity:")); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 1.0); - gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, - GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); - gtk_widget_show (label); - - opacity_scale_data = - gtk_adjustment_new (channel_color.a * 100.0, 0.0, 100.0, 1.0, 1.0, 0.0); - opacity_scale = gtk_hscale_new (GTK_ADJUSTMENT (opacity_scale_data)); - gtk_table_attach_defaults (GTK_TABLE (table), opacity_scale, 1, 2, 1, 2); - gtk_scale_set_value_pos (GTK_SCALE (opacity_scale), GTK_POS_TOP); - gtk_widget_show (opacity_scale); + opacity_scale_data = gimp_scale_entry_new (GTK_TABLE (table), 0, 1, + _("Fill Opacity:"), -1, 50, + channel_color.a * 100.0, + 0.0, 100.0, 1.0, 10.0, 1, + TRUE, 0.0, 0.0, + NULL, NULL); g_signal_connect (G_OBJECT (opacity_scale_data), "value_changed", G_CALLBACK (channels_opacity_update), diff --git a/app/gui/channels-commands.c b/app/gui/channels-commands.c index e26e525a5e..197ab16d1f 100644 --- a/app/gui/channels-commands.c +++ b/app/gui/channels-commands.c @@ -249,8 +249,6 @@ channels_new_channel_query (GimpImage *gimage, GtkWidget *hbox; GtkWidget *vbox; GtkWidget *table; - GtkWidget *label; - GtkWidget *opacity_scale; GtkObject *opacity_scale_data; g_return_if_fail (GIMP_IS_IMAGE (gimage)); @@ -325,38 +323,27 @@ channels_new_channel_query (GimpImage *gimage, /* The table */ table = gtk_table_new (2, 3, FALSE); - gtk_table_set_col_spacings (GTK_TABLE (table), 4); + gtk_table_set_col_spacings (GTK_TABLE (table), 2); gtk_table_set_row_spacings (GTK_TABLE (table), 2); gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0); - /* The name entry hbox, label and entry */ - label = gtk_label_new (_("Channel name:")); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); - gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, - GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); - gtk_widget_show (label); - + /* The name entry */ options->name_entry = gtk_entry_new (); gtk_widget_set_size_request (options->name_entry, 150, -1); - gtk_table_attach_defaults (GTK_TABLE (table), options->name_entry, - 1, 2, 0, 1); gtk_entry_set_text (GTK_ENTRY (options->name_entry), (channel_name ? channel_name : _("New Channel"))); - gtk_widget_show (options->name_entry); + + gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, + _("Channel Name:"), 1.0, 0.5, + options->name_entry, 2, FALSE); /* The opacity scale */ - label = gtk_label_new (_("Fill Opacity:")); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 1.0); - gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, - GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); - gtk_widget_show (label); - - opacity_scale_data = - gtk_adjustment_new (channel_color.a * 100.0, 0.0, 100.0, 1.0, 1.0, 0.0); - opacity_scale = gtk_hscale_new (GTK_ADJUSTMENT (opacity_scale_data)); - gtk_table_attach_defaults (GTK_TABLE (table), opacity_scale, 1, 2, 1, 2); - gtk_scale_set_value_pos (GTK_SCALE (opacity_scale), GTK_POS_TOP); - gtk_widget_show (opacity_scale); + opacity_scale_data = gimp_scale_entry_new (GTK_TABLE (table), 0, 1, + _("Fill Opacity:"), -1, 50, + channel_color.a * 100.0, + 0.0, 100.0, 1.0, 10.0, 1, + TRUE, 0.0, 0.0, + NULL, NULL); g_signal_connect (G_OBJECT (opacity_scale_data), "value_changed", G_CALLBACK (channels_opacity_update), @@ -438,8 +425,6 @@ channels_edit_channel_query (GimpChannel *channel) GtkWidget *hbox; GtkWidget *vbox; GtkWidget *table; - GtkWidget *label; - GtkWidget *opacity_scale; GtkObject *opacity_scale_data; options = g_new0 (EditChannelOptions, 1); @@ -491,38 +476,27 @@ channels_edit_channel_query (GimpChannel *channel) /* The table */ table = gtk_table_new (2, 3, FALSE); - gtk_table_set_col_spacings (GTK_TABLE (table), 4); + gtk_table_set_col_spacings (GTK_TABLE (table), 2); gtk_table_set_row_spacings (GTK_TABLE (table), 2); gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0); /* The name entry */ - label = gtk_label_new (_("Channel name:")); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); - gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, - GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); - gtk_widget_show (label); - options->name_entry = gtk_entry_new (); gtk_widget_set_size_request (options->name_entry, 150, -1); - gtk_table_attach_defaults (GTK_TABLE (table), options->name_entry, - 1, 2, 0, 1); gtk_entry_set_text (GTK_ENTRY (options->name_entry), gimp_object_get_name (GIMP_OBJECT (channel))); - gtk_widget_show (options->name_entry); + + gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, + _("Channel Name:"), 1.0, 0.5, + options->name_entry, 2, FALSE); /* The opacity scale */ - label = gtk_label_new (_("Fill Opacity:")); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 1.0); - gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, - GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); - gtk_widget_show (label); - - opacity_scale_data = - gtk_adjustment_new (channel_color.a * 100.0, 0.0, 100.0, 1.0, 1.0, 0.0); - opacity_scale = gtk_hscale_new (GTK_ADJUSTMENT (opacity_scale_data)); - gtk_table_attach_defaults (GTK_TABLE (table), opacity_scale, 1, 2, 1, 2); - gtk_scale_set_value_pos (GTK_SCALE (opacity_scale), GTK_POS_TOP); - gtk_widget_show (opacity_scale); + opacity_scale_data = gimp_scale_entry_new (GTK_TABLE (table), 0, 1, + _("Fill Opacity:"), -1, 50, + channel_color.a * 100.0, + 0.0, 100.0, 1.0, 10.0, 1, + TRUE, 0.0, 0.0, + NULL, NULL); g_signal_connect (G_OBJECT (opacity_scale_data), "value_changed", G_CALLBACK (channels_opacity_update), diff --git a/app/paint/gimpink.c b/app/paint/gimpink.c index 68bf708829..49547fdd7d 100644 --- a/app/paint/gimpink.c +++ b/app/paint/gimpink.c @@ -1413,7 +1413,6 @@ ink_options_new (GimpToolInfo *tool_info) GtkWidget *hbox2; GtkWidget *radio_button; GtkWidget *pixmap_widget; - GtkWidget *slider; GtkWidget *frame; GtkWidget *darea; GdkPixmap *pixmap; @@ -1447,35 +1446,31 @@ ink_options_new (GimpToolInfo *tool_info) gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, TRUE, 0); gtk_widget_show (frame); - table = gtk_table_new (2, 2, FALSE); - gtk_table_set_col_spacings (GTK_TABLE (table), 4); + 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); /* size slider */ - options->size_w = - gtk_adjustment_new (options->size_d, 0.0, 20.0, 1.0, 2.0, 0.0); - slider = gtk_hscale_new (GTK_ADJUSTMENT (options->size_w)); - gtk_scale_set_value_pos (GTK_SCALE (slider), GTK_POS_TOP); - gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, - _("Size:"), 1.0, 1.0, - slider, 1, FALSE); - gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED); + options->size_w = gimp_scale_entry_new (GTK_TABLE (table), 0, 0, + _("Size:"), -1, 50, + options->size_d, + 0.0, 20.0, 1.0, 2.0, 1, + TRUE, 0.0, 0.0, + NULL, NULL); g_signal_connect (G_OBJECT (options->size_w), "value_changed", G_CALLBACK (gimp_double_adjustment_update), &options->size); /* angle adjust slider */ - options->tilt_angle_w = - gtk_adjustment_new (options->tilt_angle_d, -90.0, 90.0, 1, 10.0, 0.0); - slider = gtk_hscale_new (GTK_ADJUSTMENT (options->tilt_angle_w)); - gtk_scale_set_value_pos (GTK_SCALE (slider), GTK_POS_TOP); - gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, - _("Angle:"), 1.0, 1.0, - slider, 1, FALSE); - gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED); + options->tilt_angle_w = gimp_scale_entry_new (GTK_TABLE (table), 0, 1, + _("Angle:"), -1, 50, + options->tilt_angle_d, + -90.0, 90.0, 1, 10.0, 1, + TRUE, 0.0, 0.0, + NULL, NULL); g_signal_connect (G_OBJECT (options->tilt_angle_w), "value_changed", G_CALLBACK (gimp_double_adjustment_update), @@ -1487,49 +1482,43 @@ ink_options_new (GimpToolInfo *tool_info) gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, TRUE, 0); gtk_widget_show (frame); - table = gtk_table_new (3, 2, FALSE); - gtk_table_set_col_spacings (GTK_TABLE (table), 4); + 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); /* size sens slider */ - options->sensitivity_w = - gtk_adjustment_new (options->sensitivity_d, 0.0, 1.0, 0.01, 0.1, 0.0); - slider = gtk_hscale_new (GTK_ADJUSTMENT (options->sensitivity_w)); - gtk_scale_set_value_pos (GTK_SCALE (slider), GTK_POS_TOP); - gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, - _("Size:"), 1.0, 1.0, - slider, 1, FALSE); - gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED); + options->sensitivity_w = gimp_scale_entry_new (GTK_TABLE (table), 0, 0, + _("Size:"), -1, 50, + options->sensitivity_d, + 0.0, 1.0, 0.01, 0.1, 1, + TRUE, 0.0, 0.0, + NULL, NULL); g_signal_connect (G_OBJECT (options->sensitivity_w), "value_changed", G_CALLBACK (gimp_double_adjustment_update), &options->sensitivity); /* tilt sens slider */ - options->tilt_sensitivity_w = - gtk_adjustment_new (options->tilt_sensitivity_d, 0.0, 1.0, 0.01, 0.1, 0.0); - slider = gtk_hscale_new (GTK_ADJUSTMENT (options->tilt_sensitivity_w)); - gtk_scale_set_value_pos (GTK_SCALE (slider), GTK_POS_TOP); - gimp_table_attach_aligned (GTK_TABLE (table), 0, 2, - _("Tilt:"), 1.0, 1.0, - slider, 1, FALSE); - gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED); + options->tilt_sensitivity_w = gimp_scale_entry_new (GTK_TABLE (table), 0, 1, + _("Tilt:"), -1, 50, + options->tilt_sensitivity_d, + 0.0, 1.0, 0.01, 0.1, 1, + TRUE, 0.0, 0.0, + NULL, NULL); g_signal_connect (G_OBJECT (options->tilt_sensitivity_w), "value_changed", G_CALLBACK (gimp_double_adjustment_update), &options->tilt_sensitivity); /* velocity sens slider */ - options->vel_sensitivity_w = - gtk_adjustment_new (options->vel_sensitivity_d, 0.0, 1.0, 0.01, 0.1, 0.0); - slider = gtk_hscale_new (GTK_ADJUSTMENT (options->vel_sensitivity_w)); - gtk_scale_set_value_pos (GTK_SCALE (slider), GTK_POS_TOP); - gimp_table_attach_aligned (GTK_TABLE (table), 0, 3, - _("Speed:"), 1.0, 1.0, - slider, 1, FALSE); - gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED); + options->vel_sensitivity_w = gimp_scale_entry_new (GTK_TABLE (table), 0, 2, + _("Speed:"), -1, 50, + options->vel_sensitivity_d, + 0.0, 1.0, 0.01, 0.1, 1, + TRUE, 0.0, 0.0, + NULL, NULL); g_signal_connect (G_OBJECT (options->vel_sensitivity_w), "value_changed", G_CALLBACK (gimp_double_adjustment_update), diff --git a/app/tools/gimpairbrushtool.c b/app/tools/gimpairbrushtool.c index 66e70580d1..4c4e481f74 100644 --- a/app/tools/gimpairbrushtool.c +++ b/app/tools/gimpairbrushtool.c @@ -128,7 +128,6 @@ airbrush_options_new (GimpToolInfo *tool_info) GimpAirbrushOptions *options; GtkWidget *vbox; GtkWidget *table; - GtkWidget *scale; options = gimp_airbrush_options_new (); @@ -140,37 +139,33 @@ airbrush_options_new (GimpToolInfo *tool_info) vbox = ((GimpToolOptions *) options)->main_vbox; /* the rate scale */ - table = gtk_table_new (2, 2, FALSE); - gtk_table_set_col_spacing (GTK_TABLE (table), 0, 4); - gtk_table_set_row_spacings (GTK_TABLE (table), 1); + table = gtk_table_new (2, 3, FALSE); + gtk_table_set_col_spacing (GTK_TABLE (table), 0, 2); gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0); + gtk_widget_show (table); + + options->rate_w = gimp_scale_entry_new (GTK_TABLE (table), 0, 0, + _("Rate:"), -1, 50, + options->rate_d, + 0.0, 150.0, 1.0, 1.0, 1, + TRUE, 0.0, 0.0, + NULL, NULL); - options->rate_w = - gtk_adjustment_new (options->rate_d, 0.0, 150.0, 1.0, 1.0, 0.0); - scale = gtk_hscale_new (GTK_ADJUSTMENT (options->rate_w)); - gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); - gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED); g_signal_connect (G_OBJECT (options->rate_w), "value_changed", G_CALLBACK (gimp_double_adjustment_update), &options->rate); - gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, - _("Rate:"), 1.0, 1.0, - scale, 1, FALSE); /* the pressure scale */ - options->pressure_w = - gtk_adjustment_new (options->pressure_d, 0.0, 100.0, 1.0, 1.0, 0.0); - scale = gtk_hscale_new (GTK_ADJUSTMENT (options->pressure_w)); - gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); - gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED); + options->pressure_w = gimp_scale_entry_new (GTK_TABLE (table), 0, 1, + _("Pressure:"), -1, 50, + options->pressure_d, + 0.0, 100.0, 1.0, 1.0, 1, + TRUE, 0.0, 0.0, + NULL, NULL); + g_signal_connect (G_OBJECT (options->pressure_w), "value_changed", G_CALLBACK (gimp_double_adjustment_update), &options->pressure); - gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, - _("Pressure:"), 1.0, 1.0, - scale, 1, FALSE); - - gtk_widget_show (table); return (GimpToolOptions *) options; } diff --git a/app/tools/gimpblendtool.c b/app/tools/gimpblendtool.c index bf42ef234e..10d3ee7a64 100644 --- a/app/tools/gimpblendtool.c +++ b/app/tools/gimpblendtool.c @@ -437,7 +437,6 @@ blend_options_new (GimpToolInfo *tool_info) GtkWidget *vbox; GtkWidget *table; - GtkWidget *scale; GtkWidget *frame; /* the new blend tool options structure */ @@ -478,83 +477,115 @@ blend_options_new (GimpToolInfo *tool_info) options); /* the offset scale */ - table = gtk_table_new (4, 2, FALSE); - gtk_table_set_col_spacing (GTK_TABLE (table), 0, 4); + table = gtk_table_new (4, 3, FALSE); + gtk_table_set_col_spacings (GTK_TABLE (table), 2); gtk_table_set_row_spacings (GTK_TABLE (table), 1); - gtk_table_set_row_spacing (GTK_TABLE (table), 0, 2); - gtk_box_pack_start (GTK_BOX (vbox), table, TRUE, TRUE, 0); - - options->offset_w = - gtk_adjustment_new (options->offset_d, 0.0, 100.0, 1.0, 1.0, 0.0); - scale = gtk_hscale_new (GTK_ADJUSTMENT (options->offset_w)); - gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); - gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED); - gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, - _("Offset:"), 1.0, 1.0, - scale, 1, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0); + gtk_widget_show (table); + + options->offset_w = gimp_scale_entry_new (GTK_TABLE (table), 0, 0, + _("Offset:"), -1, 50, + options->offset_d, + 0.0, 100.0, 1.0, 10.0, 1, + TRUE, 0.0, 0.0, + NULL, NULL); + g_signal_connect (G_OBJECT (options->offset_w), "value_changed", G_CALLBACK (gimp_double_adjustment_update), &options->offset); /* the blend mode menu */ - options->blend_mode_w = gimp_option_menu_new2 - (FALSE, - G_CALLBACK (gimp_menu_item_update), - &options->blend_mode, - GINT_TO_POINTER (options->blend_mode_d), + options->blend_mode_w = + gimp_option_menu_new2 (FALSE, + G_CALLBACK (gimp_menu_item_update), + &options->blend_mode, + GINT_TO_POINTER (options->blend_mode_d), + + _("FG to BG (RGB)"), + GINT_TO_POINTER (GIMP_FG_BG_RGB_MODE), NULL, + + _("FG to BG (HSV)"), + GINT_TO_POINTER (GIMP_FG_BG_HSV_MODE), NULL, - _("FG to BG (RGB)"), GINT_TO_POINTER (GIMP_FG_BG_RGB_MODE), NULL, - _("FG to BG (HSV)"), GINT_TO_POINTER (GIMP_FG_BG_HSV_MODE), NULL, - _("FG to Transparent"), GINT_TO_POINTER (GIMP_FG_TRANS_MODE), NULL, - _("Custom Gradient"), GINT_TO_POINTER (GIMP_CUSTOM_MODE), NULL, + _("FG to Transparent"), + GINT_TO_POINTER (GIMP_FG_TRANS_MODE), NULL, - NULL); + _("Custom Gradient"), + GINT_TO_POINTER (GIMP_CUSTOM_MODE), NULL, + + NULL); gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, _("Blend:"), 1.0, 0.5, - options->blend_mode_w, 1, TRUE); + options->blend_mode_w, 2, TRUE); /* the gradient type menu */ - options->gradient_type_w = gimp_option_menu_new2 - (FALSE, - G_CALLBACK (gradient_type_callback), - options, - GINT_TO_POINTER (options->gradient_type_d), - - _("Linear"), GINT_TO_POINTER (GIMP_LINEAR), NULL, - _("Bi-Linear"), GINT_TO_POINTER (GIMP_BILINEAR), NULL, - _("Radial"), GINT_TO_POINTER (GIMP_RADIAL), NULL, - _("Square"), GINT_TO_POINTER (GIMP_SQUARE), NULL, - _("Conical (symmetric)"), GINT_TO_POINTER (GIMP_CONICAL_SYMMETRIC), NULL, - _("Conical (asymmetric)"), GINT_TO_POINTER (GIMP_CONICAL_ASYMMETRIC), NULL, - _("Shapeburst (angular)"), GINT_TO_POINTER (GIMP_SHAPEBURST_ANGULAR), NULL, - _("Shapeburst (spherical)"), GINT_TO_POINTER (GIMP_SHAPEBURST_SPHERICAL), NULL, - _("Shapeburst (dimpled)"), GINT_TO_POINTER (GIMP_SHAPEBURST_DIMPLED), NULL, - _("Spiral (clockwise)"), GINT_TO_POINTER (GIMP_SPIRAL_CLOCKWISE), NULL, - _("Spiral (anticlockwise)"), GINT_TO_POINTER (GIMP_SPIRAL_ANTICLOCKWISE), NULL, - - NULL); + options->gradient_type_w = + gimp_option_menu_new2 (FALSE, + G_CALLBACK (gradient_type_callback), + options, + GINT_TO_POINTER (options->gradient_type_d), + + _("Linear"), + GINT_TO_POINTER (GIMP_LINEAR), NULL, + + _("Bi-Linear"), + GINT_TO_POINTER (GIMP_BILINEAR), NULL, + + _("Radial"), + GINT_TO_POINTER (GIMP_RADIAL), NULL, + + _("Square"), + GINT_TO_POINTER (GIMP_SQUARE), NULL, + + _("Conical (symmetric)"), + GINT_TO_POINTER (GIMP_CONICAL_SYMMETRIC), NULL, + + _("Conical (asymmetric)"), + GINT_TO_POINTER (GIMP_CONICAL_ASYMMETRIC), NULL, + + _("Shapeburst (angular)"), + GINT_TO_POINTER (GIMP_SHAPEBURST_ANGULAR), NULL, + + _("Shapeburst (spherical)"), + GINT_TO_POINTER (GIMP_SHAPEBURST_SPHERICAL), NULL, + + _("Shapeburst (dimpled)"), + GINT_TO_POINTER (GIMP_SHAPEBURST_DIMPLED), NULL, + + _("Spiral (clockwise)"), + GINT_TO_POINTER (GIMP_SPIRAL_CLOCKWISE), NULL, + + _("Spiral (anticlockwise)"), + GINT_TO_POINTER (GIMP_SPIRAL_ANTICLOCKWISE), NULL, + + NULL); gimp_table_attach_aligned (GTK_TABLE (table), 0, 2, _("Gradient:"), 1.0, 0.5, - options->gradient_type_w, 1, TRUE); + options->gradient_type_w, 2, TRUE); /* the repeat option */ - options->repeat_w = gimp_option_menu_new2 - (FALSE, - G_CALLBACK (gimp_menu_item_update), - &options->repeat, - GINT_TO_POINTER (options->repeat_d), + options->repeat_w = + gimp_option_menu_new2 (FALSE, + G_CALLBACK (gimp_menu_item_update), + &options->repeat, + GINT_TO_POINTER (options->repeat_d), + + _("None"), + GINT_TO_POINTER (GIMP_REPEAT_NONE), NULL, - _("None"), GINT_TO_POINTER (GIMP_REPEAT_NONE), NULL, - _("Sawtooth Wave"), GINT_TO_POINTER (GIMP_REPEAT_SAWTOOTH), NULL, - _("Triangular Wave"), GINT_TO_POINTER (GIMP_REPEAT_TRIANGULAR), NULL, + _("Sawtooth Wave"), + GINT_TO_POINTER (GIMP_REPEAT_SAWTOOTH), NULL, - NULL); + _("Triangular Wave"), + GINT_TO_POINTER (GIMP_REPEAT_TRIANGULAR), NULL, + + NULL); gimp_table_attach_aligned (GTK_TABLE (table), 0, 3, _("Repeat:"), 1.0, 0.5, - options->repeat_w, 1, TRUE); + options->repeat_w, 2, TRUE); /* show the table */ gtk_widget_show (table); @@ -583,9 +614,9 @@ blend_options_new (GimpToolInfo *tool_info) &options->supersample); /* table for supersampling options */ - table = gtk_table_new (2, 2, FALSE); + table = gtk_table_new (2, 3, FALSE); gtk_container_set_border_width (GTK_CONTAINER (table), 2); - gtk_table_set_col_spacing (GTK_TABLE (table), 0, 4); + gtk_table_set_col_spacings (GTK_TABLE (table), 2); gtk_table_set_row_spacings (GTK_TABLE (table), 1); gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0); @@ -595,28 +626,24 @@ blend_options_new (GimpToolInfo *tool_info) table); /* max depth scale */ - options->max_depth_w = - gtk_adjustment_new (options->max_depth_d, 1.0, 10.0, 1.0, 1.0, 1.0); - scale = gtk_hscale_new (GTK_ADJUSTMENT (options->max_depth_w)); - gtk_scale_set_digits (GTK_SCALE (scale), 0); - gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); - gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, - _("Max Depth:"), 1.0, 1.0, - scale, 1, FALSE); + options->max_depth_w = gimp_scale_entry_new (GTK_TABLE (table), 0, 0, + _("Max Depth:"), -1, 50, + options->max_depth_d, + 1.0, 10.0, 1.0, 1.0, 0, + TRUE, 0.0, 0.0, + NULL, NULL); g_signal_connect (G_OBJECT(options->max_depth_w), "value_changed", G_CALLBACK (gimp_int_adjustment_update), &options->max_depth); /* threshold scale */ - options->threshold_w = - gtk_adjustment_new (options->threshold_d, 0.0, 4.0, 0.01, 0.01, 0.0); - scale = gtk_hscale_new (GTK_ADJUSTMENT (options->threshold_w)); - gtk_scale_set_digits (GTK_SCALE (scale), 2); - gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); - gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, - _("Threshold:"), 1.0, 1.0, - scale, 1, FALSE); + options->threshold_w = gimp_scale_entry_new (GTK_TABLE (table), 0, 1, + _("Threshold:"), -1, 50, + options->threshold_d, + 0.0, 4.0, 0.01, 0.1, 2, + TRUE, 0.0, 0.0, + NULL, NULL); g_signal_connect (G_OBJECT(options->threshold_w), "value_changed", G_CALLBACK (gimp_double_adjustment_update), diff --git a/app/tools/gimpbucketfilltool.c b/app/tools/gimpbucketfilltool.c index b6f578a54d..383e2b67aa 100644 --- a/app/tools/gimpbucketfilltool.c +++ b/app/tools/gimpbucketfilltool.c @@ -334,9 +334,7 @@ bucket_options_new (GimpToolInfo *tool_info) GtkWidget *vbox; GtkWidget *vbox2; - GtkWidget *hbox; - GtkWidget *label; - GtkWidget *scale; + GtkWidget *table; GtkWidget *frame; options = g_new0 (BucketOptions, 1); @@ -396,24 +394,18 @@ bucket_options_new (GimpToolInfo *tool_info) &options->sample_merged); /* the threshold scale */ - hbox = gtk_hbox_new (FALSE, 4); - gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0); - gtk_widget_show (hbox); - - label = gtk_label_new (_("Threshold:")); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 1.0); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); - gtk_widget_show (label); - - options->threshold_w = - gtk_adjustment_new (gimprc.default_threshold, 0.0, 255.0, 1.0, 1.0, 0.0); - scale = gtk_hscale_new (GTK_ADJUSTMENT (options->threshold_w)); - gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE, TRUE, 0); - gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); - gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED); - gtk_widget_show (scale); - - gimp_help_set_help_data (scale, _("Maximum color difference"), NULL); + table = gtk_table_new (1, 3, FALSE); + gtk_table_set_col_spacings (GTK_TABLE (table), 2); + gtk_box_pack_start (GTK_BOX (vbox2), table, FALSE, FALSE, 0); + gtk_widget_show (table); + + options->threshold_w = gimp_scale_entry_new (GTK_TABLE (table), 0, 0, + _("Threshold:"), -1, 50, + gimprc.default_threshold, + 0.0, 255.0, 1.0, 16.0, 1, + TRUE, 0.0, 0.0, + _("Maximum color difference"), + NULL); g_signal_connect (G_OBJECT (options->threshold_w), "value_changed", G_CALLBACK (gimp_double_adjustment_update), diff --git a/app/tools/gimpcolorpickertool.c b/app/tools/gimpcolorpickertool.c index ed84af46f1..6cd08ce1fe 100644 --- a/app/tools/gimpcolorpickertool.c +++ b/app/tools/gimpcolorpickertool.c @@ -685,10 +685,8 @@ gimp_color_picker_tool_options_new (GimpToolInfo *tool_info) GimpColorPickerToolOptions *options; GtkWidget *vbox; - GtkWidget *abox; + GtkWidget *frame; GtkWidget *table; - GtkWidget *label; - GtkWidget *scale; options = g_new0 (GimpColorPickerToolOptions, 1); @@ -710,57 +708,50 @@ gimp_color_picker_tool_options_new (GimpToolInfo *tool_info) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->sample_merged_w), options->sample_merged_d); gtk_box_pack_start (GTK_BOX (vbox), options->sample_merged_w, FALSE, FALSE, 0); + gtk_widget_show (options->sample_merged_w); + g_signal_connect (G_OBJECT (options->sample_merged_w), "toggled", G_CALLBACK (gimp_toggle_button_update), &options->sample_merged); - gtk_widget_show (options->sample_merged_w); /* the sample average options */ - table = gtk_table_new (2, 2, FALSE); - gtk_table_set_col_spacing (GTK_TABLE (table), 0, 4); - gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0); + frame = gtk_frame_new (NULL); + gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN); + gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0); + gtk_widget_show (frame); + + 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); options->sample_average_w = gtk_check_button_new_with_label (_("Sample Average")); - gtk_table_attach (GTK_TABLE (table), options->sample_average_w, 0, 1, 0, 1, - GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->sample_average_w), options->sample_average_d); + gtk_frame_set_label_widget (GTK_FRAME (frame), options->sample_average_w); + gtk_widget_show (options->sample_average_w); + g_signal_connect (G_OBJECT (options->sample_average_w), "toggled", G_CALLBACK (gimp_toggle_button_update), &options->sample_average); - gtk_widget_show (options->sample_average_w); - - label = gtk_label_new (_("Radius:")); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 1.0); - gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, - GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); - gtk_widget_show (label); - /* the feather radius scale */ - abox = gtk_alignment_new (0.5, 1.0, 1.0, 0.0); - gtk_table_attach (GTK_TABLE (table), abox, 1, 2, 0, 2, - GTK_EXPAND | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); - gtk_widget_show (abox); + gtk_widget_set_sensitive (table, options->sample_average_d); + g_object_set_data (G_OBJECT (options->sample_average_w), "set_sensitive", + table); options->average_radius_w = - gtk_adjustment_new (options->average_radius_d, 1.0, 15.0, 2.0, 2.0, 0.0); - scale = gtk_hscale_new (GTK_ADJUSTMENT (options->average_radius_w)); - gtk_scale_set_digits (GTK_SCALE (scale), 0); - gtk_container_add (GTK_CONTAINER (abox), scale); - gtk_widget_set_sensitive (scale, options->sample_average_d); - g_object_set_data (G_OBJECT (options->sample_average_w), "set_sensitive", - scale); - gtk_widget_set_sensitive (label, options->sample_average_d); - g_object_set_data (G_OBJECT (scale), "set_sensitive", - label); - gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); - gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED); + gimp_scale_entry_new (GTK_TABLE (table), 0, 0, + _("Radius:"), -1, 50, + options->average_radius_d, + 1.0, 15.0, 1.0, 3.0, 0, + TRUE, 0.0, 0.0, + NULL, NULL); + g_signal_connect (G_OBJECT (options->average_radius_w), "value_changed", G_CALLBACK (gimp_double_adjustment_update), &options->average_radius); - gtk_widget_show (scale); - gtk_widget_show (table); /* the update active color toggle button */ options->update_active_w = @@ -768,10 +759,11 @@ gimp_color_picker_tool_options_new (GimpToolInfo *tool_info) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->update_active_w), options->update_active_d); gtk_box_pack_start (GTK_BOX (vbox), options->update_active_w, FALSE, FALSE, 0); + gtk_widget_show (options->update_active_w); + g_signal_connect (G_OBJECT (options->update_active_w), "toggled", G_CALLBACK (gimp_toggle_button_update), &options->update_active); - gtk_widget_show (options->update_active_w); return (GimpToolOptions *) options; } diff --git a/app/tools/gimpconvolvetool.c b/app/tools/gimpconvolvetool.c index 5013b6e007..9d302d66cc 100644 --- a/app/tools/gimpconvolvetool.c +++ b/app/tools/gimpconvolvetool.c @@ -203,9 +203,7 @@ convolve_options_new (GimpToolInfo *tool_info) { GimpConvolveOptions *options; GtkWidget *vbox; - GtkWidget *hbox; - GtkWidget *label; - GtkWidget *scale; + GtkWidget *table; GtkWidget *frame; options = gimp_convolve_options_new (); @@ -217,27 +215,6 @@ convolve_options_new (GimpToolInfo *tool_info) /* the main vbox */ vbox = ((GimpToolOptions *) options)->main_vbox; - /* the rate scale */ - hbox = gtk_hbox_new (FALSE, 4); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); - - label = gtk_label_new (_("Rate:")); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 1.0); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); - gtk_widget_show (label); - - options->rate_w = - gtk_adjustment_new (options->rate_d, 0.0, 100.0, 1.0, 1.0, 0.0); - scale = gtk_hscale_new (GTK_ADJUSTMENT (options->rate_w)); - gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE, TRUE, 0); - gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); - gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED); - g_signal_connect (G_OBJECT (options->rate_w), "value_changed", - G_CALLBACK (gimp_double_adjustment_update), - &options->rate); - gtk_widget_show (scale); - gtk_widget_show (hbox); - frame = gimp_radio_group_new2 (TRUE, _("Convolve Type ()"), G_CALLBACK (gimp_radio_button_update), &options->type, @@ -256,6 +233,23 @@ convolve_options_new (GimpToolInfo *tool_info) gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0); gtk_widget_show (frame); + /* the rate scale */ + table = gtk_table_new (1, 3, FALSE); + gtk_table_set_col_spacings (GTK_TABLE (table), 2); + gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0); + gtk_widget_show (table); + + options->rate_w = gimp_scale_entry_new (GTK_TABLE (table), 0, 0, + _("Rate:"), -1, 50, + options->rate_d, + 0.0, 100.0, 1.0, 10.0, 1, + TRUE, 0.0, 0.0, + NULL, NULL); + + g_signal_connect (G_OBJECT (options->rate_w), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &options->rate); + return (GimpToolOptions *) options; } diff --git a/app/tools/gimpdodgeburntool.c b/app/tools/gimpdodgeburntool.c index c1411c2467..163ce13a50 100644 --- a/app/tools/gimpdodgeburntool.c +++ b/app/tools/gimpdodgeburntool.c @@ -181,9 +181,7 @@ gimp_dodgeburn_tool_options_new (GimpToolInfo *tool_info) { GimpDodgeBurnOptions *options; GtkWidget *vbox; - GtkWidget *hbox; - GtkWidget *label; - GtkWidget *scale; + GtkWidget *table; GtkWidget *frame; options = gimp_dodgeburn_options_new (); @@ -195,29 +193,6 @@ gimp_dodgeburn_tool_options_new (GimpToolInfo *tool_info) /* the main vbox */ vbox = ((GimpToolOptions *) options)->main_vbox; - /* the exposure scale */ - hbox = gtk_hbox_new (FALSE, 4); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); - - label = gtk_label_new (_("Exposure:")); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 1.0); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); - gtk_widget_show (label); - - options->exposure_w = - gtk_adjustment_new (options->exposure_d, 0.0, 100.0, 1.0, 1.0, 0.0); - scale = gtk_hscale_new (GTK_ADJUSTMENT (options->exposure_w)); - gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE, TRUE, 0); - gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); - gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED); - - g_signal_connect (G_OBJECT (options->exposure_w), "value_changed", - G_CALLBACK (gimp_double_adjustment_update), - &options->exposure); - - gtk_widget_show (scale); - gtk_widget_show (hbox); - /* the type (dodge or burn) */ frame = gimp_radio_group_new2 (TRUE, _("Type ()"), G_CALLBACK (gimp_radio_button_update), @@ -260,6 +235,23 @@ gimp_dodgeburn_tool_options_new (GimpToolInfo *tool_info) gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0); gtk_widget_show (frame); + /* the exposure scale */ + table = gtk_table_new (1, 3, FALSE); + gtk_table_set_col_spacings (GTK_TABLE (table), 2); + gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0); + gtk_widget_show (table); + + options->exposure_w = gimp_scale_entry_new (GTK_TABLE (table), 0, 0, + _("Exposure:"), -1, 50, + options->exposure_d, + 0.0, 100.0, 1.0, 10.0, 1, + TRUE, 0.0, 0.0, + NULL, NULL); + + g_signal_connect (G_OBJECT (options->exposure_w), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &options->exposure); + return (GimpToolOptions *) options; } diff --git a/app/tools/gimpinktool.c b/app/tools/gimpinktool.c index 68bf708829..49547fdd7d 100644 --- a/app/tools/gimpinktool.c +++ b/app/tools/gimpinktool.c @@ -1413,7 +1413,6 @@ ink_options_new (GimpToolInfo *tool_info) GtkWidget *hbox2; GtkWidget *radio_button; GtkWidget *pixmap_widget; - GtkWidget *slider; GtkWidget *frame; GtkWidget *darea; GdkPixmap *pixmap; @@ -1447,35 +1446,31 @@ ink_options_new (GimpToolInfo *tool_info) gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, TRUE, 0); gtk_widget_show (frame); - table = gtk_table_new (2, 2, FALSE); - gtk_table_set_col_spacings (GTK_TABLE (table), 4); + 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); /* size slider */ - options->size_w = - gtk_adjustment_new (options->size_d, 0.0, 20.0, 1.0, 2.0, 0.0); - slider = gtk_hscale_new (GTK_ADJUSTMENT (options->size_w)); - gtk_scale_set_value_pos (GTK_SCALE (slider), GTK_POS_TOP); - gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, - _("Size:"), 1.0, 1.0, - slider, 1, FALSE); - gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED); + options->size_w = gimp_scale_entry_new (GTK_TABLE (table), 0, 0, + _("Size:"), -1, 50, + options->size_d, + 0.0, 20.0, 1.0, 2.0, 1, + TRUE, 0.0, 0.0, + NULL, NULL); g_signal_connect (G_OBJECT (options->size_w), "value_changed", G_CALLBACK (gimp_double_adjustment_update), &options->size); /* angle adjust slider */ - options->tilt_angle_w = - gtk_adjustment_new (options->tilt_angle_d, -90.0, 90.0, 1, 10.0, 0.0); - slider = gtk_hscale_new (GTK_ADJUSTMENT (options->tilt_angle_w)); - gtk_scale_set_value_pos (GTK_SCALE (slider), GTK_POS_TOP); - gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, - _("Angle:"), 1.0, 1.0, - slider, 1, FALSE); - gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED); + options->tilt_angle_w = gimp_scale_entry_new (GTK_TABLE (table), 0, 1, + _("Angle:"), -1, 50, + options->tilt_angle_d, + -90.0, 90.0, 1, 10.0, 1, + TRUE, 0.0, 0.0, + NULL, NULL); g_signal_connect (G_OBJECT (options->tilt_angle_w), "value_changed", G_CALLBACK (gimp_double_adjustment_update), @@ -1487,49 +1482,43 @@ ink_options_new (GimpToolInfo *tool_info) gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, TRUE, 0); gtk_widget_show (frame); - table = gtk_table_new (3, 2, FALSE); - gtk_table_set_col_spacings (GTK_TABLE (table), 4); + 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); /* size sens slider */ - options->sensitivity_w = - gtk_adjustment_new (options->sensitivity_d, 0.0, 1.0, 0.01, 0.1, 0.0); - slider = gtk_hscale_new (GTK_ADJUSTMENT (options->sensitivity_w)); - gtk_scale_set_value_pos (GTK_SCALE (slider), GTK_POS_TOP); - gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, - _("Size:"), 1.0, 1.0, - slider, 1, FALSE); - gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED); + options->sensitivity_w = gimp_scale_entry_new (GTK_TABLE (table), 0, 0, + _("Size:"), -1, 50, + options->sensitivity_d, + 0.0, 1.0, 0.01, 0.1, 1, + TRUE, 0.0, 0.0, + NULL, NULL); g_signal_connect (G_OBJECT (options->sensitivity_w), "value_changed", G_CALLBACK (gimp_double_adjustment_update), &options->sensitivity); /* tilt sens slider */ - options->tilt_sensitivity_w = - gtk_adjustment_new (options->tilt_sensitivity_d, 0.0, 1.0, 0.01, 0.1, 0.0); - slider = gtk_hscale_new (GTK_ADJUSTMENT (options->tilt_sensitivity_w)); - gtk_scale_set_value_pos (GTK_SCALE (slider), GTK_POS_TOP); - gimp_table_attach_aligned (GTK_TABLE (table), 0, 2, - _("Tilt:"), 1.0, 1.0, - slider, 1, FALSE); - gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED); + options->tilt_sensitivity_w = gimp_scale_entry_new (GTK_TABLE (table), 0, 1, + _("Tilt:"), -1, 50, + options->tilt_sensitivity_d, + 0.0, 1.0, 0.01, 0.1, 1, + TRUE, 0.0, 0.0, + NULL, NULL); g_signal_connect (G_OBJECT (options->tilt_sensitivity_w), "value_changed", G_CALLBACK (gimp_double_adjustment_update), &options->tilt_sensitivity); /* velocity sens slider */ - options->vel_sensitivity_w = - gtk_adjustment_new (options->vel_sensitivity_d, 0.0, 1.0, 0.01, 0.1, 0.0); - slider = gtk_hscale_new (GTK_ADJUSTMENT (options->vel_sensitivity_w)); - gtk_scale_set_value_pos (GTK_SCALE (slider), GTK_POS_TOP); - gimp_table_attach_aligned (GTK_TABLE (table), 0, 3, - _("Speed:"), 1.0, 1.0, - slider, 1, FALSE); - gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED); + options->vel_sensitivity_w = gimp_scale_entry_new (GTK_TABLE (table), 0, 2, + _("Speed:"), -1, 50, + options->vel_sensitivity_d, + 0.0, 1.0, 0.01, 0.1, 1, + TRUE, 0.0, 0.0, + NULL, NULL); g_signal_connect (G_OBJECT (options->vel_sensitivity_w), "value_changed", G_CALLBACK (gimp_double_adjustment_update), diff --git a/app/tools/gimpmagnifytool.c b/app/tools/gimpmagnifytool.c index ab46f3a039..8e35421862 100644 --- a/app/tools/gimpmagnifytool.c +++ b/app/tools/gimpmagnifytool.c @@ -425,7 +425,7 @@ magnify_options_new (GimpToolInfo *tool_info) MagnifyOptions *options; GtkWidget *vbox; GtkWidget *frame; - GtkWidget *hbox, *label, *abox, *scale; + GtkWidget *table; options = g_new0 (MagnifyOptions, 1); @@ -473,30 +473,21 @@ magnify_options_new (GimpToolInfo *tool_info) gtk_widget_show (frame); /* window threshold */ - hbox = gtk_hbox_new (FALSE, 4); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); - - label = gtk_label_new (_("Threshold:")); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 1.0); - gtk_box_pack_start( GTK_BOX (hbox), label, FALSE, FALSE, 0); - gtk_widget_show (label); - - abox = gtk_alignment_new (0.5, 1.0, 1.0, 0.0); - gtk_box_pack_start_defaults (GTK_BOX (hbox), abox); - gtk_widget_show (abox); - - options->threshold_w = - gtk_adjustment_new (options->threshold, 1.0, 15.0, 2.0, 2.0, 0.0); - scale = gtk_hscale_new (GTK_ADJUSTMENT (options->threshold_w)); - gtk_scale_set_digits (GTK_SCALE (scale), 0); - gtk_container_add (GTK_CONTAINER (abox), scale); - gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); - gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED); + table = gtk_table_new (1, 3, FALSE); + gtk_table_set_col_spacings (GTK_TABLE (table), 2); + gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0); + gtk_widget_show (table); + + options->threshold_w = gimp_scale_entry_new (GTK_TABLE (table), 0, 0, + _("Threshold:"), -1, 50, + options->threshold_d, + 1.0, 15.0, 1.0, 3.0, 1, + TRUE, 0.0, 0.0, + NULL, NULL); + g_signal_connect (G_OBJECT (options->threshold_w), "value_changed", G_CALLBACK (gimp_double_adjustment_update), &options->threshold); - gtk_widget_show (scale); - gtk_widget_show (hbox); return (GimpToolOptions *) options; } diff --git a/app/tools/gimppaintoptions-gui.c b/app/tools/gimppaintoptions-gui.c index bc45a601fc..b05ff0a69b 100644 --- a/app/tools/gimppaintoptions-gui.c +++ b/app/tools/gimppaintoptions-gui.c @@ -102,7 +102,6 @@ paint_options_init (GimpPaintOptions *options, { GtkWidget *vbox; GtkWidget *table; - GtkWidget *scale; /* initialize the tool options structure */ tool_options_init ((GimpToolOptions *) options, tool_info); @@ -118,23 +117,22 @@ paint_options_init (GimpPaintOptions *options, options->paint_vbox = vbox; /* the main table */ - table = gtk_table_new (2, 2, FALSE); - gtk_table_set_col_spacing (GTK_TABLE (table), 0, 4); - gtk_box_pack_start (GTK_BOX (vbox), table, TRUE, TRUE, 0); + table = gtk_table_new (2, 3, FALSE); + gtk_table_set_col_spacings (GTK_TABLE (table), 2); + gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0); /* the opacity scale */ options->opacity_w = - gtk_adjustment_new (gimp_context_get_opacity (tool_info->context) * 100, - 0.0, 100.0, 1.0, 1.0, 0.0); - scale = gtk_hscale_new (GTK_ADJUSTMENT (options->opacity_w)); - gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); - gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED); + gimp_scale_entry_new (GTK_TABLE (table), 0, 0, + _("Opacity:"), -1, 50, + gimp_context_get_opacity (tool_info->context) * 100, + 0.0, 100.0, 1.0, 10.0, 1, + TRUE, 0.0, 0.0, + NULL, NULL); + g_signal_connect (G_OBJECT (options->opacity_w), "value_changed", G_CALLBACK (paint_options_opacity_adjustment_update), tool_info->context); - gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, - _("Opacity:"), 1.0, 1.0, - scale, 1, FALSE); g_signal_connect (G_OBJECT (tool_info->context), "opacity_changed", G_CALLBACK (paint_options_opacity_changed), @@ -158,7 +156,7 @@ paint_options_init (GimpPaintOptions *options, gimp_context_get_paint_mode (tool_info->context)); gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, _("Mode:"), 1.0, 0.5, - options->paint_mode_w, 1, TRUE); + options->paint_mode_w, 2, TRUE); g_signal_connect (G_OBJECT (tool_info->context), "paint_mode_changed", G_CALLBACK (paint_options_paint_mode_changed), @@ -301,8 +299,8 @@ pressure_options_init (GimpPressureOptions *pressure, GimpPaintOptions *paint_options, GType tool_type) { - GtkWidget *frame = NULL; - GtkWidget *wbox = NULL; + GtkWidget *frame = NULL; + GtkWidget *wbox = NULL; if (tool_type == GIMP_TYPE_AIRBRUSH_TOOL || tool_type == GIMP_TYPE_CLONE_TOOL || @@ -460,22 +458,17 @@ gradient_options_init (GimpGradientOptions *gradient, { gradient->frame = gtk_frame_new (_("Gradient Options")); table = gtk_table_new (3, 3, FALSE); - gtk_table_set_col_spacing (GTK_TABLE (table), 0, 4); - gtk_table_set_row_spacing (GTK_TABLE (table), 0, 2); - gtk_table_set_row_spacing (GTK_TABLE (table), 1, 3); + gtk_table_set_col_spacings (GTK_TABLE (table), 2); + gtk_table_set_row_spacings (GTK_TABLE (table), 2); gtk_container_add (GTK_CONTAINER (gradient->frame), table); gtk_widget_show (table); - } - /* the fade options */ - if (tool_type == GIMP_TYPE_PAINTBRUSH_TOOL) - { + /* the use fade toggle */ abox = gtk_alignment_new (0.5, 1.0, 1.0, 0.0); gtk_table_attach (GTK_TABLE (table), abox, 0, 1, 0, 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); gtk_widget_show (abox); - /* the use fade toggle */ gradient->use_fade_w = gtk_check_button_new_with_label (_("Fade Out")); gtk_container_add (GTK_CONTAINER (abox), gradient->use_fade_w); @@ -491,7 +484,7 @@ gradient_options_init (GimpGradientOptions *gradient, spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (gradient->fade_out_w), 1.0, 0.0); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); - gtk_widget_set_size_request (spinbutton, 75, -1); + gtk_widget_set_size_request (spinbutton, 50, -1); g_signal_connect (G_OBJECT (gradient->fade_out_w), "value_changed", G_CALLBACK (gimp_double_adjustment_update), &gradient->fade_out); @@ -517,17 +510,13 @@ gradient_options_init (GimpGradientOptions *gradient, "set_sensitive", spinbutton); g_object_set_data (G_OBJECT (spinbutton), "set_sensitive", gradient->fade_unit_w); - } - /* the gradient options */ - if (tool_type == GIMP_TYPE_PAINTBRUSH_TOOL) - { + /* the use gradient toggle */ abox = gtk_alignment_new (0.5, 1.0, 1.0, 0.0); gtk_table_attach (GTK_TABLE (table), abox, 0, 1, 1, 2, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); gtk_widget_show (abox); - /* the use gradient toggle */ gradient->use_gradient_w = gtk_check_button_new_with_label (_("Gradient")); gtk_container_add (GTK_CONTAINER (abox), gradient->use_gradient_w); @@ -544,7 +533,7 @@ gradient_options_init (GimpGradientOptions *gradient, gtk_spin_button_new (GTK_ADJUSTMENT (gradient->gradient_length_w), 1.0, 0.0); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); - gtk_widget_set_size_request (spinbutton, 75, -1); + gtk_widget_set_size_request (spinbutton, 50, -1); g_signal_connect (G_OBJECT (gradient->gradient_length_w), "value_changed", G_CALLBACK (gimp_double_adjustment_update), &gradient->gradient_length); @@ -564,16 +553,6 @@ gradient_options_init (GimpGradientOptions *gradient, gtk_widget_show (gradient->gradient_unit_w); /* the gradient type */ - type_label = gtk_label_new (_("Type:")); - gtk_misc_set_alignment (GTK_MISC (type_label), 1.0, 0.5); - gtk_table_attach (GTK_TABLE (table), type_label, 0, 1, 2, 3, - GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); - gtk_widget_show (type_label); - - abox = gtk_alignment_new (0.0, 0.5, 0.0, 0.0); - gtk_table_attach_defaults (GTK_TABLE (table), abox, 1, 3, 2, 3); - gtk_widget_show (abox); - gradient->gradient_type_w = gimp_option_menu_new2 (FALSE, G_CALLBACK (gimp_menu_item_update), @@ -591,8 +570,10 @@ gradient_options_init (GimpGradientOptions *gradient, NULL); - gtk_container_add (GTK_CONTAINER (abox), gradient->gradient_type_w); - gtk_widget_show (gradient->gradient_type_w); + type_label = gimp_table_attach_aligned (GTK_TABLE (table), 0, 2, + _("Type:"), 1.0, 0.5, + gradient->gradient_type_w, 2, + TRUE); gtk_widget_show (table); diff --git a/app/tools/gimpselectionoptions.c b/app/tools/gimpselectionoptions.c index 24edc00343..437a3206d6 100644 --- a/app/tools/gimpselectionoptions.c +++ b/app/tools/gimpselectionoptions.c @@ -46,8 +46,6 @@ selection_options_init (SelectionOptions *options, GimpToolInfo *tool_info) { GtkWidget *vbox; - GtkWidget *label; - GtkWidget *scale; /* initialize the tool options structure */ tool_options_init ((GimpToolOptions *) options, tool_info); @@ -184,7 +182,7 @@ selection_options_init (SelectionOptions *options, /* the feather frame */ { GtkWidget *frame; - GtkWidget *hbox; + GtkWidget *table; frame = gtk_frame_new (NULL); gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0); @@ -201,32 +199,27 @@ selection_options_init (SelectionOptions *options, &options->feather); /* the feather radius scale */ - hbox = gtk_hbox_new (FALSE, 2); - gtk_container_set_border_width (GTK_CONTAINER (hbox), 2); - gtk_container_add (GTK_CONTAINER (frame), hbox); - gtk_widget_show (hbox); + 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); - label = gtk_label_new (_("Radius:")); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 1.0); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); - gtk_widget_show (label); - options->feather_radius_w = - gtk_adjustment_new (options->feather_radius_d, 0.0, 100.0, 1.0, 1.0, 1.0); - - scale = gtk_hscale_new (GTK_ADJUSTMENT (options->feather_radius_w)); - gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); - gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED); - gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE, TRUE, 0); - gtk_widget_show (scale); + gimp_scale_entry_new (GTK_TABLE (table), 0, 0, + _("Radius:"), -1, 50, + options->feather_radius_d, + 0.0, 100.0, 1.0, 10.0, 1, + TRUE, 0.0, 0.0, + NULL, NULL); g_signal_connect (G_OBJECT (options->feather_radius_w), "value_changed", G_CALLBACK (gimp_double_adjustment_update), &options->feather_radius); /* grey out label & scale if feather is off */ - gtk_widget_set_sensitive (hbox, options->feather_d); - g_object_set_data (G_OBJECT (options->feather_w), "set_sensitive", hbox); + gtk_widget_set_sensitive (table, options->feather_d); + g_object_set_data (G_OBJECT (options->feather_w), "set_sensitive", table); } #if 0 @@ -267,7 +260,7 @@ selection_options_init (SelectionOptions *options, { GtkWidget *frame; GtkWidget *vbox2; - GtkWidget *hbox; + GtkWidget *table; frame = gtk_frame_new (_("Finding Similar Colors")); gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0); @@ -312,24 +305,18 @@ selection_options_init (SelectionOptions *options, &options->sample_merged); /* the threshold scale */ - hbox = gtk_hbox_new (FALSE, 1); - gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0); - gtk_widget_show (hbox); - - label = gtk_label_new (_("Threshold:")); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 1.0); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 1); - gtk_widget_show (label); + table = gtk_table_new (1, 3, FALSE); + gtk_table_set_col_spacings (GTK_TABLE (table), 2); + gtk_box_pack_start (GTK_BOX (vbox2), table, FALSE, FALSE, 0); + gtk_widget_show (table); options->threshold_w = - gtk_adjustment_new (gimprc.default_threshold, 0.0, 255.0, 1.0, 1.0, 0.0); - scale = gtk_hscale_new (GTK_ADJUSTMENT (options->threshold_w)); - gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); - gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED); - gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE, TRUE, 0); - gtk_widget_show (scale); - - gimp_help_set_help_data (scale, _("Maximum color difference"), NULL); + gimp_scale_entry_new (GTK_TABLE (table), 0, 0, + _("Threshold:"), -1, 50, + gimprc.default_threshold, + 0.0, 255.0, 1.0, 16.0, 1, + TRUE, 0.0, 0.0, + _("Maximum color difference"), NULL); g_signal_connect (G_OBJECT (options->threshold_w), "value_changed", G_CALLBACK (gimp_double_adjustment_update), diff --git a/app/tools/gimpsmudgetool.c b/app/tools/gimpsmudgetool.c index 7fd3c4f70e..52003031e0 100644 --- a/app/tools/gimpsmudgetool.c +++ b/app/tools/gimpsmudgetool.c @@ -123,9 +123,7 @@ smudge_options_new (GimpToolInfo *tool_info) { GimpSmudgeOptions *options; GtkWidget *vbox; - GtkWidget *hbox; - GtkWidget *label; - GtkWidget *scale; + GtkWidget *table; options = gimp_smudge_options_new (); @@ -137,25 +135,22 @@ smudge_options_new (GimpToolInfo *tool_info) vbox = ((GimpToolOptions *) options)->main_vbox; /* the rate scale */ - hbox = gtk_hbox_new (FALSE, 4); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); - - label = gtk_label_new (_("Rate:")); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 1.0); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); - gtk_widget_show (label); + table = gtk_table_new (1, 3, FALSE); + gtk_table_set_col_spacings (GTK_TABLE (table), 2); + gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0); + gtk_widget_show (table); options->rate_w = - gtk_adjustment_new (options->rate_d, 0.0, 100.0, 1.0, 1.0, 0.0); - scale = gtk_hscale_new (GTK_ADJUSTMENT (options->rate_w)); - gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE, TRUE, 0); - gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); - gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED); + gimp_scale_entry_new (GTK_TABLE (table), 0, 0, + _("Rate:"), -1, 50, + options->rate_d, + 0.0, 100.0, 1.0, 10.0, 1, + TRUE, 0.0, 0.0, + NULL, NULL); + g_signal_connect (G_OBJECT (options->rate_w), "value_changed", G_CALLBACK (gimp_double_adjustment_update), &options->rate); - gtk_widget_show (scale); - gtk_widget_show (hbox); return (GimpToolOptions *) options; } diff --git a/app/tools/paint_options.c b/app/tools/paint_options.c index bc45a601fc..b05ff0a69b 100644 --- a/app/tools/paint_options.c +++ b/app/tools/paint_options.c @@ -102,7 +102,6 @@ paint_options_init (GimpPaintOptions *options, { GtkWidget *vbox; GtkWidget *table; - GtkWidget *scale; /* initialize the tool options structure */ tool_options_init ((GimpToolOptions *) options, tool_info); @@ -118,23 +117,22 @@ paint_options_init (GimpPaintOptions *options, options->paint_vbox = vbox; /* the main table */ - table = gtk_table_new (2, 2, FALSE); - gtk_table_set_col_spacing (GTK_TABLE (table), 0, 4); - gtk_box_pack_start (GTK_BOX (vbox), table, TRUE, TRUE, 0); + table = gtk_table_new (2, 3, FALSE); + gtk_table_set_col_spacings (GTK_TABLE (table), 2); + gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0); /* the opacity scale */ options->opacity_w = - gtk_adjustment_new (gimp_context_get_opacity (tool_info->context) * 100, - 0.0, 100.0, 1.0, 1.0, 0.0); - scale = gtk_hscale_new (GTK_ADJUSTMENT (options->opacity_w)); - gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); - gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED); + gimp_scale_entry_new (GTK_TABLE (table), 0, 0, + _("Opacity:"), -1, 50, + gimp_context_get_opacity (tool_info->context) * 100, + 0.0, 100.0, 1.0, 10.0, 1, + TRUE, 0.0, 0.0, + NULL, NULL); + g_signal_connect (G_OBJECT (options->opacity_w), "value_changed", G_CALLBACK (paint_options_opacity_adjustment_update), tool_info->context); - gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, - _("Opacity:"), 1.0, 1.0, - scale, 1, FALSE); g_signal_connect (G_OBJECT (tool_info->context), "opacity_changed", G_CALLBACK (paint_options_opacity_changed), @@ -158,7 +156,7 @@ paint_options_init (GimpPaintOptions *options, gimp_context_get_paint_mode (tool_info->context)); gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, _("Mode:"), 1.0, 0.5, - options->paint_mode_w, 1, TRUE); + options->paint_mode_w, 2, TRUE); g_signal_connect (G_OBJECT (tool_info->context), "paint_mode_changed", G_CALLBACK (paint_options_paint_mode_changed), @@ -301,8 +299,8 @@ pressure_options_init (GimpPressureOptions *pressure, GimpPaintOptions *paint_options, GType tool_type) { - GtkWidget *frame = NULL; - GtkWidget *wbox = NULL; + GtkWidget *frame = NULL; + GtkWidget *wbox = NULL; if (tool_type == GIMP_TYPE_AIRBRUSH_TOOL || tool_type == GIMP_TYPE_CLONE_TOOL || @@ -460,22 +458,17 @@ gradient_options_init (GimpGradientOptions *gradient, { gradient->frame = gtk_frame_new (_("Gradient Options")); table = gtk_table_new (3, 3, FALSE); - gtk_table_set_col_spacing (GTK_TABLE (table), 0, 4); - gtk_table_set_row_spacing (GTK_TABLE (table), 0, 2); - gtk_table_set_row_spacing (GTK_TABLE (table), 1, 3); + gtk_table_set_col_spacings (GTK_TABLE (table), 2); + gtk_table_set_row_spacings (GTK_TABLE (table), 2); gtk_container_add (GTK_CONTAINER (gradient->frame), table); gtk_widget_show (table); - } - /* the fade options */ - if (tool_type == GIMP_TYPE_PAINTBRUSH_TOOL) - { + /* the use fade toggle */ abox = gtk_alignment_new (0.5, 1.0, 1.0, 0.0); gtk_table_attach (GTK_TABLE (table), abox, 0, 1, 0, 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); gtk_widget_show (abox); - /* the use fade toggle */ gradient->use_fade_w = gtk_check_button_new_with_label (_("Fade Out")); gtk_container_add (GTK_CONTAINER (abox), gradient->use_fade_w); @@ -491,7 +484,7 @@ gradient_options_init (GimpGradientOptions *gradient, spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (gradient->fade_out_w), 1.0, 0.0); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); - gtk_widget_set_size_request (spinbutton, 75, -1); + gtk_widget_set_size_request (spinbutton, 50, -1); g_signal_connect (G_OBJECT (gradient->fade_out_w), "value_changed", G_CALLBACK (gimp_double_adjustment_update), &gradient->fade_out); @@ -517,17 +510,13 @@ gradient_options_init (GimpGradientOptions *gradient, "set_sensitive", spinbutton); g_object_set_data (G_OBJECT (spinbutton), "set_sensitive", gradient->fade_unit_w); - } - /* the gradient options */ - if (tool_type == GIMP_TYPE_PAINTBRUSH_TOOL) - { + /* the use gradient toggle */ abox = gtk_alignment_new (0.5, 1.0, 1.0, 0.0); gtk_table_attach (GTK_TABLE (table), abox, 0, 1, 1, 2, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); gtk_widget_show (abox); - /* the use gradient toggle */ gradient->use_gradient_w = gtk_check_button_new_with_label (_("Gradient")); gtk_container_add (GTK_CONTAINER (abox), gradient->use_gradient_w); @@ -544,7 +533,7 @@ gradient_options_init (GimpGradientOptions *gradient, gtk_spin_button_new (GTK_ADJUSTMENT (gradient->gradient_length_w), 1.0, 0.0); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); - gtk_widget_set_size_request (spinbutton, 75, -1); + gtk_widget_set_size_request (spinbutton, 50, -1); g_signal_connect (G_OBJECT (gradient->gradient_length_w), "value_changed", G_CALLBACK (gimp_double_adjustment_update), &gradient->gradient_length); @@ -564,16 +553,6 @@ gradient_options_init (GimpGradientOptions *gradient, gtk_widget_show (gradient->gradient_unit_w); /* the gradient type */ - type_label = gtk_label_new (_("Type:")); - gtk_misc_set_alignment (GTK_MISC (type_label), 1.0, 0.5); - gtk_table_attach (GTK_TABLE (table), type_label, 0, 1, 2, 3, - GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); - gtk_widget_show (type_label); - - abox = gtk_alignment_new (0.0, 0.5, 0.0, 0.0); - gtk_table_attach_defaults (GTK_TABLE (table), abox, 1, 3, 2, 3); - gtk_widget_show (abox); - gradient->gradient_type_w = gimp_option_menu_new2 (FALSE, G_CALLBACK (gimp_menu_item_update), @@ -591,8 +570,10 @@ gradient_options_init (GimpGradientOptions *gradient, NULL); - gtk_container_add (GTK_CONTAINER (abox), gradient->gradient_type_w); - gtk_widget_show (gradient->gradient_type_w); + type_label = gimp_table_attach_aligned (GTK_TABLE (table), 0, 2, + _("Type:"), 1.0, 0.5, + gradient->gradient_type_w, 2, + TRUE); gtk_widget_show (table); diff --git a/app/tools/selection_options.c b/app/tools/selection_options.c index 24edc00343..437a3206d6 100644 --- a/app/tools/selection_options.c +++ b/app/tools/selection_options.c @@ -46,8 +46,6 @@ selection_options_init (SelectionOptions *options, GimpToolInfo *tool_info) { GtkWidget *vbox; - GtkWidget *label; - GtkWidget *scale; /* initialize the tool options structure */ tool_options_init ((GimpToolOptions *) options, tool_info); @@ -184,7 +182,7 @@ selection_options_init (SelectionOptions *options, /* the feather frame */ { GtkWidget *frame; - GtkWidget *hbox; + GtkWidget *table; frame = gtk_frame_new (NULL); gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0); @@ -201,32 +199,27 @@ selection_options_init (SelectionOptions *options, &options->feather); /* the feather radius scale */ - hbox = gtk_hbox_new (FALSE, 2); - gtk_container_set_border_width (GTK_CONTAINER (hbox), 2); - gtk_container_add (GTK_CONTAINER (frame), hbox); - gtk_widget_show (hbox); + 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); - label = gtk_label_new (_("Radius:")); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 1.0); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); - gtk_widget_show (label); - options->feather_radius_w = - gtk_adjustment_new (options->feather_radius_d, 0.0, 100.0, 1.0, 1.0, 1.0); - - scale = gtk_hscale_new (GTK_ADJUSTMENT (options->feather_radius_w)); - gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); - gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED); - gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE, TRUE, 0); - gtk_widget_show (scale); + gimp_scale_entry_new (GTK_TABLE (table), 0, 0, + _("Radius:"), -1, 50, + options->feather_radius_d, + 0.0, 100.0, 1.0, 10.0, 1, + TRUE, 0.0, 0.0, + NULL, NULL); g_signal_connect (G_OBJECT (options->feather_radius_w), "value_changed", G_CALLBACK (gimp_double_adjustment_update), &options->feather_radius); /* grey out label & scale if feather is off */ - gtk_widget_set_sensitive (hbox, options->feather_d); - g_object_set_data (G_OBJECT (options->feather_w), "set_sensitive", hbox); + gtk_widget_set_sensitive (table, options->feather_d); + g_object_set_data (G_OBJECT (options->feather_w), "set_sensitive", table); } #if 0 @@ -267,7 +260,7 @@ selection_options_init (SelectionOptions *options, { GtkWidget *frame; GtkWidget *vbox2; - GtkWidget *hbox; + GtkWidget *table; frame = gtk_frame_new (_("Finding Similar Colors")); gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0); @@ -312,24 +305,18 @@ selection_options_init (SelectionOptions *options, &options->sample_merged); /* the threshold scale */ - hbox = gtk_hbox_new (FALSE, 1); - gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0); - gtk_widget_show (hbox); - - label = gtk_label_new (_("Threshold:")); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 1.0); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 1); - gtk_widget_show (label); + table = gtk_table_new (1, 3, FALSE); + gtk_table_set_col_spacings (GTK_TABLE (table), 2); + gtk_box_pack_start (GTK_BOX (vbox2), table, FALSE, FALSE, 0); + gtk_widget_show (table); options->threshold_w = - gtk_adjustment_new (gimprc.default_threshold, 0.0, 255.0, 1.0, 1.0, 0.0); - scale = gtk_hscale_new (GTK_ADJUSTMENT (options->threshold_w)); - gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); - gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED); - gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE, TRUE, 0); - gtk_widget_show (scale); - - gimp_help_set_help_data (scale, _("Maximum color difference"), NULL); + gimp_scale_entry_new (GTK_TABLE (table), 0, 0, + _("Threshold:"), -1, 50, + gimprc.default_threshold, + 0.0, 255.0, 1.0, 16.0, 1, + TRUE, 0.0, 0.0, + _("Maximum color difference"), NULL); g_signal_connect (G_OBJECT (options->threshold_w), "value_changed", G_CALLBACK (gimp_double_adjustment_update), diff --git a/app/widgets/gimpbrushfactoryview.c b/app/widgets/gimpbrushfactoryview.c index dbd20c4e4d..6c600d8de8 100644 --- a/app/widgets/gimpbrushfactoryview.c +++ b/app/widgets/gimpbrushfactoryview.c @@ -105,20 +105,18 @@ gimp_brush_factory_view_init (GimpBrushFactoryView *view) { GtkWidget *table; - table = gtk_table_new (1, 2, FALSE); - gtk_table_set_col_spacing (GTK_TABLE (table), 0, 4); + table = gtk_table_new (1, 3, FALSE); + gtk_table_set_col_spacings (GTK_TABLE (table), 2); gtk_widget_show (table); view->spacing_adjustment = - GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 1.0, 1000.0, 1.0, 1.0, 0.0)); - - view->spacing_scale = gtk_hscale_new (view->spacing_adjustment); - gtk_scale_set_value_pos (GTK_SCALE (view->spacing_scale), GTK_POS_TOP); - gtk_range_set_update_policy (GTK_RANGE (view->spacing_scale), - GTK_UPDATE_DELAYED); - gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, - _("Spacing:"), 1.0, 1.0, - view->spacing_scale, 1, FALSE); + gimp_scale_entry_new (GTK_TABLE (table), 0, 0, + _("Spacing:"), -1, 50, + 0.0, 1.0, 1000.0, 1.0, 10.0, 1, + TRUE, 0.0, 0.0, + NULL, NULL); + + view->spacing_scale = GIMP_SCALE_ENTRY_SCALE (view->spacing_adjustment); g_signal_connect (G_OBJECT (view->spacing_adjustment), "value_changed", G_CALLBACK (gimp_brush_factory_view_spacing_update), diff --git a/app/widgets/gimplayerlistview.c b/app/widgets/gimplayerlistview.c index 2d47490a6a..84db2a60f3 100644 --- a/app/widgets/gimplayerlistview.c +++ b/app/widgets/gimplayerlistview.c @@ -126,28 +126,21 @@ static void gimp_layer_list_view_init (GimpLayerListView *view) { GimpDrawableListView *drawable_view; - GtkWidget *hbox; GtkWidget *abox; - GtkWidget *label; - GtkWidget *slider; + GtkWidget *hbox; drawable_view = GIMP_DRAWABLE_LIST_VIEW (view); - view->options_box = gtk_vbox_new (FALSE, 2); + view->options_box = gtk_table_new (2, 3, FALSE); + gtk_table_set_col_spacings (GTK_TABLE (view->options_box), 2); gtk_box_pack_start (GTK_BOX (view), view->options_box, FALSE, FALSE, 0); gtk_box_reorder_child (GTK_BOX (view), view->options_box, 0); gtk_widget_show (view->options_box); - hbox = gtk_hbox_new (FALSE, 4); - gtk_box_pack_start (GTK_BOX (view->options_box), hbox, FALSE, FALSE, 0); - gtk_widget_show (hbox); + hbox = gtk_hbox_new (FALSE, 2); /* Paint mode menu */ - label = gtk_label_new (_("Mode:")); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); - gtk_widget_show (label); - view->paint_mode_menu = gimp_paint_mode_menu_new (G_CALLBACK (gimp_layer_list_view_paint_mode_menu_callback), view, @@ -177,30 +170,23 @@ gimp_layer_list_view_init (GimpLayerListView *view) gimp_help_set_help_data (view->preserve_trans_toggle, _("Keep Transparency"), "#keep_trans_button"); - hbox = gtk_hbox_new (FALSE, 4); - gtk_box_pack_start (GTK_BOX (view->options_box), hbox, FALSE, FALSE, 0); - gtk_widget_show (hbox); + gimp_table_attach_aligned (GTK_TABLE (view->options_box), 0, 0, + _("Mode:"), 1.0, 0.5, + hbox, 2, TRUE); /* Opacity scale */ - label = gtk_label_new (_("Opacity:")); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); - gtk_widget_show (label); - view->opacity_adjustment = - GTK_ADJUSTMENT (gtk_adjustment_new (100.0, 0.0, 100.0, 1.0, 1.0, 0.0)); + GTK_ADJUSTMENT (gimp_scale_entry_new (GTK_TABLE (view->options_box), 0, 1, + _("Opacity:"), -1, 50, + 100.0, 0.0, 100.0, 1.0, 10.0, 1, + TRUE, 0.0, 0.0, + NULL, "#opacity_sacle")); g_signal_connect (G_OBJECT (view->opacity_adjustment), "value_changed", G_CALLBACK (gimp_layer_list_view_opacity_scale_changed), view); - slider = gtk_hscale_new (view->opacity_adjustment); - gtk_scale_set_value_pos (GTK_SCALE (slider), GTK_POS_RIGHT); - gtk_box_pack_start (GTK_BOX (hbox), slider, TRUE, TRUE, 0); - gtk_widget_show (slider); - - gimp_help_set_help_data (slider, NULL, "#opacity_scale"); - /* Anchor button */ view->anchor_button = @@ -241,7 +227,10 @@ gimp_layer_list_view_style_set (GtkWidget *widget, "button_spacing", &button_spacing, NULL); - gtk_box_set_spacing (GTK_BOX (layer_view->options_box), content_spacing); + gtk_table_set_col_spacings (GTK_TABLE (layer_view->options_box), + button_spacing); + gtk_table_set_row_spacings (GTK_TABLE (layer_view->options_box), + content_spacing); if (GTK_WIDGET_CLASS (parent_class)->style_set) GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style); diff --git a/app/widgets/gimplayertreeview.c b/app/widgets/gimplayertreeview.c index 2d47490a6a..84db2a60f3 100644 --- a/app/widgets/gimplayertreeview.c +++ b/app/widgets/gimplayertreeview.c @@ -126,28 +126,21 @@ static void gimp_layer_list_view_init (GimpLayerListView *view) { GimpDrawableListView *drawable_view; - GtkWidget *hbox; GtkWidget *abox; - GtkWidget *label; - GtkWidget *slider; + GtkWidget *hbox; drawable_view = GIMP_DRAWABLE_LIST_VIEW (view); - view->options_box = gtk_vbox_new (FALSE, 2); + view->options_box = gtk_table_new (2, 3, FALSE); + gtk_table_set_col_spacings (GTK_TABLE (view->options_box), 2); gtk_box_pack_start (GTK_BOX (view), view->options_box, FALSE, FALSE, 0); gtk_box_reorder_child (GTK_BOX (view), view->options_box, 0); gtk_widget_show (view->options_box); - hbox = gtk_hbox_new (FALSE, 4); - gtk_box_pack_start (GTK_BOX (view->options_box), hbox, FALSE, FALSE, 0); - gtk_widget_show (hbox); + hbox = gtk_hbox_new (FALSE, 2); /* Paint mode menu */ - label = gtk_label_new (_("Mode:")); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); - gtk_widget_show (label); - view->paint_mode_menu = gimp_paint_mode_menu_new (G_CALLBACK (gimp_layer_list_view_paint_mode_menu_callback), view, @@ -177,30 +170,23 @@ gimp_layer_list_view_init (GimpLayerListView *view) gimp_help_set_help_data (view->preserve_trans_toggle, _("Keep Transparency"), "#keep_trans_button"); - hbox = gtk_hbox_new (FALSE, 4); - gtk_box_pack_start (GTK_BOX (view->options_box), hbox, FALSE, FALSE, 0); - gtk_widget_show (hbox); + gimp_table_attach_aligned (GTK_TABLE (view->options_box), 0, 0, + _("Mode:"), 1.0, 0.5, + hbox, 2, TRUE); /* Opacity scale */ - label = gtk_label_new (_("Opacity:")); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); - gtk_widget_show (label); - view->opacity_adjustment = - GTK_ADJUSTMENT (gtk_adjustment_new (100.0, 0.0, 100.0, 1.0, 1.0, 0.0)); + GTK_ADJUSTMENT (gimp_scale_entry_new (GTK_TABLE (view->options_box), 0, 1, + _("Opacity:"), -1, 50, + 100.0, 0.0, 100.0, 1.0, 10.0, 1, + TRUE, 0.0, 0.0, + NULL, "#opacity_sacle")); g_signal_connect (G_OBJECT (view->opacity_adjustment), "value_changed", G_CALLBACK (gimp_layer_list_view_opacity_scale_changed), view); - slider = gtk_hscale_new (view->opacity_adjustment); - gtk_scale_set_value_pos (GTK_SCALE (slider), GTK_POS_RIGHT); - gtk_box_pack_start (GTK_BOX (hbox), slider, TRUE, TRUE, 0); - gtk_widget_show (slider); - - gimp_help_set_help_data (slider, NULL, "#opacity_scale"); - /* Anchor button */ view->anchor_button = @@ -241,7 +227,10 @@ gimp_layer_list_view_style_set (GtkWidget *widget, "button_spacing", &button_spacing, NULL); - gtk_box_set_spacing (GTK_BOX (layer_view->options_box), content_spacing); + gtk_table_set_col_spacings (GTK_TABLE (layer_view->options_box), + button_spacing); + gtk_table_set_row_spacings (GTK_TABLE (layer_view->options_box), + content_spacing); if (GTK_WIDGET_CLASS (parent_class)->style_set) GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style); diff --git a/devel-docs/ChangeLog b/devel-docs/ChangeLog index 0c7bde06b2..7b512b054d 100644 --- a/devel-docs/ChangeLog +++ b/devel-docs/ChangeLog @@ -1,3 +1,7 @@ +2002-03-08 Michael Natterer + + * libgimpwidgets/tmpl/gimpwidgets.sgml: merged doc fix. + 2002-03-08 Sven Neumann * libgimpwidgets/Makefile.am diff --git a/devel-docs/libgimpwidgets/tmpl/gimpwidgets.sgml b/devel-docs/libgimpwidgets/tmpl/gimpwidgets.sgml index a0107041ad..e72aa12399 100644 --- a/devel-docs/libgimpwidgets/tmpl/gimpwidgets.sgml +++ b/devel-docs/libgimpwidgets/tmpl/gimpwidgets.sgml @@ -504,5 +504,6 @@ Returns the #GimpChainButton which is attached to the #GimpSizeEntry. @widget: @colspan: @left_align: +@Returns: diff --git a/libgimpwidgets/gimpwidgets.c b/libgimpwidgets/gimpwidgets.c index d023529d60..d9cf8bdac3 100644 --- a/libgimpwidgets/gimpwidgets.c +++ b/libgimpwidgets/gimpwidgets.c @@ -1432,7 +1432,7 @@ gimp_unit_menu_update (GtkWidget *widget, * gimp_table_attach_aligned: * @table: The #GtkTable the widgets will be attached to. * @column: The column to start with. - * @row: The row to attach the eidgets. + * @row: The row to attach the widgets. * @label_text: The text for the #GtkLabel which will be attached left of the * widget. * @xalign: The horizontal alignment of the #GtkLabel. @@ -1443,8 +1443,10 @@ gimp_unit_menu_update (GtkWidget *widget, * * Note that the @label_text can be #NULL and that the widget will be attached * starting at (@column + 1) in this case, too. + * + * Returns: The created #GtkLabel. **/ -void +GtkWidget * gimp_table_attach_aligned (GtkTable *table, gint column, gint row, @@ -1455,10 +1457,10 @@ gimp_table_attach_aligned (GtkTable *table, gint colspan, gboolean left_align) { + GtkWidget *label = NULL; + if (label_text) { - GtkWidget *label; - label = gtk_label_new (label_text); gtk_misc_set_alignment (GTK_MISC (label), xalign, yalign); gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_RIGHT); @@ -1486,4 +1488,6 @@ gimp_table_attach_aligned (GtkTable *table, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); gtk_widget_show (widget); + + return label; } diff --git a/libgimpwidgets/gimpwidgets.h b/libgimpwidgets/gimpwidgets.h index 9d0cb9d062..8d28c76081 100644 --- a/libgimpwidgets/gimpwidgets.h +++ b/libgimpwidgets/gimpwidgets.h @@ -252,15 +252,15 @@ void gimp_unit_menu_update (GtkWidget *widget, * Helper Functions */ -void gimp_table_attach_aligned (GtkTable *table, - gint column, - gint row, - const gchar *label_text, - gfloat xalign, - gfloat yalign, - GtkWidget *widget, - gint colspan, - gboolean left_align); +GtkWidget * gimp_table_attach_aligned (GtkTable *table, + gint column, + gint row, + const gchar *label_text, + gfloat xalign, + gfloat yalign, + GtkWidget *widget, + gint colspan, + gboolean left_align); G_END_DECLS -- GitLab