Commit 213e90c8 authored by David Odin's avatar David Odin
Browse files

Reverted Maurits' patch, to get rid of gimp_parameter_settings_new (see #125141)

parent b2e3715d
2003-12-09 DindinX <david@dindinx.org>
* plug-ins/common/vpropagate.c (vpropagate_dialog):
* plug-ins/common/unsharp.c (unsharp_mask_dialog):
* plug-ins/common/threshold_alpha.c (threshold_alpha_dialog):
* plug-ins/common/struc.c (struc_dialog):
* plug-ins/common/sparkle.c (sparkle_dialog):
* plug-ins/common/sobel.c (sobel_dialog):
* plug-ins/common/snoise.c (solid_noise_dialog):
* plug-ins/common/smooth_palette.c (dialog):
* plug-ins/common/sharpen.c (sharpen_dialog):
* plug-ins/common/sel_gauss.c (sel_gauss_dialog):
* plug-ins/common/scatter_hsv.c (scatter_hsv_dialog):
* plug-ins/common/ripple.c (ripple_dialog):
* plug-ins/common/randomize.c (randomize_dialog):
* plug-ins/common/polar.c (polarize_dialog):
* plug-ins/common/plasma.c (plasma_dialog):
* plug-ins/common/pixelize.c (pixelize_dialog):
* plug-ins/common/oilify.c (oilify_dialog):
* plug-ins/common/nova.c (nova_dialog):
* plug-ins/common/noisify.c (noisify_dialog):
* plug-ins/common/nlfilt.c (pluginCoreIA):
* plug-ins/common/lic.c (create_main_dialog):
* plug-ins/common/jpeg.c (save_dialog):
* plug-ins/common/illusion.c (dialog):
* plug-ins/common/grid.c (dialog):
* plug-ins/common/glasstile.c (glass_dialog):
* plug-ins/common/gauss_rle.c (gauss_rle_dialog):
* plug-ins/common/gauss_iir.c (gauss_iir_dialog):
* plug-ins/common/engrave.c (engrave_dialog):
* plug-ins/common/emboss.c (pluginCoreIA):
* plug-ins/common/edge.c (edge_dialog):
* plug-ins/common/destripe.c (destripe_dialog):
* plug-ins/common/despeckle.c (despeckle_dialog):
* plug-ins/common/cubism.c (cubism_dialog):
* plug-ins/common/checkerboard.c (do_checkerboard_dialog):
* plug-ins/common/bumpmap.c (bumpmap_dialog):
* plug-ins/common/blur.c (blur_dialog):
* plug-ins/common/blinds.c (blinds_dialog):
* plug-ins/common/apply_lens.c (lens_dialog): reverted Maurits'
patch, to get rid of gimp_parameter_settings_new (see #125141)
* libgimp/gimpmiscui.[ch]: remove this function.
2003-12-09 DindinX <david@dindinx.org>
 
* plug-ins/common/wind.c (pluginCoreIA):
......@@ -546,34 +546,3 @@ gimp_plug_in_get_path (const gchar *path_name,
return path;
}
GtkWidget*
gimp_parameter_settings_new (GtkWidget *parent,
guint rows,
guint columns)
{
GtkWidget *frame, *table;
frame = gtk_frame_new ( _("Parameter Settings"));
gtk_container_set_border_width (GTK_CONTAINER (frame), 6);
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN);
gtk_box_pack_start ( GTK_BOX (parent), frame, TRUE, TRUE, 0);
gtk_widget_show (frame);
if (rows && columns)
{
table = gtk_table_new (rows, columns, 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);
}
else
{
table = gtk_vbox_new (FALSE, 4);
gtk_container_set_border_width (GTK_CONTAINER (table), 4);
gtk_container_add (GTK_CONTAINER (frame), table);
}
gtk_widget_show (table);
return table;
}
......@@ -97,11 +97,6 @@ void gimp_fixme_preview_get_pixel (GimpFixMePreview *preview,
gchar * gimp_plug_in_get_path (const gchar *path_name,
const gchar *dir_name);
GtkWidget *gimp_parameter_settings_new (GtkWidget *parent,
guint rows,
guint columns);
G_END_DECLS
#endif /* __GIMP_MISCUI_H__ */
......@@ -388,6 +388,7 @@ static int
align_layers_dialog (void)
{
GtkWidget *dlg;
GtkWidget *frame;
GtkWidget *table;
GtkWidget *optionmenu;
GtkWidget *toggle;
......@@ -405,7 +406,17 @@ align_layers_dialog (void)
NULL);
table = gimp_parameter_settings_new (GTK_DIALOG (dlg)->vbox, 7, 3);
frame = gtk_frame_new (_("Parameter Settings"));
gtk_container_set_border_width (GTK_CONTAINER (frame), 6);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), frame, FALSE, FALSE, 0);
gtk_widget_show (frame);
table = gtk_table_new (7, 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);
optionmenu =
gimp_int_option_menu_new (FALSE, G_CALLBACK (gimp_menu_item_update),
......
......@@ -356,6 +356,7 @@ lens_dialog (GimpDrawable *drawable)
GtkWidget *dlg;
GtkWidget *label;
GtkWidget *toggle;
GtkWidget *frame;
GtkWidget *vbox;
GtkWidget *sep;
GtkWidget *hbox;
......@@ -374,7 +375,16 @@ lens_dialog (GimpDrawable *drawable)
NULL);
vbox = gimp_parameter_settings_new (GTK_DIALOG (dlg)->vbox, 0, 0);
frame = gtk_frame_new (_("Parameter Settings"));
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN);
gtk_container_set_border_width (GTK_CONTAINER (frame), 6);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), frame, TRUE, TRUE, 0);
gtk_widget_show (frame);
vbox = gtk_vbox_new (FALSE, 2);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
gtk_container_add (GTK_CONTAINER (frame), vbox);
gtk_widget_show (vbox);
toggle = gtk_radio_button_new_with_mnemonic_from_widget
(NULL, _("_Keep Original Surroundings"));
......
......@@ -333,7 +333,17 @@ blinds_dialog (void)
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), FALSE);
}
table = gimp_parameter_settings_new (main_vbox, 2, 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 (2, 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);
size_data = gimp_scale_entry_new (GTK_TABLE (table), 0, 0,
_("_Displacement:"), SCALE_WIDTH, 0,
......
......@@ -568,6 +568,7 @@ static gint
blur_dialog (void)
{
GtkWidget *dlg;
GtkWidget *frame;
GtkWidget *table;
GtkWidget *label;
GtkWidget *seed_hbox;
......@@ -590,7 +591,18 @@ blur_dialog (void)
*
* First set up the basic containers, label them, etc.
*/
table = gimp_parameter_settings_new (GTK_DIALOG (dlg)->vbox, 3, 3);
frame = gtk_frame_new (_("Parameter Settings"));
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN);
gtk_container_set_border_width (GTK_CONTAINER(frame), 6);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG(dlg)->vbox), frame, TRUE, TRUE, 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);
/* Random Seed */
seed_hbox = gimp_random_seed_new (&pivals.blur_seed);
......
......@@ -1008,7 +1008,14 @@ bumpmap_dialog (void)
G_CALLBACK (dialog_tiled_callback),
NULL);
vbox = gimp_parameter_settings_new (top_vbox, 0, 0);
frame = gtk_frame_new (_("Parameter Settings"));
gtk_box_pack_start (GTK_BOX (top_vbox), frame, FALSE, FALSE, 0);
gtk_widget_show (frame);
vbox = gtk_vbox_new (FALSE, 2);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
gtk_container_add (GTK_CONTAINER (frame), vbox);
gtk_widget_show (vbox);
/* Bump map menu */
table = gtk_table_new (1, 2, FALSE);
......
......@@ -289,6 +289,7 @@ do_checkerboard_dialog (gint32 image_ID,
GimpDrawable *drawable)
{
GtkWidget *dlg;
GtkWidget *frame;
GtkWidget *vbox;
GtkWidget *toggle;
GtkWidget *size_entry;
......@@ -317,7 +318,16 @@ do_checkerboard_dialog (gint32 image_ID,
height = gimp_drawable_height (drawable->drawable_id);
size = MIN (width, height);
vbox = gimp_parameter_settings_new (GTK_DIALOG (dlg)->vbox, 0, 0);
/* parameter settings */
frame = gtk_frame_new (_("Parameter Settings"));
gtk_container_set_border_width (GTK_CONTAINER (frame), 6);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), frame, TRUE, TRUE, 0);
gtk_widget_show (frame);
vbox = gtk_vbox_new (FALSE, 4);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
gtk_container_add (GTK_CONTAINER (frame), vbox);
gtk_widget_show (vbox);
toggle = gtk_check_button_new_with_mnemonic (_("_Psychobilly"));
gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, FALSE, 0);
......
......@@ -243,6 +243,7 @@ cubism_dialog (void)
{
GtkWidget *dlg;
GtkWidget *toggle;
GtkWidget *frame;
GtkWidget *table;
GtkObject *scale_data;
gboolean run;
......@@ -258,8 +259,20 @@ cubism_dialog (void)
NULL);
table = gimp_parameter_settings_new (GTK_DIALOG (dlg)->vbox, 2, 3);
/* parameter settings */
frame = gtk_frame_new (_("Parameter Settings"));
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN);
gtk_container_set_border_width (GTK_CONTAINER (frame), 6);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), frame, TRUE, TRUE, 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_table_set_row_spacing (GTK_TABLE (table), 0, 4);
gtk_container_set_border_width (GTK_CONTAINER (table), 6);
gtk_container_add (GTK_CONTAINER (frame), table);
gtk_widget_show (table);
toggle = gtk_check_button_new_with_mnemonic (_("_Use Background Color"));
gtk_table_attach (GTK_TABLE (table), toggle, 0, 3, 0, 1,
......
......@@ -719,7 +719,16 @@ despeckle_dialog (void)
G_CALLBACK (dialog_recursive_callback),
NULL);
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);
/*
* Box size (radius) control...
......
......@@ -549,6 +549,7 @@ destripe_dialog (void)
GtkWidget *table;
GtkWidget *ptable;
GtkWidget *frame;
GtkWidget *vbox;
GtkWidget *scrollbar;
GtkWidget *button;
GtkObject *adj;
......@@ -631,7 +632,16 @@ destripe_dialog (void)
* Filter type controls...
*/
table = gimp_parameter_settings_new (GTK_DIALOG (dialog)->vbox, 2, 3);
frame = gtk_frame_new (_("Parameter Settings"));
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
gtk_widget_show (frame);
table = gtk_table_new (2, 3, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
gtk_table_set_row_spacings (GTK_TABLE (table), 4);
gtk_container_set_border_width (GTK_CONTAINER (table), 4);
gtk_container_add (GTK_CONTAINER (frame), table);
gtk_widget_show (table);
button = gtk_check_button_new_with_mnemonic (_("Create _Histogram"));
gtk_table_attach_defaults (GTK_TABLE (table), button, 0, 3, 0, 1);
......
......@@ -660,7 +660,17 @@ edge_dialog (GimpDrawable *drawable)
gtk_box_pack_start_defaults (GTK_BOX (GTK_DIALOG (dlg)->vbox), frame);
gtk_widget_show (frame);
table = gimp_parameter_settings_new (GTK_DIALOG (dlg)->vbox, 2, 3);
/* parameter settings */
frame = gtk_frame_new (_("Parameter Settings"));
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN);
gtk_container_set_border_width (GTK_CONTAINER (frame), 6);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), frame, TRUE, TRUE, 0);
table = gtk_table_new (2, 3, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
gtk_table_set_row_spacings (GTK_TABLE (table), 4);
gtk_container_set_border_width (GTK_CONTAINER (table), 4);
gtk_container_add (GTK_CONTAINER (frame), table);
/* Label, scale, entry for evals.amount */
scale_data = gimp_scale_entry_new (GTK_TABLE (table), 0, 0,
......
......@@ -522,7 +522,16 @@ pluginCoreIA (piArgs *argp)
gtk_box_pack_start (GTK_BOX (hbox), frame, TRUE, TRUE, 0);
gtk_widget_show (frame);
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,
_("_Azimuth:"), 100, 6,
......
......@@ -195,6 +195,7 @@ static gint
engrave_dialog (void)
{
GtkWidget *dlg;
GtkWidget *frame;
GtkWidget *table;
GtkWidget *toggle;
GtkObject *adj;
......@@ -211,7 +212,19 @@ engrave_dialog (void)
NULL);
table = gimp_parameter_settings_new (GTK_DIALOG (dlg)->vbox, 2, 3);
/* parameter settings */
frame = gtk_frame_new (_("Parameter Settings"));
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN);
gtk_container_set_border_width (GTK_CONTAINER (frame), 6);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), frame, TRUE, TRUE, 0);
gtk_widget_show (frame);
table = gtk_table_new (2, 3, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
gtk_table_set_row_spacings (GTK_TABLE (table), 4);
gtk_container_set_border_width (GTK_CONTAINER (table), 4);
gtk_container_add (GTK_CONTAINER (frame), table);
gtk_widget_show (table);
toggle = gtk_check_button_new_with_mnemonic (_("_Limit Line Width"));
gtk_table_attach (GTK_TABLE (table), toggle, 0, 3, 0, 1, GTK_FILL, 0, 0, 0);
......
......@@ -333,6 +333,7 @@ gauss_iir_dialog (void)
GtkWidget *spinbutton;
GtkObject *adj;
GtkWidget *toggle;
GtkWidget *frame;
GtkWidget *vbox;
GtkWidget *hbox;
gboolean run;
......@@ -348,7 +349,17 @@ gauss_iir_dialog (void)
NULL);
vbox = gimp_parameter_settings_new (GTK_DIALOG (dlg)->vbox, 0, 0);
/* parameter settings */
frame = gtk_frame_new (_("Parameter Settings"));
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN);
gtk_container_set_border_width (GTK_CONTAINER (frame), 6);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), frame, TRUE, TRUE, 0);
gtk_widget_show (frame);
vbox = gtk_vbox_new (FALSE, 2);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
gtk_container_add (GTK_CONTAINER (frame), vbox);
gtk_widget_show (vbox);
toggle = gtk_check_button_new_with_label (_("Blur Horizontally"));
gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, FALSE, 0);
......
......@@ -327,6 +327,7 @@ gauss_rle_dialog (void)
GtkWidget *spinbutton;
GtkObject *adj;
GtkWidget *toggle;
GtkWidget *frame;
GtkWidget *vbox;
GtkWidget *hbox;
gboolean run;
......@@ -342,7 +343,17 @@ gauss_rle_dialog (void)
NULL);
vbox = gimp_parameter_settings_new (GTK_DIALOG (dlg)->vbox, 0, 0);
/* parameter settings */
frame = gtk_frame_new (_("Parameter Settings"));
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN);
gtk_container_set_border_width (GTK_CONTAINER (frame), 6);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), frame, TRUE, TRUE, 0);
gtk_widget_show (frame);
vbox = gtk_vbox_new (FALSE, 2);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
gtk_container_add (GTK_CONTAINER (frame), vbox);
gtk_widget_show (vbox);
toggle = gtk_check_button_new_with_label (_("Blur Horizontally"));
gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, FALSE, 0);
......
......@@ -218,6 +218,7 @@ glass_dialog (GimpDrawable *drawable)
{
GtkWidget *dlg;
GtkWidget *main_vbox;
GtkWidget *frame;
GtkWidget *table;
GtkObject *adj;
gboolean run;
......@@ -244,7 +245,18 @@ glass_dialog (GimpDrawable *drawable)
gtk_widget_show (preview->widget);
glasstile (drawable, TRUE); /* filter routine, initial pass */
table = gimp_parameter_settings_new (main_vbox, 2, 3);
/* Parameter settings */
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, TRUE, TRUE, 0);
gtk_widget_show (frame);
table = gtk_table_new (2, 3, FALSE);
gtk_container_set_border_width (GTK_CONTAINER (table), 4);
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
gtk_table_set_row_spacings (GTK_TABLE (table), 2);
gtk_container_add (GTK_CONTAINER (frame), table);
gtk_widget_show (table);
/* Horizontal scale - Width */
adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 0,
......
......@@ -679,7 +679,15 @@ dialog (gint32 image_ID,
/* left side of the UI is done */
/* right side */
main_vbox = gimp_parameter_settings_new (main_hbox, 0, 0);
frame = gtk_frame_new (_("Parameter Settings"));
gtk_container_set_border_width (GTK_CONTAINER (frame), 4);
gtk_box_pack_start (GTK_BOX (main_hbox), frame, FALSE, FALSE, 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);
/* The width entries */
width = gimp_size_entry_new (3, /* number_of_fields */
......
......@@ -379,6 +379,7 @@ dialog (GimpDrawable *mangle)
{
GtkWidget *dlg;
GtkWidget *main_vbox;
GtkWidget *frame;
GtkWidget *table;
GtkWidget *spinbutton;
GtkObject *adj;
......@@ -408,7 +409,16 @@ dialog (GimpDrawable *mangle)
filter_preview();
gtk_widget_show (preview->widget);
table = gimp_parameter_settings_new (main_vbox, 3, 2);
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, 2, FALSE);
gtk_container_set_border_width (GTK_CONTAINER (table), 4);
gtk_table_set_row_spacings (GTK_TABLE (table), 2);
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
gtk_container_add (GTK_CONTAINER (frame), table);
gtk_widget_show (table);
spinbutton = gimp_spin_button_new (&adj, parameters.division,
-32, 64, 1, 10, 0, 1, 0);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment