dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

plug-ins/common/cartoon.c plug-ins/common/despeckle.c 

2004-09-09  Michael Natterer  <mitch@gimp.org>

	* plug-ins/common/cartoon.c
	* plug-ins/common/despeckle.c
	* plug-ins/common/gauss.c
	* plug-ins/common/grid.c
	* plug-ins/common/neon.c
	* plug-ins/common/noisify.c
	* plug-ins/common/photocopy.c
	* plug-ins/common/sel_gauss.c
	* plug-ins/common/sharpen.c
	* plug-ins/common/sobel.c
	* plug-ins/common/softglow.c
	* plug-ins/common/spread.c
	* plug-ins/common/struc.c
	* plug-ins/common/unsharp.c: pack all drawable previews expanding.
	Also did some general cleanups like consistently naming the dialog
	variable "dialog" and the main vbox "main_vbox".
This commit is contained in:
Michael Natterer 2004-09-09 16:08:56 +00:00 committed by Michael Natterer
parent b3c30779a0
commit 094909cd8a
15 changed files with 308 additions and 343 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ChangeLog
View File

@ -1,3 +1,22 @@
2004-09-09 Michael Natterer <mitch@gimp.org>
* plug-ins/common/cartoon.c
* plug-ins/common/despeckle.c
* plug-ins/common/gauss.c
* plug-ins/common/grid.c
* plug-ins/common/neon.c
* plug-ins/common/noisify.c
* plug-ins/common/photocopy.c
* plug-ins/common/sel_gauss.c
* plug-ins/common/sharpen.c
* plug-ins/common/sobel.c
* plug-ins/common/softglow.c
* plug-ins/common/spread.c
* plug-ins/common/struc.c
* plug-ins/common/unsharp.c: pack all drawable previews expanding.
Also did some general cleanups like consistently naming the dialog
variable "dialog" and the main vbox "main_vbox".
2004-09-09 Sven Neumann <sven@gimp.org>
* libgimpwidgets/gimppreview.[ch]: right-align the preview for RTL

49
plug-ins/common/cartoon.c
View File

@ -795,9 +795,8 @@ find_constants (gdouble n_p[],
static gboolean
cartoon_dialog (GimpDrawable *drawable)
{
GtkWidget *dlg;
GtkWidget *vbox;
GtkWidget *hbox;
GtkWidget *dialog;
GtkWidget *main_vbox;
GtkWidget *preview;
GtkWidget *table;
GtkObject *scale_data;
@ -805,34 +804,32 @@ cartoon_dialog (GimpDrawable *drawable)
gimp_ui_init ("cartoon", FALSE);
dlg = gimp_dialog_new (_("Cartoon"), "cartoon",
NULL, 0,
gimp_standard_help_func, "plug-in-cartoon",
dialog = gimp_dialog_new (_("Cartoon"), "cartoon",
NULL, 0,
gimp_standard_help_func, "plug-in-cartoon",
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK,
NULL);
NULL);
vbox = gtk_vbox_new (FALSE, 12);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dlg)->vbox), vbox);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
gtk_widget_show (vbox);
hbox = gtk_hbox_new (FALSE, 12);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
main_vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox);
gtk_widget_show (main_vbox);
preview = gimp_drawable_preview_new (drawable, &cvals.update_preview);
gtk_box_pack_start (GTK_BOX (hbox), preview, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (main_vbox), preview, TRUE, TRUE, 0);
gtk_widget_show (preview);
g_signal_connect_swapped (preview, "invalidated",
G_CALLBACK (cartoon), drawable);
G_CALLBACK (cartoon),
drawable);
table = gtk_table_new (3, 3, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (table), 6);
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
gtk_container_add (GTK_CONTAINER (vbox), table);
gtk_box_pack_start (GTK_BOX (main_vbox), table, FALSE, FALSE, 0);
gtk_widget_show (table);
/* Label, scale, entry for cvals.amount */
@ -846,7 +843,8 @@ cartoon_dialog (GimpDrawable *drawable)
G_CALLBACK (gimp_double_adjustment_update),
&cvals.mask_radius);
g_signal_connect_swapped (scale_data, "value_changed",
G_CALLBACK (gimp_preview_invalidate), preview);
G_CALLBACK (gimp_preview_invalidate),
preview);
/* Label, scale, entry for cvals.amount */
scale_data = gimp_scale_entry_new (GTK_TABLE (table), 0, 1,
@ -859,13 +857,14 @@ cartoon_dialog (GimpDrawable *drawable)
G_CALLBACK (gimp_double_adjustment_update),
&cvals.pct_black);
g_signal_connect_swapped (scale_data, "value_changed",
G_CALLBACK (gimp_preview_invalidate), preview);
G_CALLBACK (gimp_preview_invalidate),
preview);
gtk_widget_show (dlg);
gtk_widget_show (dialog);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dialog)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);
gtk_widget_destroy (dialog);
return run;
}

16
plug-ins/common/despeckle.c
View File

@ -566,7 +566,6 @@ despeckle_dialog (void)
{
GtkWidget *dialog;
GtkWidget *main_vbox;
GtkWidget *hbox;
GtkWidget *vbox;
GtkWidget *table;
GtkWidget *frame;
@ -587,26 +586,23 @@ despeckle_dialog (void)
main_vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), main_vbox,
TRUE, TRUE, 0);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox);
gtk_widget_show (main_vbox);
hbox = gtk_hbox_new (FALSE, 12);
gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
preview = gimp_drawable_preview_new (drawable, &update_toggle);
gtk_box_pack_start (GTK_BOX (hbox), preview, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (main_vbox), preview, TRUE, TRUE, 0);
gtk_widget_show (preview);
g_signal_connect (preview, "invalidated",
G_CALLBACK (preview_update), NULL);
G_CALLBACK (preview_update),
NULL);
/*
* Filter type controls...
*/
frame = gimp_frame_new (_("Type"));
gtk_box_pack_start (GTK_BOX (hbox), frame, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
gtk_widget_show (frame);
vbox = gtk_vbox_new (FALSE, 6);

34
plug-ins/common/gauss.c
View File

@ -444,10 +444,10 @@ static gboolean
gauss_dialog (gint32 image_ID,
GimpDrawable *drawable)
{
GtkWidget *dlg;
GtkWidget *dialog;
GtkWidget *main_vbox;
GtkWidget *frame;
GtkWidget *size;
GtkWidget *vbox;
GtkWidget *hbox;
GtkWidget *preview;
@ -458,26 +458,26 @@ gauss_dialog (gint32 image_ID,
gimp_ui_init ("gaussian_blur", FALSE);
dlg = gimp_dialog_new (_("Gaussian Blur"), "gaussian_blur",
NULL, 0,
gimp_standard_help_func, "plug-in-gauss",
dialog = gimp_dialog_new (_("Gaussian Blur"), "gaussian_blur",
NULL, 0,
gimp_standard_help_func, "plug-in-gauss",
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK,
NULL);
NULL);
vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), vbox, TRUE, TRUE, 0);
gtk_widget_show (vbox);
main_vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox);
gtk_widget_show (main_vbox);
preview = gimp_drawable_preview_new (drawable, NULL);
gtk_box_pack_start (GTK_BOX (vbox), preview, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (main_vbox), preview, TRUE, TRUE, 0);
gtk_widget_show (preview);
hbox = gtk_hbox_new (FALSE, 12);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
/* parameter settings */
@ -534,9 +534,9 @@ gauss_dialog (gint32 image_ID,
gtk_box_pack_start (GTK_BOX (hbox), frame, FALSE, FALSE, 0);
gtk_widget_show (frame);
gtk_widget_show (dlg);
gtk_widget_show (dialog);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dialog)) == GTK_RESPONSE_OK);
if (run)
{
@ -544,7 +544,7 @@ gauss_dialog (gint32 image_ID,
bvals.vertical = gimp_size_entry_get_refval (GIMP_SIZE_ENTRY (size), 1);
}
gtk_widget_destroy (dlg);
gtk_widget_destroy (dialog);
return run;
}

57
plug-ins/common/grid.c
View File

@ -596,25 +596,22 @@ static gint
dialog (gint32 image_ID,
GimpDrawable *drawable)
{
GtkWidget *dlg;
GtkWidget *vbox;
GtkWidget *vbox2;
GtkWidget *hbox;
GtkWidget *dlg;
GtkWidget *main_vbox;
GtkWidget *vbox;
GtkSizeGroup *group;
GtkWidget *label;
GtkWidget *preview;
GtkWidget *button;
GtkWidget *width;
GtkWidget *space;
GtkWidget *offset;
GtkWidget *chain_button;
GtkWidget *table;
GimpUnit unit;
gdouble xres;
gdouble yres;
gboolean run;
GtkWidget *preview;
GtkWidget *button;
GtkWidget *width;
GtkWidget *space;
GtkWidget *offset;
GtkWidget *chain_button;
GtkWidget *table;
GimpUnit unit;
gdouble xres;
gdouble yres;
gboolean run;
g_return_val_if_fail (main_dialog == NULL, FALSE);
@ -633,26 +630,22 @@ dialog (gint32 image_ID,
gimp_image_get_resolution (image_ID, &xres, &yres);
unit = gimp_image_get_unit (image_ID);
vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), vbox, FALSE, FALSE, 0);
gtk_widget_show (vbox);
hbox = gtk_hbox_new (FALSE, 0);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
main_vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dlg)->vbox), main_vbox);
gtk_widget_show (main_vbox);
preview = gimp_drawable_preview_new (drawable, NULL);
gtk_box_pack_start (GTK_BOX (hbox), preview, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (main_vbox), preview, TRUE, TRUE, 0);
gtk_widget_show (preview);
g_signal_connect (preview, "invalidated",
G_CALLBACK (update_preview),
drawable);
vbox2 = gtk_vbox_new (FALSE, 2);
gtk_box_pack_start (GTK_BOX (vbox), vbox2, FALSE, FALSE, 0);
gtk_widget_show (vbox2);
vbox = gtk_vbox_new (FALSE, 2);
gtk_box_pack_start (GTK_BOX (main_vbox), vbox, FALSE, FALSE, 0);
gtk_widget_show (vbox);
/* The width entries */
width = gimp_size_entry_new (3, /* number_of_fields */
@ -665,7 +658,7 @@ dialog (gint32 image_ID,
GIMP_SIZE_ENTRY_UPDATE_SIZE); /* update_policy */
gtk_box_pack_start (GTK_BOX (vbox2), width, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (vbox), width, FALSE, FALSE, 0);
gtk_widget_show (width);
/* set the unit back to pixels, since most times we will want pixels */
@ -740,7 +733,7 @@ dialog (gint32 image_ID,
SPIN_BUTTON_WIDTH, /* spinbutton_usize */
GIMP_SIZE_ENTRY_UPDATE_SIZE); /* update_policy */
gtk_box_pack_start (GTK_BOX (vbox2), space, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (vbox), space, FALSE, FALSE, 0);
gtk_widget_show (space);
gimp_size_entry_set_unit (GIMP_SIZE_ENTRY (space), GIMP_UNIT_PIXEL);
@ -807,7 +800,7 @@ dialog (gint32 image_ID,
SPIN_BUTTON_WIDTH, /* spinbutton_usize */
GIMP_SIZE_ENTRY_UPDATE_SIZE); /* update_policy */
gtk_box_pack_start (GTK_BOX (vbox2), offset, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (vbox), offset, FALSE, FALSE, 0);
gtk_widget_show (offset);
gimp_size_entry_set_unit (GIMP_SIZE_ENTRY (offset), GIMP_UNIT_PIXEL);

39
plug-ins/common/neon.c
View File

@ -675,9 +675,8 @@ find_constants (gdouble n_p[],
static gboolean
neon_dialog (GimpDrawable *drawable)
{
GtkWidget *dlg;
GtkWidget *vbox;
GtkWidget *hbox;
GtkWidget *dialog;
GtkWidget *main_vbox;
GtkWidget *preview;
GtkWidget *table;
GtkObject *scale_data;
@ -685,26 +684,22 @@ neon_dialog (GimpDrawable *drawable)
gimp_ui_init ("neon", FALSE);
dlg = gimp_dialog_new (_("Neon Detection"), "neon",
NULL, 0,
gimp_standard_help_func, "plug-in-neon",
dialog = gimp_dialog_new (_("Neon Detection"), "neon",
NULL, 0,
gimp_standard_help_func, "plug-in-neon",
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK,
NULL);
NULL);
vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
gtk_box_pack_start_defaults (GTK_BOX (GTK_DIALOG (dlg)->vbox), vbox);
gtk_widget_show (vbox);
hbox = gtk_hbox_new (FALSE, 12);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
main_vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox);
gtk_widget_show (main_vbox);
preview = gimp_drawable_preview_new (drawable, NULL);
gtk_box_pack_start (GTK_BOX (hbox), preview, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (main_vbox), preview, TRUE, TRUE, 0);
gtk_widget_show (preview);
g_signal_connect (preview, "invalidated",
@ -714,7 +709,7 @@ neon_dialog (GimpDrawable *drawable)
table = gtk_table_new (2, 3, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (table), 6);
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (main_vbox), table, FALSE, FALSE, 0);
gtk_widget_show (table);
/* Label, scale, entry for evals.radius */
@ -746,11 +741,11 @@ neon_dialog (GimpDrawable *drawable)
G_CALLBACK (gimp_preview_invalidate),
preview);
gtk_widget_show (dlg);
gtk_widget_show (dialog);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dialog)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);
gtk_widget_destroy (dialog);
return run;
}

84
plug-ins/common/noisify.c
View File

@ -60,30 +60,31 @@ typedef struct
GtkObject *channel_adj[4];
} NoisifyInterface;
/* Declare local functions.
*/
static void query (void);
static void run (const gchar *name,
gint nparams,
const GimpParam *param,
gint *nreturn_vals,
GimpParam **return_vals);
static void query (void);
static void run (const gchar *name,
gint nparams,
const GimpParam *param,
gint *nreturn_vals,
GimpParam **return_vals);
static void noisify_func (const guchar *src,
guchar *dest,
gint bpp,
gpointer data);
static void noisify_func (const guchar *src,
guchar *dest,
gint bpp,
gpointer data);
static void noisify (GimpDrawablePreview *preview);
static void noisify (GimpDrawablePreview *preview);
static gdouble gauss (GRand *gr);
static gdouble gauss (GRand *gr);
static gint noisify_dialog (GimpDrawable *drawable,
gint channels);
static void noisify_double_adjustment_update (GtkAdjustment *adjustment,
gpointer data);
static gboolean noisify_dialog (GimpDrawable *drawable,
gint channels);
static void noisify_double_adjustment_update (GtkAdjustment *adjustment,
gpointer data);
GimpPlugInInfo PLUG_IN_INFO =
{
@ -356,13 +357,12 @@ noisify_add_alpha_channel (GtkWidget *table,
noise_int.channel_adj[channel] = adj;
}
static gint
static gboolean
noisify_dialog (GimpDrawable *drawable,
gint channels)
{
GtkWidget *dlg;
GtkWidget *vbox;
GtkWidget *hbox;
GtkWidget *dialog;
GtkWidget *main_vbox;
GtkWidget *preview;
GtkWidget *toggle;
GtkWidget *table;
@ -370,35 +370,34 @@ noisify_dialog (GimpDrawable *drawable,
gimp_ui_init ("noisify", FALSE);
dlg = gimp_dialog_new (_("Scatter RGB"), "noisify",
NULL, 0,
gimp_standard_help_func, "plug-in-noisify",
dialog = gimp_dialog_new (_("Scatter RGB"), "noisify",
NULL, 0,
gimp_standard_help_func, "plug-in-noisify",
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK,
NULL);
NULL);
vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), vbox, TRUE, TRUE, 0);
gtk_widget_show (vbox);
hbox = gtk_hbox_new (FALSE, 12);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
main_vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox);
gtk_widget_show (main_vbox);
preview = gimp_drawable_preview_new (drawable, NULL);
gtk_box_pack_start (GTK_BOX (hbox), preview, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (main_vbox), preview, FALSE, FALSE, 0);
gtk_widget_show (preview);
g_signal_connect (preview, "invalidated",
G_CALLBACK (noisify), NULL);
G_CALLBACK (noisify),
NULL);
if (gimp_drawable_is_rgb (drawable->drawable_id))
{
toggle = gtk_check_button_new_with_mnemonic (_("_Independent RGB"));
gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, FALSE, 0);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), nvals.independent);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle),
nvals.independent);
gtk_box_pack_start (GTK_BOX (main_vbox), toggle, FALSE, FALSE, 0);
gtk_widget_show (toggle);
g_signal_connect (toggle, "toggled",
@ -412,7 +411,7 @@ noisify_dialog (GimpDrawable *drawable,
table = gtk_table_new (channels, 3, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (table), 6);
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
gtk_box_pack_start (GTK_BOX (vbox), table, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (main_vbox), table, TRUE, TRUE, 0);
gtk_widget_show (table);
noise_int.channels = channels;
@ -457,11 +456,11 @@ noisify_dialog (GimpDrawable *drawable,
}
}
gtk_widget_show (dlg);
gtk_widget_show (dialog);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dialog)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);
gtk_widget_destroy (dialog);
return run;
}
@ -503,6 +502,7 @@ noisify_double_adjustment_update (GtkAdjustment *adjustment,
if (! nvals.independent)
{
gint i;
switch (noise_int.channels)
{
case 1:

57
plug-ins/common/photocopy.c
View File

@ -837,44 +837,41 @@ find_constants (gdouble n_p[],
static gboolean
photocopy_dialog (GimpDrawable *drawable)
{
GtkWidget *dlg;
GtkWidget *vbox;
GtkWidget *hbox;
GtkWidget *dialog;
GtkWidget *main_vbox;
GtkWidget *preview;
GtkWidget *table;
GtkObject *scale_data;
gint run;
gboolean run;
gimp_ui_init ("photocopy", FALSE);
dlg = gimp_dialog_new (_("Photocopy"), "photocopy",
NULL, 0,
gimp_standard_help_func, "plug_in_photocopy",
dialog = gimp_dialog_new (_("Photocopy"), "photocopy",
NULL, 0,
gimp_standard_help_func, "plug_in_photocopy",
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK,
NULL);
NULL);
vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dlg)->vbox), vbox);
gtk_widget_show (vbox);
hbox = gtk_hbox_new (FALSE, 12);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
main_vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox);
gtk_widget_show (main_vbox);
preview = gimp_drawable_preview_new (drawable, &pvals.update_preview);
gtk_box_pack_start (GTK_BOX (hbox), preview, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (main_vbox), preview, TRUE, TRUE, 0);
gtk_widget_show (preview);
g_signal_connect_swapped (preview, "invalidated",
G_CALLBACK (photocopy), drawable);
G_CALLBACK (photocopy),
drawable);
table = gtk_table_new (4, 3, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (table), 6);
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
gtk_container_add (GTK_CONTAINER (vbox), table);
gtk_box_pack_start (GTK_BOX (main_vbox), table, FALSE, FALSE, 0);
gtk_widget_show (table);
/* Label, scale, entry for pvals.amount */
@ -888,7 +885,8 @@ photocopy_dialog (GimpDrawable *drawable)
G_CALLBACK (gimp_double_adjustment_update),
&pvals.mask_radius);
g_signal_connect_swapped (scale_data, "value_changed",
G_CALLBACK (gimp_preview_invalidate), preview);
G_CALLBACK (gimp_preview_invalidate),
preview);
/* Label, scale, entry for pvals.amount */
scale_data = gimp_scale_entry_new (GTK_TABLE (table), 0, 1,
@ -901,7 +899,8 @@ photocopy_dialog (GimpDrawable *drawable)
G_CALLBACK (gimp_double_adjustment_update),
&pvals.sharpness);
g_signal_connect_swapped (scale_data, "value_changed",
G_CALLBACK (gimp_preview_invalidate), preview);
G_CALLBACK (gimp_preview_invalidate),
preview);
/* Label, scale, entry for pvals.amount */
scale_data = gimp_scale_entry_new (GTK_TABLE (table), 0, 2,
@ -914,7 +913,8 @@ photocopy_dialog (GimpDrawable *drawable)
G_CALLBACK (gimp_double_adjustment_update),
&pvals.pct_black);
g_signal_connect_swapped (scale_data, "value_changed",
G_CALLBACK (gimp_preview_invalidate), preview);
G_CALLBACK (gimp_preview_invalidate),
preview);
/* Label, scale, entry for pvals.amount */
scale_data = gimp_scale_entry_new (GTK_TABLE (table), 0, 3,
@ -927,13 +927,14 @@ photocopy_dialog (GimpDrawable *drawable)
G_CALLBACK (gimp_double_adjustment_update),
&pvals.pct_white);
g_signal_connect_swapped (scale_data, "value_changed",
G_CALLBACK (gimp_preview_invalidate), preview);
G_CALLBACK (gimp_preview_invalidate),
preview);
gtk_widget_show (dlg);
gtk_widget_show (dialog);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dialog)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);
gtk_widget_destroy (dialog);
return run;
}

82
plug-ins/common/sel_gauss.c
View File

@ -26,8 +26,8 @@
* - create more selective and adaptive filters
* - threading
* - optimization
*
*/
#include "config.h"
#include <gtk/gtk.h>
@ -211,9 +211,8 @@ run (const gchar *name,
static gboolean
sel_gauss_dialog (GimpDrawable *drawable)
{
GtkWidget *dlg;
GtkWidget *vbox;
GtkWidget *hbox;
GtkWidget *dialog;
GtkWidget *main_vbox;
GtkWidget *preview;
GtkWidget *table;
GtkWidget *spinbutton;
@ -222,36 +221,33 @@ sel_gauss_dialog (GimpDrawable *drawable)
gimp_ui_init ("sel_gauss", FALSE);
dlg = gimp_dialog_new (_("Selective Gaussian Blur"), "sel_gauss",
NULL, 0,
gimp_standard_help_func, "plug-in-sel-gauss",
dialog = gimp_dialog_new (_("Selective Gaussian Blur"), "sel_gauss",
NULL, 0,
gimp_standard_help_func, "plug-in-sel-gauss",
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK,
NULL);
NULL);
vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), vbox,
FALSE, FALSE, 0);
gtk_widget_show (vbox);
main_vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox);
gtk_widget_show (main_vbox);
hbox = gtk_hbox_new (FALSE, 12);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
preview = gimp_drawable_preview_new (drawable,
&bvals.update_preview);
gtk_box_pack_start (GTK_BOX (hbox), preview, FALSE, FALSE, 0);
preview = gimp_drawable_preview_new (drawable, &bvals.update_preview);
gtk_box_pack_start (GTK_BOX (main_vbox), preview, TRUE, TRUE, 0);
gtk_widget_show (preview);
g_signal_connect (preview, "invalidated",
G_CALLBACK (preview_update), NULL);
G_CALLBACK (preview_update),
NULL);
table = gtk_table_new (2, 3, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (table), 6);
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (main_vbox), table, FALSE, FALSE, 0);
gtk_widget_show (table);
spinbutton = gimp_spin_button_new (&adj,
bvals.radius, 0.0, G_MAXINT, 1.0, 5.0,
@ -278,12 +274,11 @@ sel_gauss_dialog (GimpDrawable *drawable)
G_CALLBACK (gimp_preview_invalidate),
preview);
gtk_widget_show (table);
gtk_widget_show (dlg);
gtk_widget_show (dialog);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dialog)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);
gtk_widget_destroy (dialog);
return run;
}
@ -399,26 +394,26 @@ matrixmult (guchar *src,
static void
sel_gauss (GimpDrawable *drawable,
gdouble radius,
gint maxdelta)
gdouble radius,
gint maxdelta)
{
GimpPixelRgn src_rgn, dest_rgn;
gint width, height;
gint bytes;
gint has_alpha;
guchar *dest;
guchar *src;
gint x1, y1, x2, y2;
gint i;
gdouble **mat;
gint numrad;
gint width, height;
gint bytes;
gboolean has_alpha;
guchar *dest;
guchar *src;
gint x1, y1, x2, y2;
gint i;
gdouble **mat;
gint numrad;
gimp_drawable_mask_bounds (drawable->drawable_id, &x1, &y1, &x2, &y2);
width = x2 - x1;
height = y2 - y1;
bytes = drawable->bpp;
has_alpha = gimp_drawable_has_alpha(drawable->drawable_id);
width = x2 - x1;
height = y2 - y1;
bytes = drawable->bpp;
has_alpha = gimp_drawable_has_alpha (drawable->drawable_id);
numrad = (gint) (radius + 1.0);
mat = g_new (gdouble *, numrad);
@ -516,4 +511,3 @@ preview_update (GimpDrawablePreview *preview)
g_free (render_buffer);
}

24
plug-ins/common/sharpen.c
View File

@ -474,10 +474,9 @@ static gboolean
sharpen_dialog (GimpDrawable *drawable)
{
GtkWidget *dialog;
GtkWidget *vbox;
GtkWidget *main_vbox;
GtkWidget *preview;
GtkWidget *table;
GtkWidget *hbox;
GtkObject *adj;
gboolean run;
@ -492,26 +491,23 @@ sharpen_dialog (GimpDrawable *drawable)
NULL);
vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), vbox,
FALSE, FALSE, 0);
gtk_widget_show (vbox);
hbox = gtk_hbox_new (FALSE, 12);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
main_vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox);
gtk_widget_show (main_vbox);
preview = gimp_drawable_preview_new (drawable,
&sharpen_params.update_preview);
gtk_box_pack_start (GTK_BOX (hbox), preview, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (main_vbox), preview, TRUE, TRUE, 0);
gtk_widget_show (preview);
g_signal_connect (preview, "invalidated",
G_CALLBACK (preview_update), NULL);
G_CALLBACK (preview_update),
NULL);
table = gtk_table_new (1, 3, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (table), 6);
gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (main_vbox), table, FALSE, FALSE, 0);
gtk_widget_show (table);
adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 0,

47
plug-ins/common/sobel.c
View File

@ -216,37 +216,30 @@ run (const gchar *name,
static gboolean
sobel_dialog (GimpDrawable *drawable)
{
GtkWidget *dlg;
GtkWidget *toggle;
GtkWidget *vbox;
GtkWidget *hbox;
GtkWidget *dialog;
GtkWidget *main_vbox;
GtkWidget *preview;
GtkWidget *toggle;
gboolean run;
gimp_ui_init ("sobel", FALSE);
dlg = gimp_dialog_new (_("Sobel Edge Detection"), "sobel",
NULL, 0,
gimp_standard_help_func, "plug-in-sobel",
dialog = gimp_dialog_new (_("Sobel Edge Detection"), "sobel",
NULL, 0,
gimp_standard_help_func, "plug-in-sobel",
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK,
NULL);
NULL);
/* parameter settings */
vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dlg)->vbox), vbox);
gtk_widget_show (vbox);
/* preview */
hbox = gtk_hbox_new (FALSE, 12);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
main_vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox);
gtk_widget_show (main_vbox);
preview = gimp_drawable_preview_new (drawable, NULL);
gtk_box_pack_start (GTK_BOX (hbox), preview, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (main_vbox), preview, TRUE, TRUE, 0);
gtk_widget_show (preview);
g_signal_connect (preview, "invalidated",
@ -254,8 +247,8 @@ sobel_dialog (GimpDrawable *drawable)
NULL);
toggle = gtk_check_button_new_with_mnemonic (_("Sobel _Horizontally"));
gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, FALSE, 0);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), bvals.horizontal);
gtk_box_pack_start (GTK_BOX (main_vbox), toggle, FALSE, FALSE, 0);
gtk_widget_show (toggle);
g_signal_connect (toggle, "toggled",
@ -266,8 +259,8 @@ sobel_dialog (GimpDrawable *drawable)
preview);
toggle = gtk_check_button_new_with_mnemonic (_("Sobel _Vertically"));
gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, FALSE, 0);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), bvals.vertical);
gtk_box_pack_start (GTK_BOX (main_vbox), toggle, FALSE, FALSE, 0);
gtk_widget_show (toggle);
g_signal_connect (toggle, "toggled",
@ -279,8 +272,8 @@ sobel_dialog (GimpDrawable *drawable)
toggle = gtk_check_button_new_with_mnemonic (_("_Keep sign of result "
"(one direction only)"));
gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, FALSE, 0);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), bvals.keep_sign);
gtk_box_pack_start (GTK_BOX (main_vbox), toggle, FALSE, FALSE, 0);
gtk_widget_show (toggle);
g_signal_connect (toggle, "toggled",
@ -290,11 +283,11 @@ sobel_dialog (GimpDrawable *drawable)
G_CALLBACK (gimp_preview_invalidate),
preview);
gtk_widget_show (dlg);
gtk_widget_show (dialog);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dialog)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);
gtk_widget_destroy (dialog);
return run;
}

39
plug-ins/common/softglow.c
View File

@ -647,9 +647,8 @@ find_constants (gdouble n_p[],
static gboolean
softglow_dialog (GimpDrawable *drawable)
{
GtkWidget *dlg;
GtkWidget *vbox;
GtkWidget *hbox;
GtkWidget *dialog;
GtkWidget *main_vbox;
GtkWidget *preview;
GtkWidget *table;
GtkObject *scale_data;
@ -657,26 +656,22 @@ softglow_dialog (GimpDrawable *drawable)
gimp_ui_init ("softglow", FALSE);
dlg = gimp_dialog_new (_("Softglow"), "softglow",
NULL, 0,
gimp_standard_help_func, "plug-in-softglow",
dialog = gimp_dialog_new (_("Softglow"), "softglow",
NULL, 0,
gimp_standard_help_func, "plug-in-softglow",
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK,
NULL);
NULL);
vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dlg)->vbox), vbox);
gtk_widget_show (vbox);
hbox = gtk_hbox_new (FALSE, 12);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
main_vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox);
gtk_widget_show (main_vbox);
preview = gimp_drawable_preview_new (drawable, NULL);
gtk_box_pack_start (GTK_BOX (hbox), preview, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (main_vbox), preview, TRUE, TRUE, 0);
gtk_widget_show (preview);
g_signal_connect_swapped (preview, "invalidated",
@ -686,7 +681,7 @@ softglow_dialog (GimpDrawable *drawable)
table = gtk_table_new (3, 3, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (table), 6);
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
gtk_box_pack_start_defaults (GTK_BOX (vbox), table);
gtk_box_pack_start (GTK_BOX (main_vbox), table, FALSE, FALSE, 0);
gtk_widget_show (table);
/* Label, scale, entry for svals.amount */
@ -731,11 +726,11 @@ softglow_dialog (GimpDrawable *drawable)
G_CALLBACK (gimp_preview_invalidate),
preview);
gtk_widget_show (dlg);
gtk_widget_show (dialog);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dialog)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);
gtk_widget_destroy (dialog);
return run;
}

42
plug-ins/common/spread.c
View File

@ -327,12 +327,11 @@ static gboolean
spread_dialog (gint32 image_ID,
GimpDrawable *drawable)
{
GtkWidget *dlg;
GtkWidget *vbox;
GtkWidget *hbox;
GtkWidget *dialog;
GtkWidget *main_vbox;
GtkWidget *preview;
GtkWidget *frame;
GtkWidget *size;
GtkWidget *preview;
GimpUnit unit;
gdouble xres;
gdouble yres;
@ -340,31 +339,26 @@ spread_dialog (gint32 image_ID,
gimp_ui_init ("spread", FALSE);
dlg = gimp_dialog_new (_("Spread"), "spread",
NULL, 0,
gimp_standard_help_func, "plug-in-spread",
dialog = gimp_dialog_new (_("Spread"), "spread",
NULL, 0,
gimp_standard_help_func, "plug-in-spread",
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK,
NULL);
NULL);
vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), vbox,
FALSE, FALSE, 0);
gtk_widget_show (vbox);
hbox = gtk_hbox_new (FALSE, 12);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
main_vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox);
gtk_widget_show (main_vbox);
preview = gimp_drawable_preview_new (drawable, NULL);
gtk_box_pack_start (GTK_BOX (hbox), preview, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (main_vbox), preview, TRUE, TRUE, 0);
gtk_widget_show (preview);
frame = gimp_frame_new (_("Spread Amount"));
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
gtk_widget_show (frame);
/* Get the image resolution and unit */
@ -395,11 +389,11 @@ spread_dialog (gint32 image_ID,
G_CALLBACK (gimp_preview_invalidate),
preview);
gtk_widget_show (dlg);
gtk_widget_show (dialog);
spread_preview_update (GIMP_PREVIEW (preview), size);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dialog)) == GTK_RESPONSE_OK);
if (run)
{
@ -409,7 +403,7 @@ spread_dialog (gint32 image_ID,
gimp_size_entry_get_refval (GIMP_SIZE_ENTRY (size), 1);
}
gtk_widget_destroy (dlg);
gtk_widget_destroy (dialog);
return run;
}

41
plug-ins/common/struc.c
View File

@ -1250,9 +1250,8 @@ run (const gchar *name,
static gboolean
struc_dialog (GimpDrawable *drawable)
{
GtkWidget *dlg;
GtkWidget *vbox;
GtkWidget *hbox;
GtkWidget *dialog;
GtkWidget *main_vbox;
GtkWidget *preview;
GtkWidget *frame;
GtkWidget *table;
@ -1262,26 +1261,22 @@ struc_dialog (GimpDrawable *drawable)
gimp_ui_init ("struc", FALSE);
dlg = gimp_dialog_new (_("Apply Canvas"), "struc",
NULL, 0,
gimp_standard_help_func, "plug-in-apply-canvas",
dialog = gimp_dialog_new (_("Apply Canvas"), "struc",
NULL, 0,
gimp_standard_help_func, "plug-in-apply-canvas",
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK,
NULL);
NULL);
vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), vbox, TRUE, TRUE, 0);
gtk_widget_show (vbox);
hbox = gtk_hbox_new (FALSE, 12);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
main_vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox);
gtk_widget_show (main_vbox);
preview = gimp_drawable_preview_new (drawable, &svals.update_preview);
gtk_box_pack_start (GTK_BOX (hbox), preview, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (main_vbox), preview, TRUE, TRUE, 0);
gtk_widget_show (preview);
g_signal_connect_swapped (preview, "invalidated",
@ -1298,7 +1293,7 @@ struc_dialog (GimpDrawable *drawable)
_("Bottom-_right"), BOTTOM_RIGHT, &radio4,
NULL);
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
gtk_widget_show (frame);
g_signal_connect_swapped (radio1, "toggled",
@ -1316,7 +1311,7 @@ struc_dialog (GimpDrawable *drawable)
table = gtk_table_new (1, 3, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (table), 6);
gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (main_vbox), table, FALSE, FALSE, 0);
gtk_widget_show (table);
adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 0,
@ -1331,11 +1326,11 @@ struc_dialog (GimpDrawable *drawable)
G_CALLBACK (gimp_preview_invalidate),
preview);
gtk_widget_show (dlg);
gtk_widget_show (dialog);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dialog)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);
gtk_widget_destroy (dialog);
return run;
}

21
plug-ins/common/unsharp.c
View File

@ -649,10 +649,9 @@ static gboolean
unsharp_mask_dialog (GimpDrawable *drawable)
{
GtkWidget *dialog;
GtkWidget *table;
GtkWidget *vbox;
GtkWidget *hbox;
GtkWidget *main_vbox;
GtkWidget *preview;
GtkWidget *table;
GtkObject *adj;
gboolean run;
@ -667,18 +666,14 @@ unsharp_mask_dialog (GimpDrawable *drawable)
NULL);
vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), vbox);
gtk_widget_show (vbox);
hbox = gtk_hbox_new (FALSE, 12);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
main_vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox);
gtk_widget_show (main_vbox);
preview = gimp_drawable_preview_new (drawable,
&unsharp_params.update_preview);
gtk_box_pack_start (GTK_BOX (hbox), preview, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (main_vbox), preview, TRUE, TRUE, 0);
gtk_widget_show (preview);
g_signal_connect (preview, "invalidated",
@ -688,7 +683,7 @@ unsharp_mask_dialog (GimpDrawable *drawable)
table = gtk_table_new (3, 3, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (table), 6);
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (main_vbox), table, FALSE, FALSE, 0);
gtk_widget_show (table);
adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 0,