From b2e3715d761b534cf165338d3bc9030eb2fa9f8e Mon Sep 17 00:00:00 2001 From: David Odin Date: Wed, 10 Dec 2003 16:14:17 +0000 Subject: [PATCH] reverted Maurits' patch, to get rid of gimp_parameter_settings_new (see #125141) --- ChangeLog | 7 +++++++ plug-ins/common/waves.c | 11 ++++++++++- plug-ins/common/whirlpinch.c | 11 ++++++++++- plug-ins/common/wind.c | 10 +++++++++- 4 files changed, 36 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 38fbd9c953..1f4105ef08 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2003-12-09 DindinX + + * plug-ins/common/wind.c (pluginCoreIA): + * plug-ins/common/whirlpinch (whirl_pinch_dialog): + * plug-ins/common/waves (dialog_box): reverted Maurits' patch, + to get rid of gimp_parameter_settings_new (see #125141) + 2003-12-09 DindinX * plug-ins/common/xpm.c (save_dialog): reverted Maurits' patch, diff --git a/plug-ins/common/waves.c b/plug-ins/common/waves.c index 2f6035d129..06ed8a40d9 100644 --- a/plug-ins/common/waves.c +++ b/plug-ins/common/waves.c @@ -339,7 +339,16 @@ pluginCoreIA (piArgs *argp, G_CALLBACK (waves_toggle_button_update), &argp->reflective); - table = gimp_parameter_settings_new (main_vbox, 3, 3); + frame = gtk_frame_new ( _("Parameter Settings")); + gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN); + gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0); + gtk_widget_show (frame); + + table = gtk_table_new (3, 3, FALSE); + gtk_table_set_col_spacings (GTK_TABLE (table), 4); + gtk_table_set_row_spacings (GTK_TABLE (table), 2); + gtk_container_set_border_width (GTK_CONTAINER (table), 4); + gtk_container_add (GTK_CONTAINER (frame), table); adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 0, _("_Amplitude:"), 140, 6, diff --git a/plug-ins/common/whirlpinch.c b/plug-ins/common/whirlpinch.c index 63b25389f2..75aa853c24 100644 --- a/plug-ins/common/whirlpinch.c +++ b/plug-ins/common/whirlpinch.c @@ -681,7 +681,16 @@ whirl_pinch_dialog (void) gtk_widget_show (wpint.preview); /* Controls */ - table = gimp_parameter_settings_new (main_vbox, 3, 3); + frame = gtk_frame_new (_("Parameter Settings")); + gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0); + gtk_widget_show (frame); + + table = gtk_table_new (3, 3, FALSE); + gtk_table_set_col_spacings (GTK_TABLE (table), 4); + gtk_table_set_row_spacings (GTK_TABLE (table), 2); + gtk_container_set_border_width (GTK_CONTAINER (table), 4); + gtk_container_add (GTK_CONTAINER (frame), table); + gtk_widget_show (table); adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 0, _("_Whirl Angle:"), SCALE_WIDTH, 7, diff --git a/plug-ins/common/wind.c b/plug-ins/common/wind.c index accee26aec..7f3902f855 100644 --- a/plug-ins/common/wind.c +++ b/plug-ins/common/wind.c @@ -888,7 +888,15 @@ dialog_box (GimpDrawable *drawable) render_effect (drawable, TRUE); gtk_widget_show (preview->widget); - main_vbox = gimp_parameter_settings_new (vbox, 0, 0); + frame = gtk_frame_new (_("Parameter Settings")); + gtk_container_set_border_width (GTK_CONTAINER (frame), 6); + gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0); + gtk_widget_show (frame); + + main_vbox = gtk_vbox_new (FALSE, 4); + gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 6); + gtk_container_add (GTK_CONTAINER (frame), main_vbox); + gtk_widget_show (main_vbox); /***************************************************** outer frame and table