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

plug-ins/common/nlfilt.c plug-ins/common/noisify.c plug-ins/common/nova.c 

2001-12-31  Michael Natterer  <mitch@gimp.org>

	* plug-ins/common/nlfilt.c
	* plug-ins/common/noisify.c
	* plug-ins/common/nova.c
	* plug-ins/common/oilify.c
	* plug-ins/common/papertile.c
	* plug-ins/common/pat.c
	* plug-ins/common/pixelize.c
	* plug-ins/common/plasma.c
	* plug-ins/common/plugindetails.c
	* plug-ins/common/png.c
	* plug-ins/common/pnm.c
	* plug-ins/common/polar.c
	* plug-ins/common/ps.c
	* plug-ins/common/psp.c
	* plug-ins/common/randomize.c
	* plug-ins/common/ripple.c
	* plug-ins/common/sample_colorize.c
	* plug-ins/common/scatter_hsv.c
	* plug-ins/common/screenshot.c
	* plug-ins/common/sel_gauss.c
	* plug-ins/common/sharpen.c
	* plug-ins/common/shift.c: compile with GTK_DISABLE_DEPRECATED.
This commit is contained in:
Michael Natterer 2001-12-31 00:21:10 +00:00 committed by Michael Natterer
parent e1bf14242d
commit fb6fe587c1
26 changed files with 953 additions and 771 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ChangeLog
View File

@ -1,3 +1,28 @@
2001-12-31 Michael Natterer <mitch@gimp.org>
* plug-ins/common/nlfilt.c
* plug-ins/common/noisify.c
* plug-ins/common/nova.c
* plug-ins/common/oilify.c
* plug-ins/common/papertile.c
* plug-ins/common/pat.c
* plug-ins/common/pixelize.c
* plug-ins/common/plasma.c
* plug-ins/common/plugindetails.c
* plug-ins/common/png.c
* plug-ins/common/pnm.c
* plug-ins/common/polar.c
* plug-ins/common/ps.c
* plug-ins/common/psp.c
* plug-ins/common/randomize.c
* plug-ins/common/ripple.c
* plug-ins/common/sample_colorize.c
* plug-ins/common/scatter_hsv.c
* plug-ins/common/screenshot.c
* plug-ins/common/sel_gauss.c
* plug-ins/common/sharpen.c
* plug-ins/common/shift.c: compile with GTK_DISABLE_DEPRECATED.
2001-12-30 Sven Neumann <sven@gimp.org>
* app/libgimp_glue.[ch]

36
plug-ins/common/nlfilt.c
View File

@ -174,7 +174,7 @@ run (gchar *name,
struct piArgs args;
*nretvals = 1;
*retvals = rvals;
*retvals = rvals;
memset (&args, (int) 0, sizeof (struct piArgs));
@ -183,7 +183,7 @@ run (gchar *name,
args.img = param[1].data.d_image;
args.drw = param[2].data.d_drawable;
rvals[0].type = GIMP_PDB_STATUS;
rvals[0].type = GIMP_PDB_STATUS;
rvals[0].data.d_status = GIMP_PDB_SUCCESS;
switch (param[0].data.d_int32)
@ -371,9 +371,9 @@ pluginCoreIA (struct piArgs *argp)
NULL);
gtk_signal_connect (GTK_OBJECT (dlg), "destroy",
GTK_SIGNAL_FUNC (gtk_main_quit),
NULL);
g_signal_connect (G_OBJECT (dlg), "destroy",
G_CALLBACK (gtk_main_quit),
NULL);
main_vbox = gtk_vbox_new (FALSE, 4);
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 6);
@ -386,7 +386,7 @@ pluginCoreIA (struct piArgs *argp)
gtk_widget_show (hbox);
preview = mw_preview_new (hbox, thePreview);
gtk_object_set_data (GTK_OBJECT (preview), "piArgs", argp);
g_object_set_data (G_OBJECT (preview), "piArgs", argp);
nlfilt_do_preview (preview);
frame = gimp_radio_group_new2 (TRUE, _("Filter"),
@ -421,18 +421,18 @@ pluginCoreIA (struct piArgs *argp)
argp->alpha, 0.0, 1.0, 0.05, 0.1, 2,
TRUE, 0, 0,
NULL, NULL);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (nlfilt_double_adjustment_update),
&argp->alpha);
g_signal_connect (G_OBJECT (adj), "value_changed",
G_CALLBACK (nlfilt_double_adjustment_update),
&argp->alpha);
adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 1,
_("Radius:"), 0, 0,
argp->radius, 1.0 / 3.0, 1.0, 0.05, 0.1, 2,
TRUE, 0, 0,
NULL, NULL);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (nlfilt_double_adjustment_update),
&argp->radius);
g_signal_connect (G_OBJECT (adj), "value_changed",
G_CALLBACK (nlfilt_double_adjustment_update),
&argp->radius);
gtk_widget_show (table);
@ -471,7 +471,7 @@ nlfilt_do_preview (GtkWidget *w)
theWidget = w;
}
ap = gtk_object_get_data (GTK_OBJECT (theWidget), "piArgs");
ap = g_object_get_data (G_OBJECT (theWidget), "piArgs");
rowsize = thePreview->width * thePreview->bpp;
filtno = nlfiltInit (ap->alpha, ap->radius, ap->filter);
@ -491,8 +491,7 @@ nlfilt_do_preview (GtkWidget *w)
src0 = src1; src1 = src2; src2 += rowsize;
}
gtk_widget_draw (theWidget, NULL);
gdk_flush ();
gtk_widget_queue_draw (theWidget);
g_free (dst);
}
@ -595,12 +594,13 @@ mw_preview_new (GtkWidget *parent,
button = gtk_check_button_new_with_label (_("Do Preview"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), do_preview);
gtk_signal_connect (GTK_OBJECT (button), "toggled",
GTK_SIGNAL_FUNC (mw_preview_toggle_callback),
&do_preview);
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
gtk_widget_show (button);
g_signal_connect (G_OBJECT (button), "toggled",
G_CALLBACK (mw_preview_toggle_callback),
&do_preview);
return preview;
}

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

@ -67,16 +67,17 @@ typedef struct
/* Declare local functions.
*/
static void query (void);
static void run (gchar *name,
gint nparams,
GimpParam *param,
gint *nreturn_vals,
GimpParam **return_vals);
static void run (gchar *name,
gint nparams,
GimpParam *param,
gint *nreturn_vals,
GimpParam **return_vals);
static void noisify (GimpDrawable *drawable, gboolean preview_mode);
static void noisify (GimpDrawable *drawable,
gboolean preview_mode);
static gdouble gauss (void);
static void fill_preview (GtkWidget *preview_widget,
static void fill_preview (GtkWidget *preview_widget,
GimpDrawable *drawable);
static GtkWidget *preview_widget (GimpDrawable *drawable);
@ -145,23 +146,23 @@ query (void)
}
static void
run (gchar *name,
gint nparams,
run (gchar *name,
gint nparams,
GimpParam *param,
gint *nreturn_vals,
gint *nreturn_vals,
GimpParam **return_vals)
{
static GimpParam values[1];
GimpDrawable *drawable;
GimpRunMode run_mode;
GimpPDBStatusType status = GIMP_PDB_SUCCESS;
static GimpParam values[1];
GimpDrawable *drawable;
GimpRunMode run_mode;
GimpPDBStatusType status = GIMP_PDB_SUCCESS;
run_mode = param[0].data.d_int32;
*nreturn_vals = 1;
*return_vals = values;
*return_vals = values;
values[0].type = GIMP_PDB_STATUS;
values[0].type = GIMP_PDB_STATUS;
values[0].data.d_status = status;
/* Get the specified drawable */
@ -492,9 +493,9 @@ noisify_dialog (GimpDrawable *drawable,
NULL);
gtk_signal_connect (GTK_OBJECT (dlg), "destroy",
GTK_SIGNAL_FUNC (gtk_main_quit),
NULL);
g_signal_connect (G_OBJECT (dlg), "destroy",
G_CALLBACK (gtk_main_quit),
NULL);
main_vbox = gtk_vbox_new (FALSE, 2);
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 0);
@ -534,12 +535,13 @@ noisify_dialog (GimpDrawable *drawable,
toggle = gtk_check_button_new_with_label (_("Independent"));
gtk_table_attach (GTK_TABLE (table), toggle, 0, 3, 0, 1, GTK_FILL, 0, 0, 0);
gtk_signal_connect (GTK_OBJECT (toggle), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update),
&nvals.independent);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), nvals.independent);
gtk_widget_show (toggle);
g_signal_connect (G_OBJECT (toggle), "toggled",
G_CALLBACK (gimp_toggle_button_update),
&nvals.independent);
noise_int.channels = channels;
if (channels == 1)
@ -550,10 +552,12 @@ noisify_dialog (GimpDrawable *drawable,
TRUE, 0, 0,
NULL, NULL);
gtk_object_set_data (GTK_OBJECT (adj), "drawable", drawable);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (noisify_double_adjustment_update),
&nvals.noise[0]);
g_object_set_data (G_OBJECT (adj), "drawable", drawable);
g_signal_connect (G_OBJECT (adj), "value_changed",
G_CALLBACK (noisify_double_adjustment_update),
&nvals.noise[0]);
noise_int.channel_adj[0] = adj;
}
else if (channels == 2)
@ -563,10 +567,13 @@ noisify_dialog (GimpDrawable *drawable,
nvals.noise[0], 0.0, 1.0, 0.01, 0.1, 2,
TRUE, 0, 0,
NULL, NULL);
gtk_object_set_data (GTK_OBJECT (adj), "drawable", drawable);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (noisify_double_adjustment_update),
&nvals.noise[0]);
g_object_set_data (G_OBJECT (adj), "drawable", drawable);
g_signal_connect (G_OBJECT (adj), "value_changed",
G_CALLBACK (noisify_double_adjustment_update),
&nvals.noise[0]);
noise_int.channel_adj[0] = adj;
adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 2,
@ -574,10 +581,13 @@ noisify_dialog (GimpDrawable *drawable,
nvals.noise[1], 0.0, 1.0, 0.01, 0.1, 2,
TRUE, 0, 0,
NULL, NULL);
gtk_object_set_data (GTK_OBJECT (adj), "drawable", drawable);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (noisify_double_adjustment_update),
&nvals.noise[1]);
g_object_set_data (G_OBJECT (adj), "drawable", drawable);
g_signal_connect (G_OBJECT (adj), "value_changed",
G_CALLBACK (noisify_double_adjustment_update),
&nvals.noise[1]);
noise_int.channel_adj[1] = adj;
}
@ -588,10 +598,13 @@ noisify_dialog (GimpDrawable *drawable,
nvals.noise[0], 0.0, 1.0, 0.01, 0.1, 2,
TRUE, 0, 0,
NULL, NULL);
gtk_object_set_data (GTK_OBJECT (adj), "drawable", drawable);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (noisify_double_adjustment_update),
&nvals.noise[0]);
g_object_set_data (G_OBJECT (adj), "drawable", drawable);
g_signal_connect (G_OBJECT (adj), "value_changed",
G_CALLBACK (noisify_double_adjustment_update),
&nvals.noise[0]);
noise_int.channel_adj[0] = adj;
adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 2,
@ -599,10 +612,13 @@ noisify_dialog (GimpDrawable *drawable,
nvals.noise[1], 0.0, 1.0, 0.01, 0.1, 2,
TRUE, 0, 0,
NULL, NULL);
gtk_object_set_data (GTK_OBJECT (adj), "drawable", drawable);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (noisify_double_adjustment_update),
&nvals.noise[1]);
g_object_set_data (G_OBJECT (adj), "drawable", drawable);
g_signal_connect (G_OBJECT (adj), "value_changed",
G_CALLBACK (noisify_double_adjustment_update),
&nvals.noise[1]);
noise_int.channel_adj[1] = adj;
adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 3,
@ -610,10 +626,13 @@ noisify_dialog (GimpDrawable *drawable,
nvals.noise[2], 0.0, 1.0, 0.01, 0.1, 2,
TRUE, 0, 0,
NULL, NULL);
gtk_object_set_data (GTK_OBJECT (adj), "drawable", drawable);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (noisify_double_adjustment_update),
&nvals.noise[2]);
g_object_set_data (G_OBJECT (adj), "drawable", drawable);
g_signal_connect (G_OBJECT (adj), "value_changed",
G_CALLBACK (noisify_double_adjustment_update),
&nvals.noise[2]);
noise_int.channel_adj[2] = adj;
}
@ -624,10 +643,13 @@ noisify_dialog (GimpDrawable *drawable,
nvals.noise[0], 0.0, 1.0, 0.01, 0.1, 2,
TRUE, 0, 0,
NULL, NULL);
gtk_object_set_data (GTK_OBJECT (adj), "drawable", drawable);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (noisify_double_adjustment_update),
&nvals.noise[0]);
g_object_set_data (G_OBJECT (adj), "drawable", drawable);
g_signal_connect (G_OBJECT (adj), "value_changed",
G_CALLBACK (noisify_double_adjustment_update),
&nvals.noise[0]);
noise_int.channel_adj[0] = adj;
adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 2,
@ -635,10 +657,13 @@ noisify_dialog (GimpDrawable *drawable,
nvals.noise[1], 0.0, 1.0, 0.01, 0.1, 2,
TRUE, 0, 0,
NULL, NULL);
gtk_object_set_data (GTK_OBJECT (adj), "drawable", drawable);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (noisify_double_adjustment_update),
&nvals.noise[1]);
g_object_set_data (G_OBJECT (adj), "drawable", drawable);
g_signal_connect (G_OBJECT (adj), "value_changed",
G_CALLBACK (noisify_double_adjustment_update),
&nvals.noise[1]);
noise_int.channel_adj[1] = adj;
adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 3,
@ -646,10 +671,13 @@ noisify_dialog (GimpDrawable *drawable,
nvals.noise[2], 0.0, 1.0, 0.01, 0.1, 2,
TRUE, 0, 0,
NULL, NULL);
gtk_object_set_data (GTK_OBJECT (adj), "drawable", drawable);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (noisify_double_adjustment_update),
&nvals.noise[2]);
g_object_set_data (G_OBJECT (adj), "drawable", drawable);
g_signal_connect (G_OBJECT (adj), "value_changed",
G_CALLBACK (noisify_double_adjustment_update),
&nvals.noise[2]);
noise_int.channel_adj[2] = adj;
adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 4,
@ -657,10 +685,13 @@ noisify_dialog (GimpDrawable *drawable,
nvals.noise[3], 0.0, 1.0, 0.01, 0.1, 2,
TRUE, 0, 0,
NULL, NULL);
gtk_object_set_data (GTK_OBJECT (adj), "drawable", drawable);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (noisify_double_adjustment_update),
&nvals.noise[3]);
g_object_set_data (G_OBJECT (adj), "drawable", drawable);
g_signal_connect (G_OBJECT (adj), "value_changed",
G_CALLBACK (noisify_double_adjustment_update),
&nvals.noise[3]);
noise_int.channel_adj[3] = adj;
}
else
@ -674,10 +705,13 @@ noisify_dialog (GimpDrawable *drawable,
nvals.noise[i], 0.0, 1.0, 0.01, 0.1, 2,
TRUE, 0, 0,
NULL, NULL);
gtk_object_set_data (GTK_OBJECT (adj), "drawable", drawable);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (noisify_double_adjustment_update),
&nvals.noise[i]);
g_object_set_data (G_OBJECT (adj), "drawable", drawable);
g_signal_connect (G_OBJECT (adj), "value_changed",
G_CALLBACK (noisify_double_adjustment_update),
&nvals.noise[i]);
noise_int.channel_adj[i] = adj;
g_free (buffer);
@ -731,7 +765,9 @@ noisify_double_adjustment_update (GtkAdjustment *adjustment,
GimpDrawable *drawable;
gimp_double_adjustment_update (adjustment, data);
drawable = gtk_object_get_data (GTK_OBJECT (adjustment), "drawable");
drawable = g_object_get_data (G_OBJECT (adjustment), "drawable");
noisify (drawable, TRUE);
if (! nvals.independent)

120
plug-ins/common/nova.c
View File

@ -241,7 +241,7 @@ run (gchar *name,
{
static GimpParam values[1];
GimpDrawable *drawable;
GimpRunMode run_mode;
GimpRunMode run_mode;
GimpPDBStatusType status = GIMP_PDB_SUCCESS;
INIT_I18N_UI();
@ -249,9 +249,9 @@ run (gchar *name,
run_mode = param[0].data.d_int32;
*nreturn_vals = 1;
*return_vals = values;
*return_vals = values;
values[0].type = GIMP_PDB_STATUS;
values[0].type = GIMP_PDB_STATUS;
values[0].data.d_status = status;
/* Get the specified drawable */
@ -487,9 +487,9 @@ nova_dialog (GimpDrawable *drawable)
NULL);
gtk_signal_connect (GTK_OBJECT (dlg), "destroy",
GTK_SIGNAL_FUNC (gtk_main_quit),
NULL);
g_signal_connect (G_OBJECT (dlg), "destroy",
G_CALLBACK (gtk_main_quit),
NULL);
/* parameter settings */
frame = gtk_frame_new (_("Parameter Settings"));
@ -510,51 +510,52 @@ nova_dialog (GimpDrawable *drawable)
button = gimp_color_button_new (_("SuperNova Color Picker"),
SCALE_WIDTH - 8, 16,
&pvals.color, GIMP_COLOR_AREA_FLAT);
gtk_signal_connect (GTK_OBJECT (button), "color_changed",
GTK_SIGNAL_FUNC (gimp_color_button_get_color),
&pvals.color);
gtk_signal_connect_object (GTK_OBJECT (button), "color_changed",
GTK_SIGNAL_FUNC (nova),
(gpointer)drawable);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 2,
_("Color:"), 1.0, 0.5,
button, 1, TRUE);
g_signal_connect (G_OBJECT (button), "color_changed",
G_CALLBACK (gimp_color_button_get_color),
&pvals.color);
g_signal_connect_swapped (G_OBJECT (button), "color_changed",
G_CALLBACK (nova),
drawable);
adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 3,
_("Radius:"), SCALE_WIDTH, 0,
pvals.radius, 1, 100, 1, 10, 0,
FALSE, 1, GIMP_MAX_IMAGE_SIZE,
NULL, NULL);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (gimp_int_adjustment_update),
&pvals.radius);
gtk_signal_connect_object (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (nova),
(gpointer)drawable);
g_signal_connect (G_OBJECT (adj), "value_changed",
G_CALLBACK (gimp_int_adjustment_update),
&pvals.radius);
g_signal_connect_swapped (G_OBJECT (adj), "value_changed",
G_CALLBACK (nova),
drawable);
adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 4,
_("Spokes:"), SCALE_WIDTH, 0,
pvals.nspoke, 1, 1024, 1, 16, 0,
TRUE, 0, 0,
NULL, NULL);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (gimp_int_adjustment_update),
&pvals.nspoke);
gtk_signal_connect_object (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (nova),
(gpointer)drawable);
g_signal_connect (G_OBJECT (adj), "value_changed",
G_CALLBACK (gimp_int_adjustment_update),
&pvals.nspoke);
g_signal_connect_swapped (G_OBJECT (adj), "value_changed",
G_CALLBACK (nova),
drawable);
adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 5,
_("Random Hue:"), SCALE_WIDTH, 0,
pvals.randomhue, 0, 360, 1, 15, 0,
TRUE, 0, 0,
NULL, NULL);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (gimp_int_adjustment_update),
&pvals.randomhue);
gtk_signal_connect_object (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (nova),
(gpointer)drawable);
g_signal_connect (G_OBJECT (adj), "value_changed",
G_CALLBACK (gimp_int_adjustment_update),
&pvals.randomhue);
g_signal_connect_swapped (G_OBJECT (adj), "value_changed",
G_CALLBACK (nova),
drawable);
gtk_widget_show (frame);
gtk_widget_show (table);
@ -614,12 +615,13 @@ nova_center_create (GimpDrawable *drawable)
center->in_call = TRUE; /* to avoid side effects while initialization */
frame = gtk_frame_new (_("Center of SuperNova"));
gtk_signal_connect (GTK_OBJECT (frame), "destroy",
GTK_SIGNAL_FUNC (nova_center_destroy),
center);
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN);
gtk_container_set_border_width (GTK_CONTAINER (frame), 4);
g_signal_connect (G_OBJECT (frame), "destroy",
G_CALLBACK (nova_center_destroy),
center);
table = gtk_table_new (3, 4, FALSE);
gtk_table_set_row_spacings (GTK_TABLE (table), 4);
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
@ -637,14 +639,16 @@ nova_center_create (GimpDrawable *drawable)
gimp_spin_button_new (&center->xadj,
pvals.xcenter, G_MININT, G_MAXINT,
1, 10, 10, 0, 0);
gtk_object_set_user_data (GTK_OBJECT (center->xadj), center);
gtk_signal_connect (GTK_OBJECT (center->xadj), "value_changed",
GTK_SIGNAL_FUNC (nova_center_adjustment_update),
&pvals.xcenter);
gtk_table_attach (GTK_TABLE (table), spinbutton, 1, 2, 0, 1,
GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (spinbutton);
g_object_set_data (G_OBJECT (center->xadj), "center", center);
g_signal_connect (G_OBJECT (center->xadj), "value_changed",
G_CALLBACK (nova_center_adjustment_update),
&pvals.xcenter);
label = gtk_label_new (_("Y:"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
gtk_table_attach (GTK_TABLE (table), label, 2, 3, 0, 1,
@ -655,14 +659,16 @@ nova_center_create (GimpDrawable *drawable)
gimp_spin_button_new (&center->yadj,
pvals.ycenter, G_MININT, G_MAXINT,
1, 10, 10, 0, 0);
gtk_object_set_user_data (GTK_OBJECT (center->yadj), center);
gtk_signal_connect (GTK_OBJECT (center->yadj), "value_changed",
GTK_SIGNAL_FUNC (nova_center_adjustment_update),
&pvals.ycenter);
gtk_table_attach (GTK_TABLE (table), spinbutton, 3, 4, 0, 1,
GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (spinbutton);
g_object_set_data (G_OBJECT (center->yadj), "center", center);
g_signal_connect (G_OBJECT (center->yadj), "value_changed",
G_CALLBACK (nova_center_adjustment_update),
&pvals.ycenter);
/* frame that contains preview */
pframe = gtk_frame_new (NULL);
gtk_frame_set_shadow_type (GTK_FRAME (pframe), GTK_SHADOW_IN);
@ -672,31 +678,35 @@ nova_center_create (GimpDrawable *drawable)
/* PREVIEW */
preview = preview_widget (center->drawable);
gtk_widget_set_events (GTK_WIDGET (preview), PREVIEW_MASK);
gtk_signal_connect_after (GTK_OBJECT (preview), "expose_event",
GTK_SIGNAL_FUNC (nova_center_preview_expose),
center);
gtk_signal_connect (GTK_OBJECT (preview), "event",
GTK_SIGNAL_FUNC (nova_center_preview_events),
center);
gtk_container_add (GTK_CONTAINER (pframe), preview);
gtk_widget_show (preview);
g_signal_connect_after (G_OBJECT (preview), "expose_event",
G_CALLBACK (nova_center_preview_expose),
center);
g_signal_connect (G_OBJECT (preview), "event",
G_CALLBACK (nova_center_preview_events),
center);
gtk_widget_show (pframe);
gtk_widget_show (table);
gtk_object_set_user_data (GTK_OBJECT (frame), center);
g_object_set_data (G_OBJECT (frame), "center", center);
gtk_widget_show (frame);
check = gtk_check_button_new_with_label (_("Show Cursor"));
gtk_table_attach (GTK_TABLE (table), check, 0, 4, 2, 3,
GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), show_cursor);
gtk_signal_connect (GTK_OBJECT (check), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update),
&show_cursor);
gtk_signal_connect_object (GTK_OBJECT (check), "toggled",
GTK_SIGNAL_FUNC (nova),
(gpointer)drawable);
gtk_widget_show (check);
g_signal_connect (G_OBJECT (check), "toggled",
G_CALLBACK (gimp_toggle_button_update),
&show_cursor);
g_signal_connect_swapped (G_OBJECT (check), "toggled",
G_CALLBACK (nova),
drawable);
nova_center_cursor_update (center);
@ -785,7 +795,7 @@ nova_center_adjustment_update (GtkAdjustment *adjustment,
gimp_int_adjustment_update (adjustment, data);
center = gtk_object_get_user_data (GTK_OBJECT (adjustment));
center = g_object_get_data (G_OBJECT (adjustment), "center");
if (!center->in_call)
{

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

@ -58,11 +58,11 @@ typedef struct
/* Declare local functions.
*/
static void query (void);
static void run (gchar *name,
gint nparams,
GimpParam *param,
gint *nreturn_vals,
GimpParam **return_vals);
static void run (gchar *name,
gint nparams,
GimpParam *param,
gint *nreturn_vals,
GimpParam **return_vals);
static void oilify_rgb (GimpDrawable *drawable);
static void oilify_intensity (GimpDrawable *drawable);
@ -123,25 +123,25 @@ query (void)
}
static void
run (gchar *name,
gint nparams,
run (gchar *name,
gint nparams,
GimpParam *param,
gint *nreturn_vals,
gint *nreturn_vals,
GimpParam **return_vals)
{
static GimpParam values[1];
GimpDrawable *drawable;
GimpRunMode run_mode;
GimpPDBStatusType status = GIMP_PDB_SUCCESS;
static GimpParam values[1];
GimpDrawable *drawable;
GimpRunMode run_mode;
GimpPDBStatusType status = GIMP_PDB_SUCCESS;
INIT_I18N_UI();
run_mode = param[0].data.d_int32;
*nreturn_vals = 2;
*return_vals = values;
*return_vals = values;
values[0].type = GIMP_PDB_STATUS;
values[0].type = GIMP_PDB_STATUS;
values[0].data.d_status = status;
switch (run_mode)
@ -461,9 +461,9 @@ oilify_dialog (void)
NULL);
gtk_signal_connect (GTK_OBJECT (dlg), "destroy",
GTK_SIGNAL_FUNC (gtk_main_quit),
NULL);
g_signal_connect (G_OBJECT (dlg), "destroy",
G_CALLBACK (gtk_main_quit),
NULL);
/* parameter settings */
frame = gtk_frame_new (_("Parameter Settings"));
@ -479,20 +479,21 @@ oilify_dialog (void)
toggle = gtk_check_button_new_with_label (_("Use Intensity Algorithm"));
gtk_table_attach (GTK_TABLE (table), toggle, 0, 3, 0, 1, GTK_FILL, 0, 0, 0);
gtk_signal_connect (GTK_OBJECT (toggle), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update),
&ovals.mode);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), ovals.mode);
gtk_widget_show (toggle);
g_signal_connect (G_OBJECT (toggle), "toggled",
G_CALLBACK (gimp_toggle_button_update),
&ovals.mode);
adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 1,
_("Mask Size:"), SCALE_WIDTH, 0,
ovals.mask_size, 3.0, 50.0, 1.0, 5.0, 0,
TRUE, 0, 0,
NULL, NULL);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&ovals.mask_size);
g_signal_connect (G_OBJECT (adj), "value_changed",
G_CALLBACK (gimp_double_adjustment_update),
&ovals.mask_size);
gtk_widget_show (frame);
gtk_widget_show (table);

59
plug-ins/common/papertile.c
View File

@ -254,9 +254,9 @@ open_dialog (void)
NULL);
gtk_signal_connect (GTK_OBJECT (dialog), "destroy",
GTK_SIGNAL_FUNC (gtk_main_quit),
NULL);
g_signal_connect (G_OBJECT (dialog), "destroy",
G_CALLBACK (gtk_main_quit),
NULL);
main_hbox = gtk_hbox_new (FALSE, 5);
gtk_container_set_border_width (GTK_CONTAINER (main_hbox), 6);
@ -284,18 +284,18 @@ open_dialog (void)
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("X:"), 1.0, 0.5,
button, 1, TRUE);
gtk_signal_connect (GTK_OBJECT (w.division_x_adj), "value_changed",
GTK_SIGNAL_FUNC (division_x_adj_changed),
NULL);
g_signal_connect (G_OBJECT (w.division_x_adj), "value_changed",
G_CALLBACK (division_x_adj_changed),
NULL);
button = gimp_spin_button_new (&w.division_y_adj, p.params.division_y,
1.0, p.drawable->width, 1.0, 5.0, 0, 1, 0);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Y:"), 1.0, 0.5,
button, 1, TRUE);
gtk_signal_connect (GTK_OBJECT (w.division_y_adj), "value_changed",
GTK_SIGNAL_FUNC (division_y_adj_changed),
NULL);
g_signal_connect (G_OBJECT (w.division_y_adj), "value_changed",
G_CALLBACK (division_y_adj_changed),
NULL);
button = gimp_spin_button_new (&w.tile_size_adj, p.params.tile_size,
1.0, MAX (p.drawable->width,
@ -304,9 +304,9 @@ open_dialog (void)
gimp_table_attach_aligned (GTK_TABLE (table), 0, 2,
_("Size:"), 1.0, 0.5,
button, 1, TRUE);
gtk_signal_connect (GTK_OBJECT (w.tile_size_adj), "value_changed",
GTK_SIGNAL_FUNC (tile_size_adj_changed),
NULL);
g_signal_connect (G_OBJECT (w.tile_size_adj), "value_changed",
G_CALLBACK (tile_size_adj_changed),
NULL);
frame = gimp_radio_group_new2 (TRUE, _("Fractional Pixels"),
G_CALLBACK (gimp_radio_button_update),
@ -333,11 +333,12 @@ open_dialog (void)
button = gtk_check_button_new_with_label(_("Centering"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), p.params.centering);
gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (button), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update),
&p.params.centering);
gtk_widget_show (button);
g_signal_connect (G_OBJECT (button), "toggled",
G_CALLBACK (gimp_toggle_button_update),
&p.params.centering);
/* Right */
vbox = gtk_vbox_new (FALSE, 4);
gtk_box_pack_start (GTK_BOX (main_hbox), vbox, FALSE, FALSE, 0);
@ -359,19 +360,20 @@ open_dialog (void)
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Max (%):"), 1.0, 0.5,
button, 1, TRUE);
gtk_signal_connect (GTK_OBJECT (adjustment), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&p.params.move_max_rate);
g_signal_connect (G_OBJECT (adjustment), "value_changed",
G_CALLBACK (gimp_double_adjustment_update),
&p.params.move_max_rate);
button = gtk_check_button_new_with_label (_("Wrap Around"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button),
p.params.wrap_around);
gtk_table_attach_defaults (GTK_TABLE (table), button, 0, 2, 1, 2);
gtk_signal_connect (GTK_OBJECT (button), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update),
&p.params.wrap_around);
gtk_widget_show (button);
g_signal_connect (G_OBJECT (button), "toggled",
G_CALLBACK (gimp_toggle_button_update),
&p.params.wrap_around);
frame = gimp_radio_group_new2 (TRUE, _("Background Type"),
G_CALLBACK (gimp_radio_button_update),
&p.params.background_type,
@ -399,15 +401,16 @@ open_dialog (void)
p.drawable_has_alpha ?
GIMP_COLOR_AREA_SMALL_CHECKS :
GIMP_COLOR_AREA_FLAT);
gtk_signal_connect (GTK_OBJECT (color_button), "color_changed",
GTK_SIGNAL_FUNC (gimp_color_button_get_color),
&p.params.background_color);
gtk_container_add (GTK_CONTAINER (button), color_button);
gtk_widget_show (color_button);
gtk_widget_set_sensitive (color_button,
p.params.background_type == BACKGROUND_TYPE_COLOR);
gtk_object_set_data (GTK_OBJECT (button), "set_sensitive", color_button);
g_object_set_data (G_OBJECT (button), "set_sensitive", color_button);
g_signal_connect (G_OBJECT (color_button), "color_changed",
G_CALLBACK (gimp_color_button_get_color),
&p.params.background_color);
gtk_widget_show (dialog);
@ -849,10 +852,10 @@ plugin_query (void)
}
static void
plugin_run (gchar *name,
gint numof_params,
plugin_run (gchar *name,
gint numof_params,
GimpParam *params,
gint *numof_return_vals,
gint *numof_return_vals,
GimpParam **return_vals)
{
GimpPDBStatusType status;

15
plug-ins/common/pat.c
View File

@ -142,7 +142,7 @@ run (gchar *name,
GimpParam **return_vals)
{
static GimpParam values[2];
GimpRunMode run_mode;
GimpRunMode run_mode;
GimpPDBStatusType status = GIMP_PDB_SUCCESS;
gint32 image_ID;
gint32 drawable_ID;
@ -456,9 +456,9 @@ save_dialog (void)
NULL);
gtk_signal_connect (GTK_OBJECT (dlg), "destroy",
GTK_SIGNAL_FUNC (gtk_main_quit),
NULL);
g_signal_connect (G_OBJECT (dlg), "destroy",
G_CALLBACK (gtk_main_quit),
NULL);
/* The main table */
table = gtk_table_new (1, 2, FALSE);
@ -474,11 +474,12 @@ save_dialog (void)
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Description:"), 1.0, 0.5,
entry, 1, FALSE);
gtk_signal_connect (GTK_OBJECT (entry), "changed",
GTK_SIGNAL_FUNC (entry_callback),
description);
gtk_widget_show (entry);
g_signal_connect (G_OBJECT (entry), "changed",
G_CALLBACK (entry_callback),
description);
gtk_widget_show (dlg);
gtk_main ();

8
plug-ins/common/pixelize.c
View File

@ -207,7 +207,7 @@ run (gchar *name,
{
static GimpParam values[1];
GimpDrawable *drawable;
GimpRunMode run_mode;
GimpRunMode run_mode;
GimpPDBStatusType status = GIMP_PDB_SUCCESS;
run_mode = param[0].data.d_int32;
@ -330,9 +330,9 @@ pixelize_dialog (GimpDrawable *drawable)
NULL);
gtk_signal_connect (GTK_OBJECT (dlg), "destroy",
GTK_SIGNAL_FUNC (gtk_main_quit),
NULL);
g_signal_connect (G_OBJECT (dlg), "destroy",
G_CALLBACK (gtk_main_quit),
NULL);
/* parameter settings */
frame = gtk_frame_new (_("Parameter Settings"));

62
plug-ins/common/plasma.c
View File

@ -95,11 +95,11 @@ typedef struct
*/
static void query (void);
static void run (gchar *name,
gint nparams,
static void run (gchar *name,
gint nparams,
GimpParam *param,
gint *nreturn_vals,
GimpParam **return_vals);
gint *nreturn_vals,
GimpParam **return_vals);
static GtkWidget *preview_widget (void);
static gint plasma_dialog (GimpDrawable *drawable);
@ -194,23 +194,23 @@ query (void)
}
static void
run (gchar *name,
gint nparams,
run (gchar *name,
gint nparams,
GimpParam *param,
gint *nreturn_vals,
GimpParam **return_vals)
gint *nreturn_vals,
GimpParam **return_vals)
{
static GimpParam values[1];
GimpDrawable *drawable;
GimpRunMode run_mode;
GimpPDBStatusType status = GIMP_PDB_SUCCESS;
static GimpParam values[1];
GimpDrawable *drawable;
GimpRunMode run_mode;
GimpPDBStatusType status = GIMP_PDB_SUCCESS;
run_mode = param[0].data.d_int32;
*nreturn_vals = 1;
*return_vals = values;
*return_vals = values;
values[0].type = GIMP_PDB_STATUS;
values[0].type = GIMP_PDB_STATUS;
values[0].data.d_status = status;
/* Get the specified drawable */
@ -314,9 +314,9 @@ plasma_dialog (GimpDrawable *drawable)
NULL);
gtk_signal_connect (GTK_OBJECT (dlg), "destroy",
GTK_SIGNAL_FUNC (gtk_main_quit),
NULL);
g_signal_connect (G_OBJECT (dlg), "destroy",
G_CALLBACK (gtk_main_quit),
NULL);
gimp_help_init ();
@ -361,14 +361,14 @@ plasma_dialog (GimpDrawable *drawable)
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Random Seed:"), 1.0, 0.5,
seed, 1, TRUE);
gtk_signal_connect_object (GTK_OBJECT (GIMP_RANDOM_SEED_SPINBUTTON_ADJ (seed)),
"value_changed",
GTK_SIGNAL_FUNC (plasma),
(gpointer)drawable);
gtk_signal_connect_object (GTK_OBJECT (GIMP_RANDOM_SEED_TOGGLEBUTTON (seed)),
"toggled",
GTK_SIGNAL_FUNC (plasma),
(gpointer)drawable);
g_signal_connect_swapped (G_OBJECT (GIMP_RANDOM_SEED_SPINBUTTON_ADJ (seed)),
"value_changed",
G_CALLBACK (plasma),
drawable);
g_signal_connect_swapped (G_OBJECT (GIMP_RANDOM_SEED_TOGGLEBUTTON (seed)),
"toggled",
G_CALLBACK (plasma),
drawable);
adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 1,
_("Turbulence:"), SCALE_WIDTH, 0,
@ -376,12 +376,12 @@ plasma_dialog (GimpDrawable *drawable)
0.1, 7.0, 0.1, 1.0, 1,
TRUE, 0, 0,
NULL, NULL);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&pvals.turbulence);
gtk_signal_connect_object (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (plasma),
(gpointer)drawable);
g_signal_connect (G_OBJECT (adj), "value_changed",
G_CALLBACK (gimp_double_adjustment_update),
&pvals.turbulence);
g_signal_connect_swapped (G_OBJECT (adj), "value_changed",
G_CALLBACK (plasma),
drawable);
gtk_widget_show (frame);
gtk_widget_show (table);

7
plug-ins/common/plugin-browser.c
View File

@ -28,8 +28,15 @@
#include <string.h>
#include <time.h>
#ifdef __GNUC__
#warning GTK_DISABLE_DEPRECATED
#endif
#undef GTK_DISABLE_DEPRECATED
#include <gtk/gtk.h>
#define GTK_DISABLE_DEPRECATED
#include <libgimp/gimp.h>
#include <libgimp/gimpui.h>

7
plug-ins/common/plugindetails.c
View File

@ -28,8 +28,15 @@
#include <string.h>
#include <time.h>
#ifdef __GNUC__
#warning GTK_DISABLE_DEPRECATED
#endif
#undef GTK_DISABLE_DEPRECATED
#include <gtk/gtk.h>
#define GTK_DISABLE_DEPRECATED
#include <libgimp/gimp.h>
#include <libgimp/gimpui.h>

106
plug-ins/common/png.c
View File

@ -86,25 +86,25 @@ typedef struct
*/
static void query (void);
static void run (gchar *name,
gint nparams,
GimpParam *param,
gint *nreturn_vals,
GimpParam **return_vals);
static void run (gchar *name,
gint nparams,
GimpParam *param,
gint *nreturn_vals,
GimpParam **return_vals);
static gint32 load_image (gchar *filename);
static gint save_image (gchar *filename,
gint32 image_ID,
gint32 drawable_ID,
gint32 orig_image_ID);
static gint32 load_image (gchar *filename);
static gint save_image (gchar *filename,
gint32 image_ID,
gint32 drawable_ID,
gint32 orig_image_ID);
static void respin_cmap (png_structp pp,
png_infop info,
gint32 image_ID);
static void respin_cmap (png_structp pp,
png_infop info,
gint32 image_ID);
static gint save_dialog (void);
static void save_ok_callback (GtkWidget *widget,
gpointer data);
static void save_ok_callback (GtkWidget *widget,
gpointer data);
/*
@ -208,22 +208,23 @@ query (void)
*/
static void
run (gchar *name,
gint nparams,
run (gchar *name,
gint nparams,
GimpParam *param,
gint *nreturn_vals,
gint *nreturn_vals,
GimpParam **return_vals)
{
static GimpParam values[2];
GimpRunMode run_mode;
GimpPDBStatusType status = GIMP_PDB_SUCCESS;
gint32 image_ID;
gint32 drawable_ID;
gint32 orig_image_ID;
static GimpParam values[2];
GimpRunMode run_mode;
GimpPDBStatusType status = GIMP_PDB_SUCCESS;
gint32 image_ID;
gint32 drawable_ID;
gint32 orig_image_ID;
GimpExportReturnType export = GIMP_EXPORT_CANCEL;
*nreturn_vals = 1;
*return_vals = values;
values[0].type = GIMP_PDB_STATUS;
values[0].data.d_status = GIMP_PDB_EXECUTION_ERROR;
@ -1053,9 +1054,9 @@ save_dialog (void)
NULL);
gtk_signal_connect (GTK_OBJECT (dlg), "destroy",
GTK_SIGNAL_FUNC (gtk_main_quit),
NULL);
g_signal_connect (G_OBJECT (dlg), "destroy",
G_CALLBACK (gtk_main_quit),
NULL);
frame = gtk_frame_new (_("Parameter Settings"));
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN);
@ -1073,60 +1074,66 @@ save_dialog (void)
toggle = gtk_check_button_new_with_label (_("Interlacing (Adam7)"));
gtk_table_attach (GTK_TABLE (table), toggle, 0, 2, 0, 1,
GTK_FILL, 0, 0, 0);
gtk_signal_connect (GTK_OBJECT (toggle), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update),
&pngvals.interlaced);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), pngvals.interlaced);
gtk_widget_show (toggle);
#
g_signal_connect (G_OBJECT (toggle), "toggled",
G_CALLBACK (gimp_toggle_button_update),
&pngvals.interlaced);
toggle = gtk_check_button_new_with_label (_("Save background color"));
gtk_table_attach (GTK_TABLE (table), toggle, 0, 2, 1, 2,
GTK_FILL, 0, 0, 0);
gtk_signal_connect (GTK_OBJECT (toggle), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update),
&pngvals.bkgd);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), pngvals.bkgd);
gtk_widget_show (toggle);
g_signal_connect (G_OBJECT (toggle), "toggled",
G_CALLBACK (gimp_toggle_button_update),
&pngvals.bkgd);
toggle = gtk_check_button_new_with_label (_("Save gamma"));
gtk_table_attach (GTK_TABLE (table), toggle, 0, 2, 2, 3,
GTK_FILL, 0, 0, 0);
gtk_signal_connect (GTK_OBJECT (toggle), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update),
&pngvals.gama);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), pngvals.gama);
gtk_widget_show (toggle);
g_signal_connect (G_OBJECT (toggle), "toggled",
G_CALLBACK (gimp_toggle_button_update),
&pngvals.gama);
toggle = gtk_check_button_new_with_label (_("Save layer offset"));
gtk_table_attach (GTK_TABLE (table), toggle, 0, 2, 3, 4,
GTK_FILL, 0, 0, 0);
gtk_signal_connect (GTK_OBJECT (toggle), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update),
&pngvals.offs);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), pngvals.offs);
gtk_widget_show (toggle);
g_signal_connect (G_OBJECT (toggle), "toggled",
G_CALLBACK (gimp_toggle_button_update),
&pngvals.offs);
toggle = gtk_check_button_new_with_label (_("Save resolution"));
gtk_table_attach (GTK_TABLE (table), toggle, 0, 2, 4, 5,
GTK_FILL, 0, 0, 0);
gtk_signal_connect (GTK_OBJECT (toggle), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update),
&pngvals.phys);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), pngvals.phys);
gtk_widget_show (toggle);
g_signal_connect (G_OBJECT (toggle), "toggled",
G_CALLBACK (gimp_toggle_button_update),
&pngvals.phys);
toggle = gtk_check_button_new_with_label (_("Save creation time"));
gtk_table_attach (GTK_TABLE (table), toggle, 0, 2, 5, 6,
GTK_FILL, 0, 0, 0);
gtk_signal_connect (GTK_OBJECT (toggle), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update),
&pngvals.time);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), pngvals.time);
gtk_widget_show (toggle);
g_signal_connect (G_OBJECT (toggle), "toggled",
G_CALLBACK (gimp_toggle_button_update),
&pngvals.time);
scale_data = gtk_adjustment_new (pngvals.compression_level,
1.0, 9.0, 1.0, 1.0, 0.0);
scale = gtk_hscale_new (GTK_ADJUSTMENT (scale_data));
scale = gtk_hscale_new (GTK_ADJUSTMENT (scale_data));
gtk_widget_set_size_request (scale, SCALE_WIDTH, -1);
gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP);
gtk_scale_set_digits (GTK_SCALE (scale), 0);
@ -1134,11 +1141,12 @@ save_dialog (void)
gimp_table_attach_aligned (GTK_TABLE (table), 0, 6,
_("Compression Level:"), 1.0, 1.0,
scale, 1, FALSE);
gtk_signal_connect (GTK_OBJECT (scale_data), "value_changed",
GTK_SIGNAL_FUNC (gimp_int_adjustment_update),
&pngvals.compression_level);
gtk_widget_show (scale);
g_signal_connect (G_OBJECT (scale_data), "value_changed",
G_CALLBACK (gimp_int_adjustment_update),
&pngvals.compression_level);
gtk_widget_show (dlg);
gtk_main ();

27
plug-ins/common/pnm.c
View File

@ -113,15 +113,15 @@ typedef struct
/* Declare some local functions.
*/
static void query (void);
static void run (gchar *name,
gint nparams,
static void run (gchar *name,
gint nparams,
GimpParam *param,
gint *nreturn_vals,
gint *nreturn_vals,
GimpParam **return_vals);
static gint32 load_image (gchar *filename);
static gint save_image (gchar *filename,
gint32 image_ID,
gint32 drawable_ID);
static gint32 load_image (gchar *filename);
static gint save_image (gchar *filename,
gint32 image_ID,
gint32 drawable_ID);
static gint save_dialog (void);
static void save_ok_callback (GtkWidget *widget,
@ -931,17 +931,18 @@ save_dialog (void)
NULL);
gtk_signal_connect (GTK_OBJECT (dlg), "destroy",
GTK_SIGNAL_FUNC (gtk_main_quit),
NULL);
g_signal_connect (G_OBJECT (dlg), "destroy",
G_CALLBACK (gtk_main_quit),
NULL);
/* file save type */
frame = gimp_radio_group_new2 (TRUE, _("Data Formatting"),
G_CALLBACK (gimp_radio_button_update),
&psvals.raw, (gpointer) psvals.raw,
&psvals.raw,
GINT_TO_POINTER (psvals.raw),
_("Raw"), (gpointer) TRUE, NULL,
_("Ascii"), (gpointer) FALSE, NULL,
_("Raw"), GINT_TO_POINTER (TRUE), NULL,
_("Ascii"), GINT_TO_POINTER (FALSE), NULL,
NULL);
gtk_container_set_border_width (GTK_CONTAINER (frame), 6);

45
plug-ins/common/polar.c
View File

@ -921,9 +921,9 @@ polarize_dialog (void)
NULL);
gtk_signal_connect (GTK_OBJECT (dialog), "destroy",
GTK_SIGNAL_FUNC (gtk_main_quit),
NULL);
g_signal_connect (G_OBJECT (dialog), "destroy",
G_CALLBACK (gtk_main_quit),
NULL);
/* Initialize Tooltips */
gimp_help_init ();
@ -975,18 +975,18 @@ polarize_dialog (void)
pcvals.circle, 0.0, 100.0, 1.0, 10.0, 2,
TRUE, 0, 0,
NULL, NULL);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (dialog_scale_update),
&pcvals.circle);
g_signal_connect (G_OBJECT (adj), "value_changed",
G_CALLBACK (dialog_scale_update),
&pcvals.circle);
adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 1,
_("Offset Angle:"), SCALE_WIDTH, 0,
pcvals.angle, 0.0, 359.0, 1.0, 15.0, 2,
TRUE, 0, 0,
NULL, NULL);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (dialog_scale_update),
&pcvals.angle);
g_signal_connect (G_OBJECT (adj), "value_changed",
G_CALLBACK (dialog_scale_update),
&pcvals.angle);
/* togglebuttons for backwards, top, polar->rectangular */
hbox = gtk_hbox_new (TRUE, 4);
@ -994,42 +994,48 @@ polarize_dialog (void)
toggle = gtk_check_button_new_with_label (_("Map Backwards"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), pcvals.backwards);
gtk_signal_connect (GTK_OBJECT (toggle), "toggled",
GTK_SIGNAL_FUNC (polar_toggle_callback),
&pcvals.backwards);
gtk_box_pack_start (GTK_BOX (hbox), toggle, TRUE, TRUE, 0);
gtk_widget_show (toggle);
gimp_help_set_help_data (toggle,
_("If checked the mapping will begin at the right "
"side, as opposed to beginning at the left."),
NULL);
g_signal_connect (G_OBJECT (toggle), "toggled",
G_CALLBACK (polar_toggle_callback),
&pcvals.backwards);
toggle = gtk_check_button_new_with_label (_("Map from Top"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), pcvals.inverse);
gtk_signal_connect (GTK_OBJECT (toggle), "toggled",
(GtkSignalFunc) polar_toggle_callback,
&pcvals.inverse);
gtk_box_pack_start (GTK_BOX (hbox), toggle, TRUE, TRUE, 0);
gtk_widget_show (toggle);
gimp_help_set_help_data (toggle,
_("If unchecked the mapping will put the bottom "
"row in the middle and the top row on the "
"outside. If checked it will be the opposite."),
NULL);
g_signal_connect (G_OBJECT (toggle), "toggled",
G_CALLBACK (polar_toggle_callback),
&pcvals.inverse);
toggle = gtk_check_button_new_with_label (_("To Polar"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), pcvals.polrec);
gtk_signal_connect (GTK_OBJECT (toggle), "toggled",
(GtkSignalFunc) polar_toggle_callback,
&pcvals.polrec);
gtk_box_pack_start (GTK_BOX (hbox), toggle, TRUE, TRUE, 0);
gtk_widget_show (toggle);
gimp_help_set_help_data (toggle,
_("If unchecked the image will be circularly "
"mapped onto a rectangle. If checked the image "
"will be mapped onto a circle."),
NULL);
g_signal_connect (G_OBJECT (toggle), "toggled",
G_CALLBACK (polar_toggle_callback),
&pcvals.polrec);
gtk_widget_show (hbox);
/* Done */
@ -1156,8 +1162,7 @@ dialog_update_preview (void)
p += preview_width * 3;
}
gtk_widget_draw (pcint.preview, NULL);
gdk_flush ();
gtk_widget_queue_draw (pcint.preview);
}
static void

138
plug-ins/common/postscript.c
View File

@ -2609,9 +2609,9 @@ load_dialog (void)
NULL);
gtk_signal_connect (GTK_OBJECT (dialog), "destroy",
GTK_SIGNAL_FUNC (gtk_main_quit),
NULL);
g_signal_connect (G_OBJECT (dialog), "destroy",
G_CALLBACK (gtk_main_quit),
NULL);
main_vbox = gtk_vbox_new (FALSE, 6);
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 6);
@ -2644,27 +2644,27 @@ load_dialog (void)
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Resolution:"), 1.0, 0.5,
spinbutton, 1, TRUE);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (gimp_int_adjustment_update),
&plvals.resolution);
g_signal_connect (G_OBJECT (adj), "value_changed",
G_CALLBACK (gimp_int_adjustment_update),
&plvals.resolution);
spinbutton = gimp_spin_button_new (&adj, plvals.width,
1, GIMP_MAX_IMAGE_SIZE, 1, 10, 0, 1, 0);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Width:"), 1.0, 0.5,
spinbutton, 1, TRUE);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (gimp_int_adjustment_update),
&plvals.width);
g_signal_connect (G_OBJECT (adj), "value_changed",
G_CALLBACK (gimp_int_adjustment_update),
&plvals.width);
spinbutton = gimp_spin_button_new (&adj, plvals.height,
1, GIMP_MAX_IMAGE_SIZE, 1, 10, 0, 1, 0);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 2,
_("Height:"), 1.0, 0.5,
spinbutton, 1, TRUE);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (gimp_int_adjustment_update),
&plvals.height);
g_signal_connect (G_OBJECT (adj), "value_changed",
G_CALLBACK (gimp_int_adjustment_update),
&plvals.height);
pages_entry = gtk_entry_new ();
gtk_widget_set_size_request (pages_entry, 80, -1);
@ -2672,18 +2672,19 @@ load_dialog (void)
gimp_table_attach_aligned (GTK_TABLE (table), 0, 3,
_("Pages:"), 1.0, 0.5,
pages_entry, 1, TRUE);
gtk_signal_connect (GTK_OBJECT (pages_entry), "changed",
GTK_SIGNAL_FUNC (load_pages_entry_callback),
NULL);
g_signal_connect (G_OBJECT (pages_entry), "changed",
G_CALLBACK (load_pages_entry_callback),
NULL);
toggle = gtk_check_button_new_with_label (_("Try Bounding Box"));
gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (toggle), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update),
&plvals.use_bbox);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), plvals.use_bbox);
gtk_widget_show (toggle);
g_signal_connect (G_OBJECT (toggle), "toggled",
G_CALLBACK (gimp_toggle_button_update),
&plvals.use_bbox);
gtk_widget_show (vbox);
gtk_widget_show (frame);
@ -2792,9 +2793,9 @@ save_dialog (void)
NULL);
gtk_signal_connect (GTK_OBJECT (dialog), "destroy",
GTK_SIGNAL_FUNC (gtk_main_quit),
NULL);
g_signal_connect (G_OBJECT (dialog), "destroy",
G_CALLBACK (gtk_main_quit),
NULL);
/* Main hbox */
hbox = gtk_hbox_new (FALSE, 6);
@ -2830,57 +2831,65 @@ save_dialog (void)
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Width:"), 1.0, 0.5,
spinbutton, 1, FALSE);
gtk_signal_connect (GTK_OBJECT (vals->adjustment[0]), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&psvals.width);
g_signal_connect (G_OBJECT (vals->adjustment[0]), "value_changed",
G_CALLBACK (gimp_double_adjustment_update),
&psvals.width);
spinbutton = gimp_spin_button_new (&vals->adjustment[1], psvals.height,
1e-5, GIMP_MAX_IMAGE_SIZE, 1, 10, 0, 1, 2);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Height:"), 1.0, 0.5,
spinbutton, 1, FALSE);
gtk_signal_connect (GTK_OBJECT (vals->adjustment[1]), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&psvals.height);
g_signal_connect (G_OBJECT (vals->adjustment[1]), "value_changed",
G_CALLBACK (gimp_double_adjustment_update),
&psvals.height);
spinbutton = gimp_spin_button_new (&vals->adjustment[2], psvals.x_offset,
1e-5, GIMP_MAX_IMAGE_SIZE, 1, 10, 0, 1, 2);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 2,
_("X-Offset:"), 1.0, 0.5,
spinbutton, 1, FALSE);
gtk_signal_connect (GTK_OBJECT (vals->adjustment[2]), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&psvals.x_offset);
g_signal_connect (G_OBJECT (vals->adjustment[2]), "value_changed",
G_CALLBACK (gimp_double_adjustment_update),
&psvals.x_offset);
spinbutton = gimp_spin_button_new (&vals->adjustment[3], psvals.y_offset,
1e-5, GIMP_MAX_IMAGE_SIZE, 1, 10, 0, 1, 2);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 3,
_("Y-Offset:"), 1.0, 0.5,
spinbutton, 1, FALSE);
gtk_signal_connect (GTK_OBJECT (vals->adjustment[3]), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&psvals.y_offset);
g_signal_connect (G_OBJECT (vals->adjustment[3]), "value_changed",
G_CALLBACK (gimp_double_adjustment_update),
&psvals.y_offset);
toggle = gtk_check_button_new_with_label (_("Keep Aspect Ratio"));
gimp_help_set_help_data (toggle, _("When toggled, the resulting image will be scaled to fit "
"into the given size without changing the aspect ratio."),
"#keep_aspect_ratio"),
gtk_box_pack_start (GTK_BOX (vbox), toggle, TRUE, TRUE, 0);
gtk_signal_connect (GTK_OBJECT (toggle), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update),
&psvals.keep_ratio);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), psvals.keep_ratio);
gtk_widget_show (toggle);
gimp_help_set_help_data (toggle,
_("When toggled, the resulting image will be scaled to fit "
"into the given size without changing the aspect ratio."),
"#keep_aspect_ratio"),
g_signal_connect (G_OBJECT (toggle), "toggled",
G_CALLBACK (gimp_toggle_button_update),
&psvals.keep_ratio);
/* Unit */
uframe = gimp_radio_group_new2 (TRUE, _("Unit"),
G_CALLBACK (save_unit_toggle_update),
vals, (gpointer) psvals.unit_mm,
vals,
GINT_TO_POINTER (psvals.unit_mm),
_("Inch"), (gpointer) FALSE, NULL,
_("Millimeter"), (gpointer) TRUE, NULL,
_("Inch"),
GINT_TO_POINTER (FALSE), NULL,
_("Millimeter"),
GINT_TO_POINTER (TRUE), NULL,
NULL);
gtk_box_pack_start (GTK_BOX (vbox), uframe, FALSE, FALSE, 0);
gtk_widget_show (uframe);
@ -2890,14 +2899,16 @@ save_dialog (void)
/* Rotation */
frame = gimp_radio_group_new2 (TRUE, _("Rotation"),
G_CALLBACK (gimp_radio_button_update),
&psvals.rotate, (gpointer) psvals.rotate,
&psvals.rotate,
GINT_TO_POINTER (psvals.rotate),
"0", (gpointer) 0, NULL,
"90", (gpointer) 90, NULL,
"180", (gpointer) 180, NULL,
"270", (gpointer) 270, NULL,
"0", GINT_TO_POINTER (0), NULL,
"90", GINT_TO_POINTER (90), NULL,
"180", GINT_TO_POINTER (180), NULL,
"270", GINT_TO_POINTER (270), NULL,
NULL);
gtk_box_pack_start (GTK_BOX (main_vbox[1]), frame, FALSE, FALSE, 0);
gtk_widget_show (frame);
@ -2912,35 +2923,38 @@ save_dialog (void)
toggle = gtk_check_button_new_with_label (_("PostScript Level 2"));
gtk_box_pack_start (GTK_BOX (vbox), toggle, TRUE, TRUE, 0);
gtk_signal_connect (GTK_OBJECT (toggle), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update),
&(vals->level));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), vals->level);
gtk_widget_show (toggle);
g_signal_connect (G_OBJECT (toggle), "toggled",
G_CALLBACK (gimp_toggle_button_update),
&vals->level);
toggle = gtk_check_button_new_with_label (_("Encapsulated PostScript"));
gtk_box_pack_start (GTK_BOX (vbox), toggle, TRUE, TRUE, 0);
gtk_signal_connect (GTK_OBJECT (toggle), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update),
&psvals.eps);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), psvals.eps);
gtk_widget_show (toggle);
g_signal_connect (G_OBJECT (toggle), "toggled",
G_CALLBACK (gimp_toggle_button_update),
&psvals.eps);
toggle = gtk_check_button_new_with_label (_("Preview"));
gtk_box_pack_start (GTK_BOX (vbox), toggle, TRUE, TRUE, 0);
gtk_signal_connect (GTK_OBJECT (toggle), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update),
&psvals.preview);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), psvals.preview);
gtk_widget_show (toggle);
g_signal_connect (G_OBJECT (toggle), "toggled",
G_CALLBACK (gimp_toggle_button_update),
&psvals.preview);
/* Preview size label/entry */
table = gtk_table_new (1, 2, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0);
gtk_widget_show (table);
gtk_object_set_data (GTK_OBJECT (toggle), "set_sensitive", table);
g_object_set_data (G_OBJECT (toggle), "set_sensitive", table);
gtk_widget_set_sensitive (table, psvals.preview);
spinbutton = gimp_spin_button_new (&adj, psvals.preview_size,
@ -2948,11 +2962,12 @@ save_dialog (void)
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Preview Size:"), 1.0, 0.5,
spinbutton, 1, FALSE);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (gimp_int_adjustment_update),
&psvals.preview_size);
gtk_widget_show (spinbutton);
g_signal_connect (G_OBJECT (adj), "value_changed",
G_CALLBACK (gimp_int_adjustment_update),
&psvals.preview_size);
gtk_widget_show (vbox);
gtk_widget_show (frame);
@ -2994,7 +3009,8 @@ save_unit_toggle_update (GtkWidget *widget,
gint i;
vals = (SaveDialogVals *) data;
unit_mm = (gint) gtk_object_get_user_data (GTK_OBJECT (widget));
unit_mm = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget),
"gimp-item-data"));
psvals.unit_mm = unit_mm;

138
plug-ins/common/ps.c
View File

@ -2609,9 +2609,9 @@ load_dialog (void)
NULL);
gtk_signal_connect (GTK_OBJECT (dialog), "destroy",
GTK_SIGNAL_FUNC (gtk_main_quit),
NULL);
g_signal_connect (G_OBJECT (dialog), "destroy",
G_CALLBACK (gtk_main_quit),
NULL);
main_vbox = gtk_vbox_new (FALSE, 6);
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 6);
@ -2644,27 +2644,27 @@ load_dialog (void)
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Resolution:"), 1.0, 0.5,
spinbutton, 1, TRUE);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (gimp_int_adjustment_update),
&plvals.resolution);
g_signal_connect (G_OBJECT (adj), "value_changed",
G_CALLBACK (gimp_int_adjustment_update),
&plvals.resolution);
spinbutton = gimp_spin_button_new (&adj, plvals.width,
1, GIMP_MAX_IMAGE_SIZE, 1, 10, 0, 1, 0);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Width:"), 1.0, 0.5,
spinbutton, 1, TRUE);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (gimp_int_adjustment_update),
&plvals.width);
g_signal_connect (G_OBJECT (adj), "value_changed",
G_CALLBACK (gimp_int_adjustment_update),
&plvals.width);
spinbutton = gimp_spin_button_new (&adj, plvals.height,
1, GIMP_MAX_IMAGE_SIZE, 1, 10, 0, 1, 0);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 2,
_("Height:"), 1.0, 0.5,
spinbutton, 1, TRUE);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (gimp_int_adjustment_update),
&plvals.height);
g_signal_connect (G_OBJECT (adj), "value_changed",
G_CALLBACK (gimp_int_adjustment_update),
&plvals.height);
pages_entry = gtk_entry_new ();
gtk_widget_set_size_request (pages_entry, 80, -1);
@ -2672,18 +2672,19 @@ load_dialog (void)
gimp_table_attach_aligned (GTK_TABLE (table), 0, 3,
_("Pages:"), 1.0, 0.5,
pages_entry, 1, TRUE);
gtk_signal_connect (GTK_OBJECT (pages_entry), "changed",
GTK_SIGNAL_FUNC (load_pages_entry_callback),
NULL);
g_signal_connect (G_OBJECT (pages_entry), "changed",
G_CALLBACK (load_pages_entry_callback),
NULL);
toggle = gtk_check_button_new_with_label (_("Try Bounding Box"));
gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (toggle), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update),
&plvals.use_bbox);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), plvals.use_bbox);
gtk_widget_show (toggle);
g_signal_connect (G_OBJECT (toggle), "toggled",
G_CALLBACK (gimp_toggle_button_update),
&plvals.use_bbox);
gtk_widget_show (vbox);
gtk_widget_show (frame);
@ -2792,9 +2793,9 @@ save_dialog (void)
NULL);
gtk_signal_connect (GTK_OBJECT (dialog), "destroy",
GTK_SIGNAL_FUNC (gtk_main_quit),
NULL);
g_signal_connect (G_OBJECT (dialog), "destroy",
G_CALLBACK (gtk_main_quit),
NULL);
/* Main hbox */
hbox = gtk_hbox_new (FALSE, 6);
@ -2830,57 +2831,65 @@ save_dialog (void)
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Width:"), 1.0, 0.5,
spinbutton, 1, FALSE);
gtk_signal_connect (GTK_OBJECT (vals->adjustment[0]), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&psvals.width);
g_signal_connect (G_OBJECT (vals->adjustment[0]), "value_changed",
G_CALLBACK (gimp_double_adjustment_update),
&psvals.width);
spinbutton = gimp_spin_button_new (&vals->adjustment[1], psvals.height,
1e-5, GIMP_MAX_IMAGE_SIZE, 1, 10, 0, 1, 2);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Height:"), 1.0, 0.5,
spinbutton, 1, FALSE);
gtk_signal_connect (GTK_OBJECT (vals->adjustment[1]), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&psvals.height);
g_signal_connect (G_OBJECT (vals->adjustment[1]), "value_changed",
G_CALLBACK (gimp_double_adjustment_update),
&psvals.height);
spinbutton = gimp_spin_button_new (&vals->adjustment[2], psvals.x_offset,
1e-5, GIMP_MAX_IMAGE_SIZE, 1, 10, 0, 1, 2);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 2,
_("X-Offset:"), 1.0, 0.5,
spinbutton, 1, FALSE);
gtk_signal_connect (GTK_OBJECT (vals->adjustment[2]), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&psvals.x_offset);
g_signal_connect (G_OBJECT (vals->adjustment[2]), "value_changed",
G_CALLBACK (gimp_double_adjustment_update),
&psvals.x_offset);
spinbutton = gimp_spin_button_new (&vals->adjustment[3], psvals.y_offset,
1e-5, GIMP_MAX_IMAGE_SIZE, 1, 10, 0, 1, 2);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 3,
_("Y-Offset:"), 1.0, 0.5,
spinbutton, 1, FALSE);
gtk_signal_connect (GTK_OBJECT (vals->adjustment[3]), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&psvals.y_offset);
g_signal_connect (G_OBJECT (vals->adjustment[3]), "value_changed",
G_CALLBACK (gimp_double_adjustment_update),
&psvals.y_offset);
toggle = gtk_check_button_new_with_label (_("Keep Aspect Ratio"));
gimp_help_set_help_data (toggle, _("When toggled, the resulting image will be scaled to fit "
"into the given size without changing the aspect ratio."),
"#keep_aspect_ratio"),
gtk_box_pack_start (GTK_BOX (vbox), toggle, TRUE, TRUE, 0);
gtk_signal_connect (GTK_OBJECT (toggle), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update),
&psvals.keep_ratio);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), psvals.keep_ratio);
gtk_widget_show (toggle);
gimp_help_set_help_data (toggle,
_("When toggled, the resulting image will be scaled to fit "
"into the given size without changing the aspect ratio."),
"#keep_aspect_ratio"),
g_signal_connect (G_OBJECT (toggle), "toggled",
G_CALLBACK (gimp_toggle_button_update),
&psvals.keep_ratio);
/* Unit */
uframe = gimp_radio_group_new2 (TRUE, _("Unit"),
G_CALLBACK (save_unit_toggle_update),
vals, (gpointer) psvals.unit_mm,
vals,
GINT_TO_POINTER (psvals.unit_mm),
_("Inch"), (gpointer) FALSE, NULL,
_("Millimeter"), (gpointer) TRUE, NULL,
_("Inch"),
GINT_TO_POINTER (FALSE), NULL,
_("Millimeter"),
GINT_TO_POINTER (TRUE), NULL,
NULL);
gtk_box_pack_start (GTK_BOX (vbox), uframe, FALSE, FALSE, 0);
gtk_widget_show (uframe);
@ -2890,14 +2899,16 @@ save_dialog (void)
/* Rotation */
frame = gimp_radio_group_new2 (TRUE, _("Rotation"),
G_CALLBACK (gimp_radio_button_update),
&psvals.rotate, (gpointer) psvals.rotate,
&psvals.rotate,
GINT_TO_POINTER (psvals.rotate),
"0", (gpointer) 0, NULL,
"90", (gpointer) 90, NULL,
"180", (gpointer) 180, NULL,
"270", (gpointer) 270, NULL,
"0", GINT_TO_POINTER (0), NULL,
"90", GINT_TO_POINTER (90), NULL,
"180", GINT_TO_POINTER (180), NULL,
"270", GINT_TO_POINTER (270), NULL,
NULL);
gtk_box_pack_start (GTK_BOX (main_vbox[1]), frame, FALSE, FALSE, 0);
gtk_widget_show (frame);
@ -2912,35 +2923,38 @@ save_dialog (void)
toggle = gtk_check_button_new_with_label (_("PostScript Level 2"));
gtk_box_pack_start (GTK_BOX (vbox), toggle, TRUE, TRUE, 0);
gtk_signal_connect (GTK_OBJECT (toggle), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update),
&(vals->level));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), vals->level);
gtk_widget_show (toggle);
g_signal_connect (G_OBJECT (toggle), "toggled",
G_CALLBACK (gimp_toggle_button_update),
&vals->level);
toggle = gtk_check_button_new_with_label (_("Encapsulated PostScript"));
gtk_box_pack_start (GTK_BOX (vbox), toggle, TRUE, TRUE, 0);
gtk_signal_connect (GTK_OBJECT (toggle), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update),
&psvals.eps);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), psvals.eps);
gtk_widget_show (toggle);
g_signal_connect (G_OBJECT (toggle), "toggled",
G_CALLBACK (gimp_toggle_button_update),
&psvals.eps);
toggle = gtk_check_button_new_with_label (_("Preview"));
gtk_box_pack_start (GTK_BOX (vbox), toggle, TRUE, TRUE, 0);
gtk_signal_connect (GTK_OBJECT (toggle), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update),
&psvals.preview);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), psvals.preview);
gtk_widget_show (toggle);
g_signal_connect (G_OBJECT (toggle), "toggled",
G_CALLBACK (gimp_toggle_button_update),
&psvals.preview);
/* Preview size label/entry */
table = gtk_table_new (1, 2, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0);
gtk_widget_show (table);
gtk_object_set_data (GTK_OBJECT (toggle), "set_sensitive", table);
g_object_set_data (G_OBJECT (toggle), "set_sensitive", table);
gtk_widget_set_sensitive (table, psvals.preview);
spinbutton = gimp_spin_button_new (&adj, psvals.preview_size,
@ -2948,11 +2962,12 @@ save_dialog (void)
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Preview Size:"), 1.0, 0.5,
spinbutton, 1, FALSE);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (gimp_int_adjustment_update),
&psvals.preview_size);
gtk_widget_show (spinbutton);
g_signal_connect (G_OBJECT (adj), "value_changed",
G_CALLBACK (gimp_int_adjustment_update),
&psvals.preview_size);
gtk_widget_show (vbox);
gtk_widget_show (frame);
@ -2994,7 +3009,8 @@ save_unit_toggle_update (GtkWidget *widget,
gint i;
vals = (SaveDialogVals *) data;
unit_mm = (gint) gtk_object_get_user_data (GTK_OBJECT (widget));
unit_mm = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget),
"gimp-item-data"));
psvals.unit_mm = unit_mm;

54
plug-ins/common/psp.c
View File

@ -287,15 +287,15 @@ typedef struct
/* Declare some local functions.
*/
static void query (void);
static void run (gchar *name,
gint nparams,
static void run (gchar *name,
gint nparams,
GimpParam *param,
gint *nreturn_vals,
gint *nreturn_vals,
GimpParam **return_vals);
static gint32 load_image (gchar *filename);
static gint save_image (gchar *filename,
gint32 image_ID,
gint32 drawable_ID);
static gint32 load_image (gchar *filename);
static gint save_image (gchar *filename,
gint32 image_ID,
gint32 drawable_ID);
/* Various local variables...
*/
@ -425,26 +425,33 @@ save_dialog (void)
GTK_STOCK_CANCEL, gtk_widget_destroy,
NULL, 1, NULL, FALSE, TRUE,
GTK_STOCK_OK, save_ok_callback,
NULL, NULL, NULL, TRUE, FALSE,
NULL);
gtk_signal_connect (GTK_OBJECT (dlg), "destroy",
GTK_SIGNAL_FUNC (gtk_main_quit),
NULL);
g_signal_connect (G_OBJECT (dlg), "destroy",
G_CALLBACK (gtk_main_quit),
NULL);
/* file save type */
frame = gimp_radio_group_new2 (TRUE, _("Data Compression"),
G_CALLBACK (gimp_radio_button_update),
&psvals.compression,
(gpointer) psvals.compression,
GINT_TO_POINTER (psvals.compression),
_("None"), (gpointer) PSP_COMP_NONE, NULL,
_("RLE"), (gpointer) PSP_COMP_RLE, NULL,
_("LZ77"), (gpointer) PSP_COMP_LZ77, NULL,
_("None"),
GINT_TO_POINTER (PSP_COMP_NONE), NULL,
_("RLE"),
GINT_TO_POINTER (PSP_COMP_RLE), NULL,
_("LZ77"),
GINT_TO_POINTER (PSP_COMP_LZ77), NULL,
NULL);
gtk_container_set_border_width (GTK_CONTAINER (frame), 6);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), frame, FALSE, TRUE, 0);
gtk_widget_show (frame);
@ -1679,18 +1686,18 @@ save_image (gchar *filename,
}
static void
run (gchar *name,
gint nparams,
run (gchar *name,
gint nparams,
GimpParam *param,
gint *nreturn_vals,
gint *nreturn_vals,
GimpParam **return_vals)
{
static GimpParam values[2];
GimpRunMode run_mode;
GimpPDBStatusType status = GIMP_PDB_SUCCESS;
gint32 image_ID;
gint32 drawable_ID;
GimpExportReturnType export = GIMP_EXPORT_CANCEL;
static GimpParam values[2];
GimpRunMode run_mode;
GimpPDBStatusType status = GIMP_PDB_SUCCESS;
gint32 image_ID;
gint32 drawable_ID;
GimpExportReturnType export = GIMP_EXPORT_CANCEL;
tile_height = gimp_tile_height ();
@ -1698,6 +1705,7 @@ run (gchar *name,
*nreturn_vals = 1;
*return_vals = values;
values[0].type = GIMP_PDB_STATUS;
values[0].data.d_status = GIMP_PDB_EXECUTION_ERROR;

68
plug-ins/common/randomize.c
View File

@ -160,23 +160,23 @@ static RandomizeInterface rndm_int =
********************************/
static void query (void);
static void run (gchar *name,
gint nparams,
static void run (gchar *name,
gint nparams,
GimpParam *param,
gint *nreturn_vals,
gint *nreturn_vals,
GimpParam **return_vals);
static void randomize (GimpDrawable *drawable);
static inline void randomize_prepare_row (GimpPixelRgn *pixel_rgn,
guchar *data,
gint x,
gint y,
gint w);
guchar *data,
gint x,
gint y,
gint w);
static gint randomize_dialog (void);
static void randomize_ok_callback (GtkWidget *widget,
gpointer data);
static void randomize_ok_callback (GtkWidget *widget,
gpointer data);
/************************************ Guts ***********************************/
@ -277,35 +277,37 @@ query (void)
********************************/
static void
run (gchar *name,
gint nparams,
run (gchar *name,
gint nparams,
GimpParam *param,
gint *nreturn_vals,
gint *nreturn_vals,
GimpParam **return_vals)
{
GimpDrawable *drawable;
GimpRunMode run_mode;
GimpPDBStatusType status = GIMP_PDB_SUCCESS; /* assume the best! */
gchar *rndm_type_str = '\0';
gchar prog_label[32];
static GimpParam values[1];
GimpDrawable *drawable;
GimpRunMode run_mode;
GimpPDBStatusType status = GIMP_PDB_SUCCESS; /* assume the best! */
gchar *rndm_type_str = '\0';
gchar prog_label[32];
static GimpParam values[1];
/*
* Get the specified drawable, do standard initialization.
*/
if (strcmp(name, PLUG_IN_NAME[0]) == 0)
if (strcmp (name, PLUG_IN_NAME[0]) == 0)
rndm_type = RNDM_HURL;
else if (strcmp(name, PLUG_IN_NAME[1]) == 0)
else if (strcmp (name, PLUG_IN_NAME[1]) == 0)
rndm_type = RNDM_PICK;
else if (strcmp(name, PLUG_IN_NAME[2]) == 0)
else if (strcmp (name, PLUG_IN_NAME[2]) == 0)
rndm_type = RNDM_SLUR;
run_mode = param[0].data.d_int32;
drawable = gimp_drawable_get(param[2].data.d_drawable);
values[0].type = GIMP_PDB_STATUS;
values[0].data.d_status = status;
*nreturn_vals = 1;
*return_vals = values;
*return_vals = values;
values[0].type = GIMP_PDB_STATUS;
values[0].data.d_status = status;
/*
* Make sure the drawable type is appropriate.
*/
@ -705,9 +707,9 @@ randomize_dialog (void)
NULL);
gtk_signal_connect (GTK_OBJECT (dlg), "destroy",
GTK_SIGNAL_FUNC (gtk_main_quit),
NULL);
g_signal_connect (G_OBJECT (dlg), "destroy",
G_CALLBACK (gtk_main_quit),
NULL);
gimp_help_init ();
@ -744,9 +746,9 @@ randomize_dialog (void)
pivals.rndm_pct, 1.0, 100.0, 1.0, 10.0, 0,
TRUE, 0, 0,
_("Percentage of pixels to be filtered"), NULL);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (gimp_int_adjustment_update),
&pivals.rndm_pct);
g_signal_connect (G_OBJECT (adj), "value_changed",
G_CALLBACK (gimp_int_adjustment_update),
&pivals.rndm_pct);
/*
* Repeat count label & scale (1 to 100)
@ -756,9 +758,9 @@ randomize_dialog (void)
pivals.rndm_rcount, 1.0, 100.0, 1.0, 10.0, 0,
TRUE, 0, 0,
_("Number of times to apply filter"), NULL);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&pivals.rndm_rcount);
g_signal_connect (G_OBJECT (adj), "value_changed",
G_CALLBACK (gimp_double_adjustment_update),
&pivals.rndm_rcount);
gtk_widget_show (frame);

116
plug-ins/common/ripple.c
View File

@ -68,11 +68,11 @@ typedef struct
/* Declare local functions.
*/
static void query (void);
static void run (gchar *name,
gint nparams,
GimpParam *param,
gint *nreturn_vals,
GimpParam **return_vals);
static void run (gchar *name,
gint nparams,
GimpParam *param,
gint *nreturn_vals,
GimpParam **return_vals);
static void ripple (GimpDrawable *drawable);
@ -81,16 +81,16 @@ static void ripple_ok_callback (GtkWidget *widget,
gpointer data);
static GimpTile * ripple_pixel (GimpDrawable *drawable,
GimpTile *tile,
gint x1,
gint y1,
gint x2,
gint y2,
gint x,
gint y,
gint *row,
gint *col,
guchar *pixel);
GimpTile *tile,
gint x1,
gint y1,
gint x2,
gint y2,
gint x,
gint y,
gint *row,
gint *col,
guchar *pixel);
static gdouble displace_amount (gint location);
@ -160,16 +160,16 @@ query (void)
}
static void
run (gchar *name,
gint nparams,
run (gchar *name,
gint nparams,
GimpParam *param,
gint *nreturn_vals,
gint *nreturn_vals,
GimpParam **return_vals)
{
static GimpParam values[1];
GimpDrawable *drawable;
GimpRunMode run_mode;
GimpPDBStatusType status = GIMP_PDB_SUCCESS;
static GimpParam values[1];
GimpDrawable *drawable;
GimpRunMode run_mode;
GimpPDBStatusType status = GIMP_PDB_SUCCESS;
run_mode = param[0].data.d_int32;
@ -177,9 +177,9 @@ run (gchar *name,
drawable = gimp_drawable_get (param[2].data.d_drawable);
*nreturn_vals = 1;
*return_vals = values;
*return_vals = values;
values[0].type = GIMP_PDB_STATUS;
values[0].type = GIMP_PDB_STATUS;
values[0].data.d_status = status;
switch (run_mode)
@ -583,9 +583,9 @@ ripple_dialog (void)
NULL);
gtk_signal_connect (GTK_OBJECT (dlg), "destroy",
GTK_SIGNAL_FUNC (gtk_main_quit),
NULL);
g_signal_connect (G_OBJECT (dlg), "destroy",
G_CALLBACK (gtk_main_quit),
NULL);
/* The main vbox */
main_vbox = gtk_vbox_new (FALSE, 6);
@ -611,33 +611,39 @@ ripple_dialog (void)
toggle = gtk_check_button_new_with_label (_("Antialiasing"));
gtk_box_pack_start (GTK_BOX (toggle_vbox), toggle, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (toggle), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update),
&rvals.antialias);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), rvals.antialias);
gtk_widget_show (toggle);
g_signal_connect (G_OBJECT (toggle), "toggled",
G_CALLBACK (gimp_toggle_button_update),
&rvals.antialias);
toggle = gtk_check_button_new_with_label ( _("Retain Tilability"));
gtk_box_pack_start (GTK_BOX (toggle_vbox), toggle, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (toggle), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update),
&rvals.tile);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), (rvals.tile));
gtk_widget_show (toggle);
g_signal_connect (G_OBJECT (toggle), "toggled",
G_CALLBACK (gimp_toggle_button_update),
&rvals.tile);
gtk_widget_show (toggle_vbox);
gtk_widget_show (frame);
/* Orientation toggle box */
frame =
gimp_radio_group_new2 (TRUE, _("Orientation"),
G_CALLBACK (gimp_radio_button_update),
&rvals.orientation, (gpointer) rvals.orientation,
frame = gimp_radio_group_new2 (TRUE, _("Orientation"),
G_CALLBACK (gimp_radio_button_update),
&rvals.orientation,
GINT_TO_POINTER (rvals.orientation),
_("Horizontal"), (gpointer) HORIZONTAL, NULL,
_("Vertical"), (gpointer) VERTICAL, NULL,
_("Horizontal"),
GINT_TO_POINTER (HORIZONTAL), NULL,
_("Vertical"),
GINT_TO_POINTER (VERTICAL), NULL,
NULL);
NULL);
gtk_table_attach (GTK_TABLE (table), frame, 1, 2, 0, 1,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
gtk_widget_show (frame);
@ -688,9 +694,9 @@ ripple_dialog (void)
rvals.period, 0, 200, 1, 10, 0,
TRUE, 0, 0,
NULL, NULL);
gtk_signal_connect (GTK_OBJECT (scale_data), "value_changed",
GTK_SIGNAL_FUNC (gimp_int_adjustment_update),
&rvals.period);
g_signal_connect (G_OBJECT (scale_data), "value_changed",
G_CALLBACK (gimp_int_adjustment_update),
&rvals.period);
/* Amplitude */
scale_data = gimp_scale_entry_new (GTK_TABLE (table), 0, 1,
@ -698,9 +704,9 @@ ripple_dialog (void)
rvals.amplitude, 0, 200, 1, 10, 0,
TRUE, 0, 0,
NULL, NULL);
gtk_signal_connect (GTK_OBJECT (scale_data), "value_changed",
GTK_SIGNAL_FUNC (gimp_int_adjustment_update),
&rvals.amplitude);
g_signal_connect (G_OBJECT (scale_data), "value_changed",
G_CALLBACK (gimp_int_adjustment_update),
&rvals.amplitude);
gtk_widget_show (frame);
gtk_widget_show (table);
@ -717,15 +723,15 @@ ripple_dialog (void)
static GimpTile *
ripple_pixel (GimpDrawable *drawable,
GimpTile *tile,
gint x1,
gint y1,
gint x2,
gint y2,
gint x,
gint y,
gint *row,
gint *col,
guchar *pixel)
gint x1,
gint y1,
gint x2,
gint y2,
gint x,
gint y,
gint *row,
gint *col,
guchar *pixel)
{
static guchar empty_pixel[4] = {0, 0, 0, 0};

188
plug-ins/common/sample_colorize.c
View File

@ -203,11 +203,11 @@ static gint g_show_progress = FALSE;
/* Declare a local function.
*/
static void query (void);
static void run (gchar *name,
gint nparams,
GimpParam *param,
gint *nreturn_vals,
GimpParam **return_vals);
static void run (gchar *name,
gint nparams,
GimpParam *param,
gint *nreturn_vals,
GimpParam **return_vals);
static gint p_main_colorize(gint);
static void p_get_filevalues (void);
@ -318,7 +318,7 @@ run (gchar *name,
{
static GimpParam values[1];
GimpDrawable *dst_drawable;
GimpRunMode run_mode;
GimpRunMode run_mode;
GimpPDBStatusType status = GIMP_PDB_SUCCESS;
const gchar *l_env;
@ -708,8 +708,7 @@ p_refresh_dst_preview(GtkWidget *preview, guchar *src_buffer)
}
gtk_preview_draw_row(GTK_PREVIEW(preview), &l_rowbuf[0], 0, l_y, PREVIEW_SIZE_X);
}
gtk_widget_draw(preview, NULL);
gdk_flush();
gtk_widget_queue_draw(preview);
} /* end p_refresh_dst_preview */
void
@ -732,8 +731,7 @@ p_clear_preview(GtkWidget *preview)
{
gtk_preview_draw_row(GTK_PREVIEW(preview), &l_rowbuf[0], 0, l_y, PREVIEW_SIZE_X);
}
gtk_widget_draw(preview, NULL);
gdk_flush();
gtk_widget_queue_draw(preview);
} /* end p_clear_preview */
@ -907,8 +905,7 @@ p_update_pv (GtkWidget *preview,
if(dst_buffer == NULL)
{
gtk_widget_draw(preview, NULL);
gdk_flush();
gtk_widget_queue_draw(preview);
}
} /* end p_update_pv */
@ -1010,7 +1007,7 @@ p_smp_get_colors_callback (GdkWindow *window,
}
p_update_preview(&g_values.dst_id);
gtk_widget_draw (g_di.sample_colortab_preview, NULL);
gtk_widget_queue_draw (g_di.sample_colortab_preview);
}
@ -1064,7 +1061,7 @@ p_levels_update (gint update)
if (update & DRAW)
{
gtk_widget_draw (g_di.in_lvl_gray_preview, NULL);
gtk_widget_queue_draw (g_di.in_lvl_gray_preview);
}
}
@ -1375,9 +1372,9 @@ p_smp_dialog (void)
NULL);
gtk_signal_connect (GTK_OBJECT (dialog), "destroy",
GTK_SIGNAL_FUNC (p_smp_close_callback),
dialog);
g_signal_connect (G_OBJECT (dialog), "destroy",
G_CALLBACK (p_smp_close_callback),
dialog);
/* parameter settings */
frame = gtk_frame_new (_("Settings"));
@ -1440,19 +1437,21 @@ p_smp_dialog (void)
/* Add extra menu items for Gradient */
menu_item = gtk_menu_item_new_with_label (_("** From GRADIENT **"));
gtk_container_add (GTK_CONTAINER (menu), menu_item);
gtk_signal_connect (GTK_OBJECT (menu_item), "activate",
(GtkSignalFunc) p_gradient_callback,
(gpointer)SMP_GRADIENT);
gtk_widget_show (menu_item);
g_signal_connect (G_OBJECT (menu_item), "activate",
G_CALLBACK (p_gradient_callback),
(gpointer)SMP_GRADIENT);
/* Add extra menu items for Inverted Gradient */
menu_item = gtk_menu_item_new_with_label (_("** From INVERSE GRADIENT **"));
gtk_container_add (GTK_CONTAINER (menu), menu_item);
gtk_signal_connect (GTK_OBJECT (menu_item), "activate",
(GtkSignalFunc) p_gradient_callback,
(gpointer)SMP_INV_GRADIENT);
gtk_widget_show (menu_item);
g_signal_connect (G_OBJECT (menu_item), "activate",
G_CALLBACK (p_gradient_callback),
(gpointer)SMP_INV_GRADIENT);
l_ty++;
hbox = gtk_hbox_new (FALSE, 4);
@ -1463,22 +1462,24 @@ p_smp_dialog (void)
/* check button */
check_button = gtk_check_button_new_with_label (_("Show Selection"));
gtk_box_pack_start (GTK_BOX (hbox), check_button, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (check_button), "toggled",
(GtkSignalFunc) p_smp_toggle_callback,
&g_di.dst_show_selection);
gtk_widget_show (check_button);
g_signal_connect (G_OBJECT (check_button), "toggled",
G_CALLBACK (p_smp_toggle_callback),
&g_di.dst_show_selection);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
g_di.dst_show_selection);
gtk_widget_show (check_button);
/* check button */
check_button = gtk_check_button_new_with_label (_("Show Color"));
gtk_box_pack_start (GTK_BOX (hbox), check_button, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (check_button), "toggled",
(GtkSignalFunc) p_smp_toggle_callback,
&g_di.dst_show_color);
gtk_widget_show (check_button);
g_signal_connect (G_OBJECT (check_button), "toggled",
G_CALLBACK (p_smp_toggle_callback),
&g_di.dst_show_color);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
g_di.dst_show_color);
gtk_widget_show (check_button);
hbox = gtk_hbox_new (FALSE, 4);
gtk_table_attach (GTK_TABLE (table), hbox, 3, 5, l_ty, l_ty+1,
@ -1488,22 +1489,24 @@ p_smp_dialog (void)
/* check button */
check_button = gtk_check_button_new_with_label (_("Show Selection"));
gtk_box_pack_start (GTK_BOX (hbox), check_button, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (check_button), "toggled",
(GtkSignalFunc)p_smp_toggle_callback ,
&g_di.sample_show_selection);
gtk_widget_show (check_button);
g_signal_connect (G_OBJECT (check_button), "toggled",
(GtkSignalFunc)p_smp_toggle_callback ,
&g_di.sample_show_selection);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
g_di.sample_show_selection);
gtk_widget_show (check_button);
/* check button */
check_button = gtk_check_button_new_with_label (_("Show Color"));
gtk_box_pack_start (GTK_BOX (hbox), check_button, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (check_button), "toggled",
(GtkSignalFunc)p_smp_toggle_callback ,
&g_di.sample_show_color);
gtk_widget_show (check_button);
g_signal_connect (G_OBJECT (check_button), "toggled",
(GtkSignalFunc)p_smp_toggle_callback ,
&g_di.sample_show_color);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
g_di.sample_show_color);
gtk_widget_show (check_button);
l_ty++;
@ -1547,23 +1550,25 @@ p_smp_dialog (void)
gtk_preview_size (GTK_PREVIEW (g_di.in_lvl_gray_preview),
DA_WIDTH, GRADIENT_HEIGHT);
gtk_widget_set_events (g_di.in_lvl_gray_preview, LEVELS_DA_MASK);
gtk_signal_connect (GTK_OBJECT (g_di.in_lvl_gray_preview), "event",
(GtkSignalFunc) p_level_in_events,
&g_di);
gtk_box_pack_start (GTK_BOX (vbox2), g_di.in_lvl_gray_preview, FALSE, TRUE, 0);
gtk_widget_show (g_di.in_lvl_gray_preview);
g_signal_connect (G_OBJECT (g_di.in_lvl_gray_preview), "event",
G_CALLBACK (p_level_in_events),
&g_di);
/* The levels drawing area */
g_di.in_lvl_drawarea = gtk_drawing_area_new ();
gtk_drawing_area_size (GTK_DRAWING_AREA (g_di.in_lvl_drawarea),
DA_WIDTH, CONTROL_HEIGHT);
gtk_widget_set_size_request (g_di.in_lvl_drawarea,
DA_WIDTH, CONTROL_HEIGHT);
gtk_widget_set_events (g_di.in_lvl_drawarea, LEVELS_DA_MASK);
gtk_signal_connect (GTK_OBJECT (g_di.in_lvl_drawarea), "event",
(GtkSignalFunc) p_level_in_events,
&g_di);
gtk_box_pack_start (GTK_BOX (vbox2), g_di.in_lvl_drawarea, FALSE, TRUE, 0);
gtk_widget_show (g_di.in_lvl_drawarea);
g_signal_connect (G_OBJECT (g_di.in_lvl_drawarea), "event",
G_CALLBACK (p_level_in_events),
&g_di);
gtk_widget_show(vbox2);
gtk_widget_show(pframe);
@ -1583,14 +1588,16 @@ p_smp_dialog (void)
/* The levels drawing area */
g_di.sample_drawarea = gtk_drawing_area_new ();
gtk_drawing_area_size (GTK_DRAWING_AREA (g_di.sample_drawarea), DA_WIDTH, CONTROL_HEIGHT);
gtk_widget_set_size_request (g_di.sample_drawarea,
DA_WIDTH, CONTROL_HEIGHT);
gtk_widget_set_events (g_di.sample_drawarea, LEVELS_DA_MASK);
gtk_signal_connect (GTK_OBJECT (g_di.sample_drawarea), "event",
(GtkSignalFunc) p_level_out_events,
&g_di);
gtk_box_pack_start (GTK_BOX (vbox2), g_di.sample_drawarea, FALSE, TRUE, 0);
gtk_widget_show (g_di.sample_drawarea);
g_signal_connect (G_OBJECT (g_di.sample_drawarea), "event",
G_CALLBACK (p_level_out_events),
&g_di);
gtk_widget_show(vbox2);
gtk_widget_show(pframe);
@ -1614,12 +1621,11 @@ p_smp_dialog (void)
gtk_widget_set_size_request (spinbutton, TEXT_WIDTH, -1);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE);
gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (g_di.adj_lvl_in_min), "value_changed",
GTK_SIGNAL_FUNC (p_smp_adj_lvl_in_min_upd_callback),
&g_di);
gtk_widget_show (spinbutton);
g_signal_connect (G_OBJECT (g_di.adj_lvl_in_min), "value_changed",
G_CALLBACK (p_smp_adj_lvl_in_min_upd_callback),
&g_di);
/* input gamma spinbutton */
data = gtk_adjustment_new ((gfloat)g_values.lvl_in_gamma, 0.1, 10.0, 0.02, 0.2, 0.2);
@ -1629,12 +1635,12 @@ p_smp_dialog (void)
gtk_widget_set_size_request (spinbutton, TEXT_WIDTH, -1);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE);
gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (g_di.adj_lvl_in_gamma), "value_changed",
GTK_SIGNAL_FUNC (p_smp_text_gamma_upd_callback),
&g_di);
gtk_widget_show (spinbutton);
g_signal_connect (G_OBJECT (g_di.adj_lvl_in_gamma), "value_changed",
G_CALLBACK (p_smp_text_gamma_upd_callback),
&g_di);
/* high input spinbutton */
data = gtk_adjustment_new ((gfloat)g_values.lvl_in_max, 1.0, 255.0, 1, 10, 10);
g_di.adj_lvl_in_max = GTK_ADJUSTMENT (data);
@ -1643,11 +1649,12 @@ p_smp_dialog (void)
gtk_widget_set_size_request (spinbutton, TEXT_WIDTH, -1);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE);
gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (g_di.adj_lvl_in_max), "value_changed",
GTK_SIGNAL_FUNC (p_smp_adj_lvl_in_max_upd_callback),
&g_di);
gtk_widget_show (spinbutton);
g_signal_connect (G_OBJECT (g_di.adj_lvl_in_max), "value_changed",
G_CALLBACK (p_smp_adj_lvl_in_max_upd_callback),
&g_di);
gtk_widget_show (hbox);
/* Horizontal box for OUTPUT levels text widget */
@ -1667,12 +1674,12 @@ p_smp_dialog (void)
gtk_widget_set_size_request (spinbutton, TEXT_WIDTH, -1);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE);
gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (g_di.adj_lvl_out_min), "value_changed",
GTK_SIGNAL_FUNC (p_smp_adj_lvl_out_min_upd_callback),
&g_di);
gtk_widget_show (spinbutton);
g_signal_connect (G_OBJECT (g_di.adj_lvl_out_min), "value_changed",
G_CALLBACK (p_smp_adj_lvl_out_min_upd_callback),
&g_di);
/* high output spinbutton */
data = gtk_adjustment_new ((gfloat)g_values.lvl_out_max, 0.0, 255.0, 1, 10, 10);
g_di.adj_lvl_out_max = GTK_ADJUSTMENT (data);
@ -1681,11 +1688,12 @@ p_smp_dialog (void)
gtk_widget_set_size_request (spinbutton, TEXT_WIDTH, -1);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE);
gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (g_di.adj_lvl_out_max), "value_changed",
GTK_SIGNAL_FUNC (p_smp_adj_lvl_out_max_upd_callback),
&g_di);
gtk_widget_show (spinbutton);
g_signal_connect (G_OBJECT (g_di.adj_lvl_out_max), "value_changed",
G_CALLBACK (p_smp_adj_lvl_out_max_upd_callback),
&g_di);
gtk_widget_show (hbox);
l_ty++;
@ -1698,24 +1706,26 @@ p_smp_dialog (void)
/* check button */
check_button = gtk_check_button_new_with_label (_("Hold Intensity"));
gtk_box_pack_start (GTK_BOX (hbox), check_button, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (check_button), "toggled",
(GtkSignalFunc) p_smp_toggle_callback,
&g_values.hold_inten);
gtk_widget_show (check_button);
g_signal_connect (G_OBJECT (check_button), "toggled",
G_CALLBACK (p_smp_toggle_callback),
&g_values.hold_inten);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
g_values.hold_inten);
gtk_widget_show (check_button);
/* check button */
check_button = gtk_check_button_new_with_label (_("Original Intensity"));
g_di.orig_inten_button = check_button;
gtk_box_pack_start (GTK_BOX (hbox), check_button, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (check_button), "toggled",
(GtkSignalFunc) p_smp_toggle_callback,
&g_values.orig_inten);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
g_values.orig_inten);
gtk_widget_set_sensitive (g_di.orig_inten_button, g_values.hold_inten);
gtk_widget_show (check_button);
g_signal_connect (G_OBJECT (check_button), "toggled",
G_CALLBACK (p_smp_toggle_callback),
&g_values.orig_inten);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
g_values.orig_inten);
hbox = gtk_hbox_new (FALSE, 4);
gtk_table_attach (GTK_TABLE (table), hbox, 3, 5, l_ty, l_ty+1,
@ -1725,22 +1735,24 @@ p_smp_dialog (void)
/* check button */
check_button = gtk_check_button_new_with_label (_("Use Subcolors"));
gtk_box_pack_start (GTK_BOX (hbox), check_button, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (check_button), "toggled",
(GtkSignalFunc) p_smp_toggle_callback,
&g_values.rnd_subcolors);
gtk_widget_show (check_button);
g_signal_connect (G_OBJECT (check_button), "toggled",
G_CALLBACK (p_smp_toggle_callback),
&g_values.rnd_subcolors);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
g_values.rnd_subcolors);
gtk_widget_show (check_button);
/* check button */
check_button = gtk_check_button_new_with_label (_("Smooth Samplecolors"));
gtk_box_pack_start (GTK_BOX (hbox), check_button, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (check_button), "toggled",
(GtkSignalFunc) p_smp_toggle_callback,
&g_values.guess_missing);
gtk_widget_show (check_button);
g_signal_connect (G_OBJECT (check_button), "toggled",
G_CALLBACK (p_smp_toggle_callback),
&g_values.guess_missing);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
g_values.guess_missing);
gtk_widget_show (check_button);
l_ty++;

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

@ -147,23 +147,23 @@ query (void)
}
static void
run (gchar *name,
gint nparams,
run (gchar *name,
gint nparams,
GimpParam *param,
gint *nreturn_vals,
gint *nreturn_vals,
GimpParam **return_vals)
{
static GimpParam values[1];
GimpPDBStatusType status = GIMP_PDB_EXECUTION_ERROR;
GimpRunMode run_mode;
static GimpParam values[1];
GimpPDBStatusType status = GIMP_PDB_EXECUTION_ERROR;
GimpRunMode run_mode;
run_mode = param[0].data.d_int32;
drawable_id = param[2].data.d_int32;
*nreturn_vals = 1;
*return_vals = values;
*return_vals = values;
values[0].type = GIMP_PDB_STATUS;
values[0].type = GIMP_PDB_STATUS;
values[0].data.d_status = status;
switch (run_mode)
@ -378,9 +378,9 @@ scatter_hsv_dialog (void)
NULL);
gtk_signal_connect (GTK_OBJECT (dlg), "destroy",
GTK_SIGNAL_FUNC (gtk_main_quit),
NULL);
g_signal_connect (G_OBJECT (dlg), "destroy",
G_CALLBACK (gtk_main_quit),
NULL);
vbox = gtk_vbox_new (FALSE, 6);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
@ -417,11 +417,12 @@ scatter_hsv_dialog (void)
GDK_BUTTON_RELEASE_MASK |
GDK_BUTTON_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK);
gtk_signal_connect (GTK_OBJECT (preview), "event",
(GtkSignalFunc) preview_event_handler,
NULL);
gtk_widget_show (preview);
g_signal_connect (G_OBJECT (preview), "event",
G_CALLBACK (preview_event_handler),
NULL);
gtk_widget_show (frame);
frame = gtk_frame_new (_("Parameter Settings"));
@ -441,36 +442,36 @@ scatter_hsv_dialog (void)
VALS.holdness, 1, 8, 1, 2, 0,
TRUE, 0, 0,
NULL, NULL);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (scatter_hsv_iscale_update),
&VALS.holdness);
g_signal_connect (G_OBJECT (adj), "value_changed",
G_CALLBACK (scatter_hsv_iscale_update),
&VALS.holdness);
adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 1,
_("Hue:"), SCALE_WIDTH, 0,
VALS.hue_distance, 0, 255, 1, 8, 0,
TRUE, 0, 0,
NULL, NULL);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (scatter_hsv_iscale_update),
&VALS.hue_distance);
g_signal_connect (G_OBJECT (adj), "value_changed",
G_CALLBACK (scatter_hsv_iscale_update),
&VALS.hue_distance);
adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 2,
_("Saturation:"), SCALE_WIDTH, 0,
VALS.saturation_distance, 0, 255, 1, 8, 0,
TRUE, 0, 0,
NULL, NULL);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (scatter_hsv_iscale_update),
&VALS.saturation_distance);
g_signal_connect (G_OBJECT (adj), "value_changed",
G_CALLBACK (scatter_hsv_iscale_update),
&VALS.saturation_distance);
adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 3,
_("Value:"), SCALE_WIDTH, 0,
VALS.value_distance, 0, 255, 1, 8, 0,
TRUE, 0, 0,
NULL, NULL);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (scatter_hsv_iscale_update),
&VALS.value_distance);
g_signal_connect (G_OBJECT (adj), "value_changed",
G_CALLBACK (scatter_hsv_iscale_update),
&VALS.value_distance);
gtk_widget_show (table);
gtk_widget_show (frame);
@ -629,8 +630,8 @@ scatter_hsv_preview_update (void)
scatter_hsv_scatter (data+0, data+1, data+2);
gtk_preview_draw_row (GTK_PREVIEW (preview), data, x, y, 1);
}
gtk_widget_draw (preview, NULL);
gdk_flush ();
gtk_widget_queue_draw (preview);
}
static void

43
plug-ins/common/screenshot.c
View File

@ -394,29 +394,34 @@ shoot_dialog (void)
gtk_container_add (GTK_CONTAINER (frame), vbox);
button = gtk_radio_button_new_with_label (radio_group, _("Single Window"));
radio_group = gtk_radio_button_group (GTK_RADIO_BUTTON (button));
radio_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (button));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), ! shootvals.root);
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
gtk_widget_show (button);
g_object_set_data (G_OBJECT (button), "gimp-item-data",
GINT_TO_POINTER (FALSE));
g_signal_connect (G_OBJECT (button), "toggled",
G_CALLBACK (gimp_radio_button_update),
&shootvals.root);
g_object_set_data (G_OBJECT (button), "gimp-item-data",
GINT_TO_POINTER (FALSE));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), ! shootvals.root);
gtk_widget_show (button);
/* with decorations */
hbox = gtk_hbox_new (FALSE, 2);
gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
decor_button =
gtk_check_button_new_with_label (_("With Decorations"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (decor_button),
shootvals.decor);
gtk_box_pack_end (GTK_BOX (hbox), decor_button, FALSE, FALSE, 0);
gtk_widget_show (decor_button);
g_object_set_data (G_OBJECT (button), "set_sensitive", decor_button);
g_signal_connect (G_OBJECT (decor_button), "toggled",
G_CALLBACK (gimp_toggle_button_update),
&shootvals.decor);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (decor_button),
shootvals.decor);
g_object_set_data (G_OBJECT (button), "set_sensitive", decor_button);
gtk_box_pack_end (GTK_BOX (hbox), decor_button, FALSE, FALSE, 0);
gtk_widget_show (decor_button);
gtk_widget_show (hbox);
sep = gtk_hseparator_new ();
@ -425,15 +430,16 @@ shoot_dialog (void)
/* root window */
button = gtk_radio_button_new_with_label (radio_group, _("Whole Screen"));
radio_group = gtk_radio_button_group (GTK_RADIO_BUTTON (button));
radio_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (button));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), shootvals.root);
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
g_object_set_data (G_OBJECT (button), "gimp-item-data",
GINT_TO_POINTER (TRUE));
g_signal_connect (G_OBJECT (button), "toggled",
G_CALLBACK (gimp_radio_button_update),
&shootvals.root);
g_object_set_data (G_OBJECT (button), "gimp-item-data",
GINT_TO_POINTER (TRUE));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), shootvals.root);
gtk_widget_show (button);
gtk_widget_show (vbox);
gtk_widget_show (frame);
@ -446,13 +452,14 @@ shoot_dialog (void)
gtk_widget_show (label);
adj = gtk_adjustment_new (shootvals.delay, 0.0, 100.0, 1.0, 5.0, 0.0);
g_signal_connect (G_OBJECT (adj), "value_changed",
G_CALLBACK (gimp_int_adjustment_update),
&shootvals.delay);
spinner = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 0, 0);
gtk_box_pack_start (GTK_BOX (hbox), spinner, FALSE, FALSE, 0);
gtk_widget_show (spinner);
g_signal_connect (G_OBJECT (adj), "value_changed",
G_CALLBACK (gimp_int_adjustment_update),
&shootvals.delay);
label = gtk_label_new (_("Seconds Delay"));
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);

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

@ -62,15 +62,15 @@ typedef struct
/* Declare local functions.
*/
static void query (void);
static void run (gchar *name,
gint nparams,
GimpParam *param,
gint *nreturn_vals,
GimpParam **return_vals);
static void run (gchar *name,
gint nparams,
GimpParam *param,
gint *nreturn_vals,
GimpParam **return_vals);
static void sel_gauss (GimpDrawable *drawable,
gdouble radius,
gint maxdelta);
gdouble radius,
gint maxdelta);
static gint sel_gauss_dialog (void);
static void sel_gauss_ok_callback (GtkWidget *widget,
@ -129,26 +129,26 @@ query (void)
}
static void
run (gchar *name,
gint nparams,
run (gchar *name,
gint nparams,
GimpParam *param,
gint *nreturn_vals,
gint *nreturn_vals,
GimpParam **return_vals)
{
static GimpParam values[1];
GimpRunMode run_mode;
GimpPDBStatusType status = GIMP_PDB_SUCCESS;
GimpDrawable *drawable;
gdouble radius;
static GimpParam values[1];
GimpRunMode run_mode;
GimpPDBStatusType status = GIMP_PDB_SUCCESS;
GimpDrawable *drawable;
gdouble radius;
run_mode = param[0].data.d_int32;
*nreturn_vals = 1;
*return_vals = values;
*return_vals = values;
INIT_I18N_UI();
values[0].type = GIMP_PDB_STATUS;
values[0].type = GIMP_PDB_STATUS;
values[0].data.d_status = status;
switch (run_mode)
@ -246,9 +246,9 @@ sel_gauss_dialog (void)
NULL);
gtk_signal_connect (GTK_OBJECT (dlg), "destroy",
GTK_SIGNAL_FUNC (gtk_main_quit),
NULL);
g_signal_connect (G_OBJECT (dlg), "destroy",
G_CALLBACK (gtk_main_quit),
NULL);
/* parameter settings */
frame = gtk_frame_new (_("Parameter Settings"));
@ -269,18 +269,18 @@ sel_gauss_dialog (void)
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Blur Radius:"), 1.0, 0.5,
spinbutton, 1, TRUE);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&bvals.radius);
g_signal_connect (G_OBJECT (adj), "value_changed",
G_CALLBACK (gimp_double_adjustment_update),
&bvals.radius);
adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 1,
_("Max. Delta:"), 128, 0,
bvals.maxdelta, 0, 255, 1, 8, 0,
TRUE, 0, 0,
FALSE, FALSE);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (gimp_int_adjustment_update),
&bvals.maxdelta);
g_signal_connect (G_OBJECT (adj), "value_changed",
G_CALLBACK (gimp_int_adjustment_update),
&bvals.maxdelta);
gtk_widget_show (table);
gtk_widget_show (frame);

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

@ -71,10 +71,10 @@
*/
static void query (void);
static void run (gchar *name,
gint nparams,
static void run (gchar *name,
gint nparams,
GimpParam *param,
gint *nreturn_vals,
gint *nreturn_vals,
GimpParam **returm_vals);
static void compute_luts (void);
@ -171,15 +171,15 @@ query (void)
}
static void
run (gchar *name,
gint nparams,
run (gchar *name,
gint nparams,
GimpParam *param,
gint *nreturn_vals,
gint *nreturn_vals,
GimpParam **return_vals)
{
GimpRunMode run_mode; /* Current run mode */
GimpPDBStatusType status; /* Return status */
GimpParam *values; /* Return values */
GimpRunMode run_mode; /* Current run mode */
GimpPDBStatusType status; /* Return status */
GimpParam *values; /* Return values */
/*
* Initialize parameter data...
@ -190,12 +190,12 @@ run (gchar *name,
values = g_new (GimpParam, 1);
values[0].type = GIMP_PDB_STATUS;
values[0].data.d_status = status;
*nreturn_vals = 1;
*return_vals = values;
values[0].type = GIMP_PDB_STATUS;
values[0].data.d_status = status;
/*
* Get drawable information...
*/
@ -532,9 +532,9 @@ sharpen_dialog (void)
g_free (title);
gtk_signal_connect (GTK_OBJECT(dialog), "destroy",
GTK_SIGNAL_FUNC (gtk_main_quit),
NULL);
g_signal_connect (G_OBJECT(dialog), "destroy",
G_CALLBACK (gtk_main_quit),
NULL);
/*
* Top-level table for dialog...
@ -580,9 +580,9 @@ sharpen_dialog (void)
MIN (preview_width, sel_width),
MIN (preview_width, sel_width));
gtk_signal_connect (hscroll_data, "value_changed",
(GtkSignalFunc) preview_scroll_callback,
NULL);
g_signal_connect (G_OBJECT (hscroll_data), "value_changed",
G_CALLBACK (preview_scroll_callback),
NULL);
scrollbar = gtk_hscrollbar_new (GTK_ADJUSTMENT (hscroll_data));
gtk_range_set_update_policy (GTK_RANGE (scrollbar), GTK_UPDATE_CONTINUOUS);
@ -594,9 +594,9 @@ sharpen_dialog (void)
MIN (preview_height, sel_height),
MIN (preview_height, sel_height));
gtk_signal_connect (vscroll_data, "value_changed",
GTK_SIGNAL_FUNC (preview_scroll_callback),
NULL);
g_signal_connect (G_OBJECT (vscroll_data), "value_changed",
G_CALLBACK (preview_scroll_callback),
NULL);
scrollbar = gtk_vscrollbar_new (GTK_ADJUSTMENT (vscroll_data));
gtk_range_set_update_policy (GTK_RANGE (scrollbar), GTK_UPDATE_CONTINUOUS);
@ -625,9 +625,9 @@ sharpen_dialog (void)
sharpen_percent, 1, 99, 1, 10, 0,
TRUE, 0, 0,
NULL, NULL);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (dialog_iscale_update),
&sharpen_percent);
g_signal_connect (G_OBJECT (adj), "value_changed",
G_CALLBACK (dialog_iscale_update),
&sharpen_percent);
gtk_widget_show (dialog);
@ -842,8 +842,7 @@ preview_update (void)
gtk_preview_draw_row (GTK_PREVIEW (preview), image_ptr, 0, y,
preview_width);
gtk_widget_draw (preview, NULL);
gdk_flush ();
gtk_widget_queue_draw (preview);
}
static void

78
plug-ins/common/shift.c
View File

@ -59,11 +59,11 @@ typedef struct
/* Declare local functions.
*/
static void query (void);
static void run (gchar *name,
gint nparams,
GimpParam *param,
gint *nreturn_vals,
GimpParam **return_vals);
static void run (gchar *name,
gint nparams,
GimpParam *param,
gint *nreturn_vals,
GimpParam **return_vals);
static void shift (GimpDrawable *drawable);
@ -72,16 +72,16 @@ static void shift_ok_callback (GtkWidget *widget,
gpointer data);
static GimpTile * shift_pixel (GimpDrawable *drawable,
GimpTile *tile,
gint x1,
gint y1,
gint x2,
gint y2,
gint x,
gint y,
gint *row,
gint *col,
guchar *pixel);
GimpTile *tile,
gint x1,
gint y1,
gint x2,
gint y2,
gint x,
gint y,
gint *row,
gint *col,
guchar *pixel);
/***** Local vars *****/
@ -135,16 +135,16 @@ query (void)
}
static void
run (gchar *name,
gint nparams,
run (gchar *name,
gint nparams,
GimpParam *param,
gint *nreturn_vals,
gint *nreturn_vals,
GimpParam **return_vals)
{
static GimpParam values[1];
GimpDrawable *drawable;
GimpRunMode run_mode;
GimpPDBStatusType status = GIMP_PDB_SUCCESS;
static GimpParam values[1];
GimpDrawable *drawable;
GimpRunMode run_mode;
GimpPDBStatusType status = GIMP_PDB_SUCCESS;
run_mode = param[0].data.d_int32;
@ -152,9 +152,9 @@ run (gchar *name,
drawable = gimp_drawable_get (param[2].data.d_drawable);
*nreturn_vals = 1;
*return_vals = values;
*return_vals = values;
values[0].type = GIMP_PDB_STATUS;
values[0].type = GIMP_PDB_STATUS;
values[0].data.d_status = status;
switch (run_mode)
@ -379,20 +379,24 @@ shift_dialog (void)
NULL);
gtk_signal_connect (GTK_OBJECT (dlg), "destroy",
GTK_SIGNAL_FUNC (gtk_main_quit),
NULL);
g_signal_connect (G_OBJECT (dlg), "destroy",
G_CALLBACK (gtk_main_quit),
NULL);
/* parameter settings */
frame =
gimp_radio_group_new2 (TRUE, _("Parameter Settings"),
G_CALLBACK (gimp_radio_button_update),
&shvals.orientation, (gpointer) shvals.orientation,
frame = gimp_radio_group_new2 (TRUE, _("Parameter Settings"),
G_CALLBACK (gimp_radio_button_update),
&shvals.orientation,
GINT_TO_POINTER (shvals.orientation),
_("Shift Horizontally"), (gpointer) HORIZONTAL, NULL,
_("Shift Vertically"), (gpointer) VERTICAL, NULL,
_("Shift Horizontally"),
GINT_TO_POINTER (HORIZONTAL), NULL,
_("Shift Vertically"),
GINT_TO_POINTER (VERTICAL), NULL,
NULL);
NULL);
gtk_container_set_border_width (GTK_CONTAINER (frame), 6);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), frame, TRUE, TRUE, 0);
@ -413,9 +417,9 @@ shift_dialog (void)
shvals.shift_amount, 0, 200, 1, 10, 0,
TRUE, 0, 0,
NULL, NULL);
gtk_signal_connect (GTK_OBJECT (amount_data), "value_changed",
GTK_SIGNAL_FUNC (gimp_int_adjustment_update),
&shvals.shift_amount);
g_signal_connect (G_OBJECT (amount_data), "value_changed",
G_CALLBACK (gimp_int_adjustment_update),
&shvals.shift_amount);
gtk_widget_show (frame);

7
plug-ins/dbbrowser/plugin-browser.c
View File

@ -28,8 +28,15 @@
#include <string.h>
#include <time.h>
#ifdef __GNUC__
#warning GTK_DISABLE_DEPRECATED
#endif
#undef GTK_DISABLE_DEPRECATED
#include <gtk/gtk.h>
#define GTK_DISABLE_DEPRECATED
#include <libgimp/gimp.h>
#include <libgimp/gimpui.h>