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

General fix for bug #478657: 

2007-09-21  Sven Neumann  <sven@gimp.org>

	General fix for bug #478657:

	* libgimp/gimpaspectpreview.c
	* libgimp/gimpdrawablepreview.c
	* libgimp/gimpzoompreview.c: let all preview widgets store the
	state of the Preview toggle. Declared "toggle" parameter as unused.

	* plug-ins/common/*.c: pass NULL for "toggle" to
	gimp_drawable_preview_new() and gimp_aspect_preview_new().

svn path=/trunk/; revision=23603
This commit is contained in:
Sven Neumann 2007-09-21 13:27:33 +00:00 committed by Sven Neumann
parent 24c7fc1e8d
commit 24c4243f28
34 changed files with 254 additions and 224 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
2007-09-21 Sven Neumann <sven@gimp.org>
General fix for bug #478657:
* libgimp/gimpaspectpreview.c
* libgimp/gimpdrawablepreview.c
* libgimp/gimpzoompreview.c: let all preview widgets store the
state of the Preview toggle. Declared "toggle" parameter as unused.
* plug-ins/common/*.c: pass NULL for "toggle" to
gimp_drawable_preview_new() and gimp_aspect_preview_new().
2007-09-21 Sven Neumann <sven@gimp.org> 2007-09-21 Sven Neumann <sven@gimp.org>
* libgimpwidgets/gimppreview.c: formatting. * libgimpwidgets/gimppreview.c: formatting.

104
libgimp/gimpaspectpreview.c
View File

@ -40,6 +40,16 @@ enum
PROP_DRAWABLE PROP_DRAWABLE
}; };
typedef struct
{
gboolean update;
} PreviewSettings;
static GObject * gimp_aspect_preview_constructor (GType type,
guint n_params,
GObjectConstructParam *params);
static void gimp_aspect_preview_get_property (GObject *object, static void gimp_aspect_preview_get_property (GObject *object,
guint property_id, guint property_id,
@ -49,6 +59,7 @@ static void gimp_aspect_preview_set_property (GObject *object,
guint property_id, guint property_id,
const GValue *value, const GValue *value,
GParamSpec *pspec); GParamSpec *pspec);
static void gimp_aspect_preview_destroy (GtkObject *object);
static void gimp_aspect_preview_style_set (GtkWidget *widget, static void gimp_aspect_preview_style_set (GtkWidget *widget,
GtkStyle *prev_style); GtkStyle *prev_style);
static void gimp_aspect_preview_draw (GimpPreview *preview); static void gimp_aspect_preview_draw (GimpPreview *preview);
@ -74,17 +85,23 @@ G_DEFINE_TYPE (GimpAspectPreview, gimp_aspect_preview, GIMP_TYPE_PREVIEW)
#define parent_class gimp_aspect_preview_parent_class #define parent_class gimp_aspect_preview_parent_class
static gint gimp_aspect_preview_counter = 0;
static void static void
gimp_aspect_preview_class_init (GimpAspectPreviewClass *klass) gimp_aspect_preview_class_init (GimpAspectPreviewClass *klass)
{ {
GObjectClass *object_class = G_OBJECT_CLASS (klass); GObjectClass *object_class = G_OBJECT_CLASS (klass);
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); GtkObjectClass *gtk_object_class = GTK_OBJECT_CLASS (klass);
GimpPreviewClass *preview_class = GIMP_PREVIEW_CLASS (klass); GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
GimpPreviewClass *preview_class = GIMP_PREVIEW_CLASS (klass);
object_class->constructor = gimp_aspect_preview_constructor;
object_class->get_property = gimp_aspect_preview_get_property; object_class->get_property = gimp_aspect_preview_get_property;
object_class->set_property = gimp_aspect_preview_set_property; object_class->set_property = gimp_aspect_preview_set_property;
gtk_object_class->destroy = gimp_aspect_preview_destroy;
widget_class->style_set = gimp_aspect_preview_style_set; widget_class->style_set = gimp_aspect_preview_style_set;
preview_class->draw = gimp_aspect_preview_draw; preview_class->draw = gimp_aspect_preview_draw;
@ -112,6 +129,32 @@ gimp_aspect_preview_init (GimpAspectPreview *preview)
NULL); NULL);
} }
static GObject *
gimp_aspect_preview_constructor (GType type,
guint n_params,
GObjectConstructParam *params)
{
GObject *object;
gchar *data_name;
PreviewSettings settings;
data_name = g_strdup_printf ("%s-aspect-preview-%d",
g_get_prgname (),
gimp_aspect_preview_counter++);
object = G_OBJECT_CLASS (parent_class)->constructor (type, n_params, params);
if (gimp_get_data (data_name, &settings))
{
gimp_preview_set_update (GIMP_PREVIEW (object), settings.update);
}
g_object_set_data_full (object, "gimp-aspect-preview-data-name",
data_name, (GDestroyNotify) g_free);
return object;
}
static void static void
gimp_aspect_preview_get_property (GObject *object, gimp_aspect_preview_get_property (GObject *object,
guint property_id, guint property_id,
@ -153,6 +196,25 @@ gimp_aspect_preview_set_property (GObject *object,
} }
} }
static void
gimp_aspect_preview_destroy (GtkObject *object)
{
const gchar *data_name = g_object_get_data (G_OBJECT (object),
"gimp-aspect-preview-data-name");
if (data_name)
{
GimpPreview *preview = GIMP_PREVIEW (object);
PreviewSettings settings;
settings.update = gimp_preview_get_update (preview);
gimp_set_data (data_name, &settings, sizeof (PreviewSettings));
}
GTK_OBJECT_CLASS (parent_class)->destroy (object);
}
static void static void
gimp_aspect_preview_style_set (GtkWidget *widget, gimp_aspect_preview_style_set (GtkWidget *widget,
GtkStyle *prev_style) GtkStyle *prev_style)
@ -299,46 +361,28 @@ gimp_aspect_preview_set_drawable (GimpAspectPreview *preview,
NULL); NULL);
} }
static void
gimp_aspect_preview_notify_update (GimpPreview *preview,
GParamSpec *pspec,
gboolean *toggle)
{
*toggle = gimp_preview_get_update (preview);
}
/** /**
* gimp_aspect_preview_new: * gimp_aspect_preview_new:
* @drawable: a #GimpDrawable * @drawable: a #GimpDrawable
* @toggle: pointer to a #gboolean variable to sync with the "Preview" * @toggle: unused
* check-button or %NULL
* *
* Creates a new #GimpAspectPreview widget for @drawable. See also * Creates a new #GimpAspectPreview widget for @drawable. See also
* gimp_drawable_preview_new(). * gimp_drawable_preview_new().
* *
* In GIMP 2.2 the @toggle parameter was provided to conviently access
* the state of the "Preview" check-button. This is not any longer
* necessary as the preview itself now stores this state, as well as
* the scroll offset.
*
* Since: GIMP 2.2 * Since: GIMP 2.2
**/ **/
GtkWidget * GtkWidget *
gimp_aspect_preview_new (GimpDrawable *drawable, gimp_aspect_preview_new (GimpDrawable *drawable,
gboolean *toggle) gboolean *toggle)
{ {
GtkWidget *preview;
g_return_val_if_fail (drawable != NULL, NULL); g_return_val_if_fail (drawable != NULL, NULL);
preview = g_object_new (GIMP_TYPE_ASPECT_PREVIEW, return g_object_new (GIMP_TYPE_ASPECT_PREVIEW,
"drawable", drawable, "drawable", drawable,
NULL); NULL);
if (toggle)
{
gimp_preview_set_update (GIMP_PREVIEW (preview), *toggle);
g_signal_connect (preview, "notify::update",
G_CALLBACK (gimp_aspect_preview_notify_update),
toggle);
}
return preview;
} }

87
libgimp/gimpdrawablepreview.c
View File

@ -42,8 +42,9 @@ enum
typedef struct typedef struct
{ {
gint x, y; gint x;
gboolean update; gint y;
gboolean update;
} PreviewSettings; } PreviewSettings;
@ -82,6 +83,8 @@ G_DEFINE_TYPE (GimpDrawablePreview, gimp_drawable_preview,
#define parent_class gimp_drawable_preview_parent_class #define parent_class gimp_drawable_preview_parent_class
static gint gimp_drawable_preview_counter = 0;
static void static void
gimp_drawable_preview_class_init (GimpDrawablePreviewClass *klass) gimp_drawable_preview_class_init (GimpDrawablePreviewClass *klass)
@ -129,16 +132,24 @@ gimp_drawable_preview_constructor (GType type,
GObjectConstructParam *params) GObjectConstructParam *params)
{ {
GObject *object; GObject *object;
gchar *data_name;
PreviewSettings settings; PreviewSettings settings;
gchar *data_name = g_strconcat (g_get_prgname (), "-preview", NULL);
data_name = g_strdup_printf ("%s-drawable-preview-%d",
g_get_prgname (),
++gimp_drawable_preview_counter);
object = G_OBJECT_CLASS (parent_class)->constructor (type, n_params, params); object = G_OBJECT_CLASS (parent_class)->constructor (type, n_params, params);
if (gimp_get_data (data_name, &settings)) if (gimp_get_data (data_name, &settings))
gimp_scrolled_preview_set_position (GIMP_SCROLLED_PREVIEW (object), {
settings.x, settings.y); gimp_preview_set_update (GIMP_PREVIEW (object), settings.update);
gimp_scrolled_preview_set_position (GIMP_SCROLLED_PREVIEW (object),
settings.x, settings.y);
}
g_free (data_name); g_object_set_data_full (object, "gimp-drawable-preview-data-name",
data_name, (GDestroyNotify) g_free);
return object; return object;
} }
@ -188,17 +199,20 @@ gimp_drawable_preview_set_property (GObject *object,
static void static void
gimp_drawable_preview_destroy (GtkObject *object) gimp_drawable_preview_destroy (GtkObject *object)
{ {
GimpPreview *preview = GIMP_PREVIEW (object); const gchar *data_name = g_object_get_data (G_OBJECT (object),
PreviewSettings settings; "gimp-drawable-preview-data-name");
gchar *data_name;
settings.x = preview->xoff + preview->xmin; if (data_name)
settings.y = preview->yoff + preview->ymin; {
settings.update = TRUE; GimpPreview *preview = GIMP_PREVIEW (object);
PreviewSettings settings;
data_name = g_strconcat (g_get_prgname (), "-preview", NULL); settings.x = preview->xoff + preview->xmin;
gimp_set_data (data_name, &settings, sizeof (PreviewSettings)); settings.y = preview->yoff + preview->ymin;
g_free (data_name); settings.update = gimp_preview_get_update (preview);
gimp_set_data (data_name, &settings, sizeof (PreviewSettings));
}
GTK_OBJECT_CLASS (parent_class)->destroy (object); GTK_OBJECT_CLASS (parent_class)->destroy (object);
} }
@ -521,26 +535,17 @@ _gimp_drawable_preview_get_bounds (GimpDrawable *drawable,
} }
static void
gimp_drawable_preview_notify_update (GimpPreview *preview,
GParamSpec *pspec,
gboolean *toggle)
{
*toggle = gimp_preview_get_update (preview);
}
/** /**
* gimp_drawable_preview_new: * gimp_drawable_preview_new:
* @drawable: a #GimpDrawable * @drawable: a #GimpDrawable
* @toggle: pointer to a #gboolean variable to sync with the "Preview" * @toggle: unused
* check-button or %NULL
* *
* Creates a new #GimpDrawablePreview widget for @drawable. If * Creates a new #GimpDrawablePreview widget for @drawable.
* updating the preview takes considerable time, you will want to *
* store the state of the "Preview" check-button in the plug-in * In GIMP 2.2 the @toggle parameter was provided to conviently access
* data. For convenience you can pass a pointer to the #gboolean as * the state of the "Preview" check-button. This is not any longer
* @toggle. * necessary as the preview itself now stores this state, as well as
* the scroll offset.
* *
* Returns: A pointer to the new #GimpDrawablePreview widget. * Returns: A pointer to the new #GimpDrawablePreview widget.
* *
@ -550,25 +555,11 @@ GtkWidget *
gimp_drawable_preview_new (GimpDrawable *drawable, gimp_drawable_preview_new (GimpDrawable *drawable,
gboolean *toggle) gboolean *toggle)
{ {
GtkWidget *preview;
g_return_val_if_fail (drawable != NULL, NULL); g_return_val_if_fail (drawable != NULL, NULL);
preview = g_object_new (GIMP_TYPE_DRAWABLE_PREVIEW, return g_object_new (GIMP_TYPE_DRAWABLE_PREVIEW,
"drawable", drawable, "drawable", drawable,
NULL); NULL);
if (toggle)
{
gimp_preview_set_update (GIMP_PREVIEW (preview), *toggle);
g_signal_connect (preview, "notify::update",
G_CALLBACK (gimp_drawable_preview_notify_update),
toggle);
}
return preview;
} }
/** /**

50
libgimp/gimpzoompreview.c
View File

@ -48,6 +48,11 @@ typedef struct GimpZoomPreviewPrivate
GdkRectangle extents; GdkRectangle extents;
} GimpZoomPreviewPrivate; } GimpZoomPreviewPrivate;
typedef struct
{
gboolean update;
} PreviewSettings;
#define GIMP_ZOOM_PREVIEW_GET_PRIVATE(obj) \ #define GIMP_ZOOM_PREVIEW_GET_PRIVATE(obj) \
((GimpZoomPreviewPrivate *) ((GimpZoomPreview *) (obj))->priv) ((GimpZoomPreviewPrivate *) ((GimpZoomPreview *) (obj))->priv)
@ -65,6 +70,7 @@ static void gimp_zoom_preview_set_property (GObject *object,
const GValue *value, const GValue *value,
GParamSpec *pspec); GParamSpec *pspec);
static void gimp_zoom_preview_finalize (GObject *object); static void gimp_zoom_preview_finalize (GObject *object);
static void gimp_zoom_preview_destroy (GtkObject *object);
static void gimp_zoom_preview_set_adjustments (GimpZoomPreview *preview, static void gimp_zoom_preview_set_adjustments (GimpZoomPreview *preview,
gdouble old_factor, gdouble old_factor,
@ -113,19 +119,24 @@ G_DEFINE_TYPE (GimpZoomPreview, gimp_zoom_preview, GIMP_TYPE_SCROLLED_PREVIEW)
#define parent_class gimp_zoom_preview_parent_class #define parent_class gimp_zoom_preview_parent_class
static gint gimp_zoom_preview_counter = 0;
static void static void
gimp_zoom_preview_class_init (GimpZoomPreviewClass *klass) gimp_zoom_preview_class_init (GimpZoomPreviewClass *klass)
{ {
GObjectClass *object_class = G_OBJECT_CLASS (klass); GObjectClass *object_class = G_OBJECT_CLASS (klass);
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); GtkObjectClass *gtk_object_class = GTK_OBJECT_CLASS (klass);
GimpPreviewClass *preview_class = GIMP_PREVIEW_CLASS (klass); GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
GimpPreviewClass *preview_class = GIMP_PREVIEW_CLASS (klass);
object_class->constructor = gimp_zoom_preview_constructor; object_class->constructor = gimp_zoom_preview_constructor;
object_class->get_property = gimp_zoom_preview_get_property; object_class->get_property = gimp_zoom_preview_get_property;
object_class->set_property = gimp_zoom_preview_set_property; object_class->set_property = gimp_zoom_preview_set_property;
object_class->finalize = gimp_zoom_preview_finalize; object_class->finalize = gimp_zoom_preview_finalize;
gtk_object_class->destroy = gimp_zoom_preview_destroy;
widget_class->style_set = gimp_zoom_preview_style_set; widget_class->style_set = gimp_zoom_preview_style_set;
preview_class->draw = gimp_zoom_preview_draw; preview_class->draw = gimp_zoom_preview_draw;
@ -193,9 +204,23 @@ gimp_zoom_preview_constructor (GType type,
{ {
GimpZoomPreviewPrivate *priv; GimpZoomPreviewPrivate *priv;
GObject *object; GObject *object;
gchar *data_name;
PreviewSettings settings;
data_name = g_strdup_printf ("%s-zoom-preview-%d",
g_get_prgname (),
gimp_zoom_preview_counter++);
object = G_OBJECT_CLASS (parent_class)->constructor (type, n_params, params); object = G_OBJECT_CLASS (parent_class)->constructor (type, n_params, params);
if (gimp_get_data (data_name, &settings))
{
gimp_preview_set_update (GIMP_PREVIEW (object), settings.update);
}
g_object_set_data_full (object, "gimp-zoom-preview-data-name",
data_name, (GDestroyNotify) g_free);
priv = GIMP_ZOOM_PREVIEW_GET_PRIVATE (object); priv = GIMP_ZOOM_PREVIEW_GET_PRIVATE (object);
if (! priv->model) if (! priv->model)
@ -275,6 +300,25 @@ gimp_zoom_preview_finalize (GObject *object)
G_OBJECT_CLASS (parent_class)->finalize (object); G_OBJECT_CLASS (parent_class)->finalize (object);
} }
static void
gimp_zoom_preview_destroy (GtkObject *object)
{
const gchar *data_name = g_object_get_data (G_OBJECT (object),
"gimp-zoom-preview-data-name");
if (data_name)
{
GimpPreview *preview = GIMP_PREVIEW (object);
PreviewSettings settings;
settings.update = gimp_preview_get_update (preview);
gimp_set_data (data_name, &settings, sizeof (PreviewSettings));
}
GTK_OBJECT_CLASS (parent_class)->destroy (object);
}
static void static void
gimp_zoom_preview_set_adjustments (GimpZoomPreview *preview, gimp_zoom_preview_set_adjustments (GimpZoomPreview *preview,
gdouble old_factor, gdouble old_factor,

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

@ -44,7 +44,6 @@ typedef struct
gdouble mask_radius; gdouble mask_radius;
gdouble threshold; gdouble threshold;
gdouble pct_black; gdouble pct_black;
gboolean update_preview;
} CartoonVals; } CartoonVals;
@ -100,8 +99,7 @@ static CartoonVals cvals =
{ {
7.0, /* mask_radius */ 7.0, /* mask_radius */
1.0, /* threshold */ 1.0, /* threshold */
0.2, /* pct_black */ 0.2 /* pct_black */
TRUE /* update_preview */
}; };
@ -829,7 +827,7 @@ cartoon_dialog (GimpDrawable *drawable)
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox);
gtk_widget_show (main_vbox); gtk_widget_show (main_vbox);
preview = gimp_drawable_preview_new (drawable, &cvals.update_preview); preview = gimp_drawable_preview_new (drawable, NULL);
gtk_box_pack_start (GTK_BOX (main_vbox), preview, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (main_vbox), preview, TRUE, TRUE, 0);
gtk_widget_show (preview); gtk_widget_show (preview);

6
plug-ins/common/colortoalpha.c
View File

@ -38,7 +38,6 @@
typedef struct typedef struct
{ {
GimpRGB color; GimpRGB color;
gboolean preview;
} C2AValues; } C2AValues;
@ -74,8 +73,7 @@ const GimpPlugInInfo PLUG_IN_INFO =
static C2AValues pvals = static C2AValues pvals =
{ {
{ 1.0, 1.0, 1.0, 1.0 }, /* white default */ { 1.0, 1.0, 1.0, 1.0 } /* white default */
TRUE /* preview */
}; };
@ -397,7 +395,7 @@ color_to_alpha_dialog (GimpDrawable *drawable)
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox);
gtk_widget_show (main_vbox); gtk_widget_show (main_vbox);
preview = gimp_drawable_preview_new (drawable, &pvals.preview); preview = gimp_drawable_preview_new (drawable, NULL);
gtk_box_pack_start_defaults (GTK_BOX (main_vbox), preview); gtk_box_pack_start_defaults (GTK_BOX (main_vbox), preview);
gtk_widget_show (preview); gtk_widget_show (preview);
g_signal_connect (preview, "invalidated", g_signal_connect (preview, "invalidated",

6
plug-ins/common/deinterlace.c
View File

@ -42,7 +42,6 @@ enum
typedef struct typedef struct
{ {
gint evenness; gint evenness;
gboolean preview;
} DeinterlaceValues; } DeinterlaceValues;
@ -72,8 +71,7 @@ const GimpPlugInInfo PLUG_IN_INFO =
static DeinterlaceValues devals = static DeinterlaceValues devals =
{ {
EVEN_FIELDS, /* evenness */ EVEN_FIELDS /* evenness */
TRUE /* preview */
}; };
MAIN () MAIN ()
@ -345,7 +343,7 @@ deinterlace_dialog (GimpDrawable *drawable)
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox);
gtk_widget_show (main_vbox); gtk_widget_show (main_vbox);
preview = gimp_drawable_preview_new (drawable, &devals.preview); preview = gimp_drawable_preview_new (drawable, NULL);
gtk_box_pack_start_defaults (GTK_BOX (main_vbox), preview); gtk_box_pack_start_defaults (GTK_BOX (main_vbox), preview);
gtk_widget_show (preview); gtk_widget_show (preview);
g_signal_connect_swapped (preview, "invalidated", g_signal_connect_swapped (preview, "invalidated",

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

@ -48,7 +48,6 @@
#define filter_type (despeckle_vals[1]) /* filter type */ #define filter_type (despeckle_vals[1]) /* filter type */
#define black_level (despeckle_vals[2]) /* Black level */ #define black_level (despeckle_vals[2]) /* Black level */
#define white_level (despeckle_vals[3]) /* White level */ #define white_level (despeckle_vals[3]) /* White level */
#define update_toggle (despeckle_vals[4]) /* Update the preview? */
#define VALUE_SWAP(a,b) \ #define VALUE_SWAP(a,b) \
{ register gdouble t = (a); (a) = (b); (b) = t; } { register gdouble t = (a); (a) = (b); (b) = t; }
@ -111,13 +110,12 @@ static GtkWidget *preview; /* Preview widget */
static GimpDrawable *drawable = NULL; /* Current drawable */ static GimpDrawable *drawable = NULL; /* Current drawable */
static gint despeckle_vals[7] = static gint despeckle_vals[4] =
{ {
3, /* Default value for the diameter */ 3, /* Default value for the diameter */
FILTER_ADAPTIVE, /* Default value for the filter type */ FILTER_ADAPTIVE, /* Default value for the filter type */
7, /* Default value for the black level */ 7, /* Default value for the black level */
248, /* Default value for the white level */ 248 /* Default value for the white level */
TRUE /* Default value for the update toggle */
}; };
@ -414,7 +412,7 @@ despeckle_dialog (void)
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox);
gtk_widget_show (main_vbox); gtk_widget_show (main_vbox);
preview = gimp_drawable_preview_new (drawable, &update_toggle); preview = gimp_drawable_preview_new (drawable, NULL);
gtk_box_pack_start (GTK_BOX (main_vbox), preview, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (main_vbox), preview, TRUE, TRUE, 0);
gtk_widget_show (preview); gtk_widget_show (preview);

6
plug-ins/common/displace.c
View File

@ -77,7 +77,6 @@ typedef struct
gint displace_map_y; gint displace_map_y;
gint displace_type; gint displace_type;
DisplaceMode mode; DisplaceMode mode;
gboolean preview;
} DisplaceVals; } DisplaceVals;
@ -128,8 +127,7 @@ static DisplaceVals dvals =
-1, /* displace_map_x */ -1, /* displace_map_x */
-1, /* displace_map_y */ -1, /* displace_map_y */
GIMP_PIXEL_FETCHER_EDGE_WRAP, /* displace_type */ GIMP_PIXEL_FETCHER_EDGE_WRAP, /* displace_type */
CARTESIAN_MODE, /* mode */ CARTESIAN_MODE /* mode */
TRUE
}; };
@ -346,7 +344,7 @@ displace_dialog (GimpDrawable *drawable)
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox);
gtk_widget_show (main_vbox); gtk_widget_show (main_vbox);
preview = gimp_drawable_preview_new (drawable, &dvals.preview); preview = gimp_drawable_preview_new (drawable, NULL);
gtk_box_pack_start (GTK_BOX (main_vbox), preview, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (main_vbox), preview, TRUE, TRUE, 0);
gtk_widget_show (preview); gtk_widget_show (preview);
g_signal_connect_swapped (preview, "invalidated", g_signal_connect_swapped (preview, "invalidated",

6
plug-ins/common/dog.c
View File

@ -45,7 +45,6 @@ typedef struct
gdouble outer; gdouble outer;
gboolean normalize; gboolean normalize;
gboolean invert; gboolean invert;
gboolean preview;
} DoGValues; } DoGValues;
@ -111,8 +110,7 @@ static DoGValues dogvals =
3.0, /* inner radius */ 3.0, /* inner radius */
1.0, /* outer radius */ 1.0, /* outer radius */
TRUE, /* normalize */ TRUE, /* normalize */
TRUE, /* invert */ TRUE /* invert */
TRUE, /* preview */
}; };
MAIN () MAIN ()
@ -298,7 +296,7 @@ dog_dialog (gint32 image_ID,
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox);
gtk_widget_show (main_vbox); gtk_widget_show (main_vbox);
preview = gimp_drawable_preview_new (drawable, &dogvals.preview); preview = gimp_drawable_preview_new (drawable, NULL);
gtk_box_pack_start_defaults (GTK_BOX (main_vbox), preview); gtk_box_pack_start_defaults (GTK_BOX (main_vbox), preview);
gtk_widget_show (preview); gtk_widget_show (preview);
g_signal_connect (preview, "invalidated", g_signal_connect (preview, "invalidated",

6
plug-ins/common/edge.c
View File

@ -81,7 +81,6 @@ typedef struct
gdouble amount; gdouble amount;
gint edgemode; gint edgemode;
gint wrapmode; gint wrapmode;
gboolean update_preview;
} EdgeVals; } EdgeVals;
/* /*
@ -122,8 +121,7 @@ static EdgeVals evals =
{ {
2.0, /* amount */ 2.0, /* amount */
SOBEL, /* Edge detection algorithm */ SOBEL, /* Edge detection algorithm */
GIMP_PIXEL_FETCHER_EDGE_SMEAR, /* wrapmode */ GIMP_PIXEL_FETCHER_EDGE_SMEAR /* wrapmode */
TRUE /* update_preview */
}; };
/***** Functions *****/ /***** Functions *****/
@ -653,7 +651,7 @@ edge_dialog (GimpDrawable *drawable)
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox);
gtk_widget_show (main_vbox); gtk_widget_show (main_vbox);
preview = gimp_drawable_preview_new (drawable, &evals.update_preview); preview = gimp_drawable_preview_new (drawable, NULL);
gtk_box_pack_start_defaults (GTK_BOX (main_vbox), preview); gtk_box_pack_start_defaults (GTK_BOX (main_vbox), preview);
gtk_widget_show (preview); gtk_widget_show (preview);
g_signal_connect (preview, "invalidated", g_signal_connect (preview, "invalidated",

6
plug-ins/common/emboss.c
View File

@ -50,7 +50,6 @@ typedef struct
gdouble elevation; gdouble elevation;
gint32 depth; gint32 depth;
gint32 embossp; gint32 embossp;
gboolean preview;
} piArgs; } piArgs;
static piArgs evals = static piArgs evals =
@ -58,8 +57,7 @@ static piArgs evals =
30.0, /* azimuth */ 30.0, /* azimuth */
45.0, /* elevation */ 45.0, /* elevation */
20, /* depth */ 20, /* depth */
1, /* emboss */ 1 /* emboss */
TRUE /* preview */
}; };
struct embossFilter struct embossFilter
@ -466,7 +464,7 @@ emboss_dialog (GimpDrawable *drawable)
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox);
gtk_widget_show (main_vbox); gtk_widget_show (main_vbox);
preview = gimp_drawable_preview_new (drawable, &evals.preview); preview = gimp_drawable_preview_new (drawable, NULL);
gtk_box_pack_start_defaults (GTK_BOX (main_vbox), preview); gtk_box_pack_start_defaults (GTK_BOX (main_vbox), preview);
gtk_widget_show (preview); gtk_widget_show (preview);
g_signal_connect_swapped (preview, "invalidated", g_signal_connect_swapped (preview, "invalidated",

6
plug-ins/common/engrave.c
View File

@ -37,7 +37,6 @@ typedef struct
{ {
gint height; gint height;
gboolean limit; gboolean limit;
gboolean preview;
} EngraveValues; } EngraveValues;
static void query (void); static void query (void);
@ -81,8 +80,7 @@ const GimpPlugInInfo PLUG_IN_INFO =
static EngraveValues pvals = static EngraveValues pvals =
{ {
10, /* height */ 10, /* height */
FALSE, /* limit */ FALSE /* limit */
TRUE /* preview */
}; };
MAIN () MAIN ()
@ -229,7 +227,7 @@ engrave_dialog (GimpDrawable *drawable)
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox);
gtk_widget_show (main_vbox); gtk_widget_show (main_vbox);
preview = gimp_drawable_preview_new (drawable, &pvals.preview); preview = gimp_drawable_preview_new (drawable, NULL);
gtk_box_pack_start_defaults (GTK_BOX (main_vbox), preview); gtk_box_pack_start_defaults (GTK_BOX (main_vbox), preview);
gtk_widget_show (preview); gtk_widget_show (preview);
g_signal_connect_swapped (preview, "invalidated", g_signal_connect_swapped (preview, "invalidated",

6
plug-ins/common/exchange.c
View File

@ -55,7 +55,6 @@ typedef struct
GimpRGB from; GimpRGB from;
GimpRGB to; GimpRGB to;
GimpRGB threshold; GimpRGB threshold;
gboolean preview;
} myParams; } myParams;
/* lets prototype */ /* lets prototype */
@ -81,8 +80,7 @@ static myParams xargs =
{ {
{ 0.0, 0.0, 0.0, 1.0 }, /* from */ { 0.0, 0.0, 0.0, 1.0 }, /* from */
{ 0.0, 0.0, 0.0, 1.0 }, /* to */ { 0.0, 0.0, 0.0, 1.0 }, /* to */
{ 0.0, 0.0, 0.0, 1.0 }, /* threshold */ { 0.0, 0.0, 0.0, 1.0 } /* threshold */
TRUE /* preview */
}; };
static GtkWidget *from_colorbutton; static GtkWidget *from_colorbutton;
@ -312,7 +310,7 @@ exchange_dialog (GimpDrawable *drawable)
gtk_box_pack_start_defaults (GTK_BOX (main_vbox), frame); gtk_box_pack_start_defaults (GTK_BOX (main_vbox), frame);
gtk_widget_show (frame); gtk_widget_show (frame);
preview = gimp_drawable_preview_new (drawable, &xargs.preview); preview = gimp_drawable_preview_new (drawable, NULL);
gtk_container_add (GTK_CONTAINER (frame), preview); gtk_container_add (GTK_CONTAINER (frame), preview);
gtk_widget_show (preview); gtk_widget_show (preview);

4
plug-ins/common/glasstile.c
View File

@ -57,7 +57,6 @@ typedef struct
{ {
gint xblock; gint xblock;
gint yblock; gint yblock;
gboolean preview;
/* interface only */ /* interface only */
gint constrain; gint constrain;
} GlassValues; } GlassValues;
@ -101,7 +100,6 @@ static GlassValues gtvals =
{ {
20, /* tile width */ 20, /* tile width */
20, /* tile height */ 20, /* tile height */
TRUE, /* preview */
/* interface only */ /* interface only */
TRUE /* constrained */ TRUE /* constrained */
}; };
@ -270,7 +268,7 @@ glasstile_dialog (GimpDrawable *drawable)
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox);
gtk_widget_show (main_vbox); gtk_widget_show (main_vbox);
preview = gimp_drawable_preview_new (drawable, &gtvals.preview); preview = gimp_drawable_preview_new (drawable, NULL);
gtk_box_pack_start_defaults (GTK_BOX (main_vbox), preview); gtk_box_pack_start_defaults (GTK_BOX (main_vbox), preview);
gtk_widget_show (preview); gtk_widget_show (preview);
g_signal_connect_swapped (preview, "invalidated", g_signal_connect_swapped (preview, "invalidated",

17
plug-ins/common/mblur.c
View File

@ -65,9 +65,9 @@ typedef struct
gdouble center_x; gdouble center_x;
gdouble center_y; gdouble center_y;
gboolean blur_outward; gboolean blur_outward;
gboolean preview;
} mblur_vals_t; } mblur_vals_t;
/***** Prototypes *****/ /***** Prototypes *****/
static void query (void); static void query (void);
@ -113,13 +113,12 @@ const GimpPlugInInfo PLUG_IN_INFO =
static mblur_vals_t mbvals = static mblur_vals_t mbvals =
{ {
MBLUR_LINEAR, /* mblur_type */ MBLUR_LINEAR, /* mblur_type */
5, /* length */ 5, /* length */
10, /* radius */ 10, /* radius */
100000.0, /* center_x */ 100000.0, /* center_x */
100000.0, /* center_y */ 100000.0, /* center_y */
TRUE, /* blur_outward */ TRUE /* blur_outward */
TRUE /* preview */
}; };
@ -1018,7 +1017,7 @@ mblur_dialog (gint32 image_ID,
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox);
gtk_widget_show (main_vbox); gtk_widget_show (main_vbox);
preview = gimp_drawable_preview_new (drawable, &mbvals.preview); preview = gimp_drawable_preview_new (drawable, NULL);
gtk_box_pack_start (GTK_BOX (main_vbox), preview, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (main_vbox), preview, TRUE, TRUE, 0);
gtk_widget_show (preview); gtk_widget_show (preview);

6
plug-ins/common/mosaic.c
View File

@ -92,7 +92,6 @@ typedef struct
TileType tile_type; TileType tile_type;
gint tile_surface; gint tile_surface;
gint grout_color; gint grout_color;
gboolean update_preview;
} MosaicVals; } MosaicVals;
@ -320,8 +319,7 @@ static MosaicVals mvals =
1, /* color_averaging */ 1, /* color_averaging */
HEXAGONS, /* tile_type */ HEXAGONS, /* tile_type */
SMOOTH, /* tile_surface */ SMOOTH, /* tile_surface */
BW, /* grout_color */ BW /* grout_color */
TRUE /* preview */
}; };
const GimpPlugInInfo PLUG_IN_INFO = const GimpPlugInInfo PLUG_IN_INFO =
@ -611,7 +609,7 @@ mosaic_dialog (GimpDrawable *drawable)
gtk_widget_show (main_vbox); gtk_widget_show (main_vbox);
/* A preview */ /* A preview */
preview = gimp_drawable_preview_new (drawable, &mvals.update_preview); preview = gimp_drawable_preview_new (drawable, NULL);
gtk_box_pack_start (GTK_BOX (main_vbox), preview, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (main_vbox), preview, TRUE, TRUE, 0);
gtk_widget_show (preview); gtk_widget_show (preview);
g_signal_connect_swapped (preview, "invalidated", g_signal_connect_swapped (preview, "invalidated",

6
plug-ins/common/newsprint.c
View File

@ -222,7 +222,6 @@ typedef struct
gdouble input_spi; /* input samples per inch */ gdouble input_spi; /* input samples per inch */
gdouble output_lpi; /* desired output lines per inch */ gdouble output_lpi; /* desired output lines per inch */
gboolean lock_channels; /* changes to one channel affect all */ gboolean lock_channels; /* changes to one channel affect all */
gboolean preview;
} NewsprintUIValues; } NewsprintUIValues;
@ -306,8 +305,7 @@ static const NewsprintUIValues factory_defaults_ui =
{ {
72, /* input spi */ 72, /* input spi */
7.2, /* output lpi */ 7.2, /* output lpi */
FALSE, /* lock channels */ FALSE /* lock channels */
TRUE /* preview */
}; };
/* Mutable copy for normal use. Initialised in run(). */ /* Mutable copy for normal use. Initialised in run(). */
@ -1217,7 +1215,7 @@ newsprint_dialog (GimpDrawable *drawable)
gtk_box_pack_end (GTK_BOX (hbox), vbox, FALSE, FALSE, 0); gtk_box_pack_end (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
gtk_widget_show (vbox); gtk_widget_show (vbox);
preview = gimp_drawable_preview_new (drawable, &pvals_ui.preview); preview = gimp_drawable_preview_new (drawable, NULL);
gtk_box_pack_start_defaults (GTK_BOX (hbox), preview); gtk_box_pack_start_defaults (GTK_BOX (hbox), preview);
gtk_widget_show (preview); gtk_widget_show (preview);
g_signal_connect_swapped (preview, "invalidated", g_signal_connect_swapped (preview, "invalidated",

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

@ -47,7 +47,6 @@ typedef struct
gdouble alpha; gdouble alpha;
gdouble radius; gdouble radius;
gint filter; gint filter;
gboolean preview;
} NLFilterValues; } NLFilterValues;
typedef enum typedef enum
@ -61,8 +60,7 @@ static NLFilterValues nlfvals =
{ {
0.3, 0.3,
0.3, 0.3,
0, 0
TRUE
}; };
/* function protos */ /* function protos */
@ -1035,7 +1033,7 @@ nlfilter_dialog (GimpDrawable *drawable)
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox);
gtk_widget_show (main_vbox); gtk_widget_show (main_vbox);
preview = gimp_drawable_preview_new (drawable, &nlfvals.preview); preview = gimp_drawable_preview_new (drawable, NULL);
gtk_box_pack_start_defaults (GTK_BOX (main_vbox), preview); gtk_box_pack_start_defaults (GTK_BOX (main_vbox), preview);
gtk_widget_show (preview); gtk_widget_show (preview);
g_signal_connect_swapped (preview, "invalidated", g_signal_connect_swapped (preview, "invalidated",

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

@ -51,7 +51,6 @@ typedef struct
gboolean use_exponent_map; gboolean use_exponent_map;
gint exponent_map; gint exponent_map;
gint mode; gint mode;
gboolean preview;
} OilifyVals; } OilifyVals;
@ -86,8 +85,7 @@ static OilifyVals ovals =
8.0, /* exponent */ 8.0, /* exponent */
FALSE, /* use exponent map? */ FALSE, /* use exponent map? */
-1, /* exponent map */ -1, /* exponent map */
MODE_INTEN, /* mode */ MODE_INTEN /* mode */
TRUE /* preview */
}; };
@ -794,7 +792,7 @@ oilify_dialog (GimpDrawable *drawable)
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox);
gtk_widget_show (main_vbox); gtk_widget_show (main_vbox);
preview = gimp_drawable_preview_new (drawable, &ovals.preview); preview = gimp_drawable_preview_new (drawable, NULL);
gtk_box_pack_start (GTK_BOX (main_vbox), preview, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (main_vbox), preview, TRUE, TRUE, 0);
gtk_widget_show (preview); gtk_widget_show (preview);
g_signal_connect_swapped (preview, "invalidated", g_signal_connect_swapped (preview, "invalidated",

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

@ -50,7 +50,6 @@ typedef struct
gdouble threshold; gdouble threshold;
gdouble pct_black; gdouble pct_black;
gdouble pct_white; gdouble pct_white;
gboolean update_preview;
} PhotocopyVals; } PhotocopyVals;
@ -107,8 +106,7 @@ static PhotocopyVals pvals =
0.8, /* sharpness */ 0.8, /* sharpness */
0.75, /* threshold */ 0.75, /* threshold */
0.2, /* pct_black */ 0.2, /* pct_black */
0.2, /* pct_white */ 0.2 /* pct_white */
TRUE /* update_preview */
}; };
@ -857,7 +855,7 @@ photocopy_dialog (GimpDrawable *drawable)
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox);
gtk_widget_show (main_vbox); gtk_widget_show (main_vbox);
preview = gimp_drawable_preview_new (drawable, &pvals.update_preview); preview = gimp_drawable_preview_new (drawable, NULL);
gtk_box_pack_start (GTK_BOX (main_vbox), preview, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (main_vbox), preview, TRUE, TRUE, 0);
gtk_widget_show (preview); gtk_widget_show (preview);

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

@ -78,7 +78,6 @@ typedef struct
guint32 seed; guint32 seed;
gdouble turbulence; gdouble turbulence;
gboolean random_seed; gboolean random_seed;
gboolean preview;
} PlasmaValues; } PlasmaValues;
@ -142,8 +141,7 @@ static PlasmaValues pvals =
{ {
0, /* seed */ 0, /* seed */
1.0, /* turbulence */ 1.0, /* turbulence */
FALSE, /* Use random seed */ FALSE /* Use random seed */
TRUE /* preview */
}; };
/* /*
@ -320,7 +318,7 @@ plasma_dialog (GimpDrawable *drawable)
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox);
gtk_widget_show (main_vbox); gtk_widget_show (main_vbox);
preview = gimp_aspect_preview_new (drawable, &pvals.preview); preview = gimp_aspect_preview_new (drawable, NULL);
gtk_box_pack_start_defaults (GTK_BOX (main_vbox), preview); gtk_box_pack_start_defaults (GTK_BOX (main_vbox), preview);
gtk_widget_show (preview); gtk_widget_show (preview);
g_signal_connect_swapped (preview, "invalidated", g_signal_connect_swapped (preview, "invalidated",

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

@ -57,7 +57,6 @@ typedef struct
gint waveform; gint waveform;
gboolean antialias; gboolean antialias;
gboolean tile; gboolean tile;
gboolean preview;
} RippleValues; } RippleValues;
@ -100,8 +99,7 @@ static RippleValues rvals =
WRAP, /* edges */ WRAP, /* edges */
SINE, /* waveform */ SINE, /* waveform */
TRUE, /* antialias */ TRUE, /* antialias */
FALSE, /* tile */ FALSE /* tile */
TRUE /* preview */
}; };
/***** Functions *****/ /***** Functions *****/
@ -487,7 +485,7 @@ ripple_dialog (GimpDrawable *drawable)
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox);
gtk_widget_show (main_vbox); gtk_widget_show (main_vbox);
preview = gimp_drawable_preview_new (drawable, &rvals.preview); preview = gimp_drawable_preview_new (drawable, NULL);
gtk_box_pack_start_defaults (GTK_BOX (main_vbox), preview); gtk_box_pack_start_defaults (GTK_BOX (main_vbox), preview);
gtk_widget_show (preview); gtk_widget_show (preview);
g_signal_connect_swapped (preview, "invalidated", g_signal_connect_swapped (preview, "invalidated",

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

@ -73,7 +73,6 @@ typedef struct
gint hue_distance; gint hue_distance;
gint saturation_distance; gint saturation_distance;
gint value_distance; gint value_distance;
gboolean preview;
} ValueType; } ValueType;
static ValueType VALS = static ValueType VALS =
@ -81,8 +80,7 @@ static ValueType VALS =
2, 2,
3, 3,
10, 10,
10, 10
TRUE
}; };
MAIN () MAIN ()
@ -381,7 +379,7 @@ scatter_hsv_dialog (GimpDrawable *drawable)
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox);
gtk_widget_show (main_vbox); gtk_widget_show (main_vbox);
preview = gimp_drawable_preview_new (drawable, &VALS.preview); preview = gimp_drawable_preview_new (drawable, NULL);
gtk_box_pack_start_defaults (GTK_BOX (main_vbox), preview); gtk_box_pack_start_defaults (GTK_BOX (main_vbox), preview);
gtk_widget_show (preview); gtk_widget_show (preview);

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

@ -53,7 +53,6 @@ typedef struct
{ {
gdouble radius; gdouble radius;
gint maxdelta; gint maxdelta;
gboolean update_preview;
} BlurValues; } BlurValues;
@ -84,8 +83,7 @@ const GimpPlugInInfo PLUG_IN_INFO =
static BlurValues bvals = static BlurValues bvals =
{ {
5.0, /* radius */ 5.0, /* radius */
50, /* maxdelta */ 50 /* maxdelta */
TRUE /* update_preview */
}; };
MAIN () MAIN ()
@ -252,7 +250,7 @@ sel_gauss_dialog (GimpDrawable *drawable)
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox);
gtk_widget_show (main_vbox); gtk_widget_show (main_vbox);
preview = gimp_drawable_preview_new (drawable, &bvals.update_preview); preview = gimp_drawable_preview_new (drawable, NULL);
gtk_box_pack_start (GTK_BOX (main_vbox), preview, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (main_vbox), preview, TRUE, TRUE, 0);
gtk_widget_show (preview); gtk_widget_show (preview);

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

@ -84,14 +84,12 @@ const GimpPlugInInfo PLUG_IN_INFO =
typedef struct typedef struct
{ {
gint sharpen_percent; gint sharpen_percent;
gboolean update_preview;
} SharpenParams; } SharpenParams;
static SharpenParams sharpen_params = static SharpenParams sharpen_params =
{ {
10, 10
TRUE
}; };
static intneg neg_lut[256]; /* Negative coefficient LUT */ static intneg neg_lut[256]; /* Negative coefficient LUT */
@ -496,8 +494,7 @@ sharpen_dialog (GimpDrawable *drawable)
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox);
gtk_widget_show (main_vbox); gtk_widget_show (main_vbox);
preview = gimp_drawable_preview_new (drawable, preview = gimp_drawable_preview_new (drawable, NULL);
&sharpen_params.update_preview);
gtk_box_pack_start (GTK_BOX (main_vbox), preview, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (main_vbox), preview, TRUE, TRUE, 0);
gtk_widget_show (preview); gtk_widget_show (preview);

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

@ -41,9 +41,8 @@
typedef struct typedef struct
{ {
gint shift_amount; gint shift_amount;
gint orientation; gint orientation;
gboolean preview;
} ShiftValues; } ShiftValues;
@ -78,8 +77,7 @@ const GimpPlugInInfo PLUG_IN_INFO =
static ShiftValues shvals = static ShiftValues shvals =
{ {
5, /* shift amount */ 5, /* shift amount */
HORIZONTAL, /* orientation */ HORIZONTAL /* orientation */
TRUE /* preview */
}; };
@ -375,7 +373,7 @@ shift_dialog (gint32 image_ID,
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox);
gtk_widget_show (main_vbox); gtk_widget_show (main_vbox);
preview = gimp_drawable_preview_new (drawable, &shvals.preview); preview = gimp_drawable_preview_new (drawable, NULL);
gtk_box_pack_start_defaults (GTK_BOX (main_vbox), preview); gtk_box_pack_start_defaults (GTK_BOX (main_vbox), preview);
gtk_widget_show (preview); gtk_widget_show (preview);
g_signal_connect_swapped (preview, "invalidated", g_signal_connect_swapped (preview, "invalidated",

6
plug-ins/common/snoise.c
View File

@ -94,7 +94,6 @@ typedef struct
gdouble xsize; gdouble xsize;
gdouble ysize; gdouble ysize;
gboolean random_seed; gboolean random_seed;
gboolean preview;
} SolidNoiseValues; } SolidNoiseValues;
@ -144,8 +143,7 @@ static SolidNoiseValues snvals =
1, /* detail */ 1, /* detail */
4.0, /* xsize */ 4.0, /* xsize */
4.0, /* ysize */ 4.0, /* ysize */
FALSE, /* random seed */ FALSE /* random seed */
TRUE /* preview */
}; };
static gint xclip, yclip; static gint xclip, yclip;
@ -583,7 +581,7 @@ solid_noise_dialog (GimpDrawable *drawable)
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox);
gtk_widget_show (main_vbox); gtk_widget_show (main_vbox);
preview = gimp_aspect_preview_new (drawable, &snvals.preview); preview = gimp_aspect_preview_new (drawable, NULL);
gtk_box_pack_start_defaults (GTK_BOX (main_vbox), preview); gtk_box_pack_start_defaults (GTK_BOX (main_vbox), preview);
gtk_widget_show (preview); gtk_widget_show (preview);
g_signal_connect_swapped (preview, "invalidated", g_signal_connect_swapped (preview, "invalidated",

6
plug-ins/common/sparkle.c
View File

@ -67,7 +67,6 @@ typedef struct
gboolean inverse; gboolean inverse;
gboolean border; gboolean border;
gint colortype; gint colortype;
gboolean update_preview;
} SparkleVals; } SparkleVals;
@ -144,8 +143,7 @@ static SparkleVals svals =
FALSE, /* preserve_luminosity */ FALSE, /* preserve_luminosity */
FALSE, /* inverse */ FALSE, /* inverse */
FALSE, /* border */ FALSE, /* border */
NATURAL, /* colortype */ NATURAL /* colortype */
FALSE /* update_preview */
}; };
static gint num_sparkles; static gint num_sparkles;
@ -357,7 +355,7 @@ sparkle_dialog (GimpDrawable *drawable)
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox);
gtk_widget_show (main_vbox); gtk_widget_show (main_vbox);
preview = gimp_drawable_preview_new (drawable, &svals.update_preview); preview = gimp_drawable_preview_new (drawable, NULL);
gtk_box_pack_start_defaults (GTK_BOX (main_vbox), preview); gtk_box_pack_start_defaults (GTK_BOX (main_vbox), preview);
gtk_widget_show (preview); gtk_widget_show (preview);
g_signal_connect_swapped (preview, "invalidated", g_signal_connect_swapped (preview, "invalidated",

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

@ -33,7 +33,6 @@ typedef struct
{ {
gdouble spread_amount_x; gdouble spread_amount_x;
gdouble spread_amount_y; gdouble spread_amount_y;
gboolean preview;
} SpreadValues; } SpreadValues;
/* Declare local functions. /* Declare local functions.
@ -65,8 +64,7 @@ const GimpPlugInInfo PLUG_IN_INFO =
static SpreadValues spvals = static SpreadValues spvals =
{ {
5, /* horizontal spread amount */ 5, /* horizontal spread amount */
5, /* vertical spread amount */ 5 /* vertical spread amount */
TRUE /* preview */
}; };
/***** Functions *****/ /***** Functions *****/
@ -364,7 +362,7 @@ spread_dialog (gint32 image_ID,
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox);
gtk_widget_show (main_vbox); gtk_widget_show (main_vbox);
preview = gimp_drawable_preview_new (drawable, &spvals.preview); preview = gimp_drawable_preview_new (drawable, NULL);
gtk_box_pack_start (GTK_BOX (main_vbox), preview, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (main_vbox), preview, TRUE, TRUE, 0);
gtk_widget_show (preview); gtk_widget_show (preview);

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

@ -1085,9 +1085,8 @@ enum
typedef struct typedef struct
{ {
gint direction; gint direction;
gint depth; gint depth;
gboolean update_preview;
} StrucValues; } StrucValues;
@ -1117,8 +1116,7 @@ const GimpPlugInInfo PLUG_IN_INFO =
static StrucValues svals = static StrucValues svals =
{ {
0, /* direction */ 0, /* direction */
4, /* depth */ 4 /* depth */
TRUE
}; };
@ -1283,7 +1281,7 @@ struc_dialog (GimpDrawable *drawable)
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox);
gtk_widget_show (main_vbox); gtk_widget_show (main_vbox);
preview = gimp_drawable_preview_new (drawable, &svals.update_preview); preview = gimp_drawable_preview_new (drawable, NULL);
gtk_box_pack_start (GTK_BOX (main_vbox), preview, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (main_vbox), preview, TRUE, TRUE, 0);
gtk_widget_show (preview); gtk_widget_show (preview);

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

@ -46,7 +46,6 @@ typedef struct
gdouble radius; gdouble radius;
gdouble amount; gdouble amount;
gint threshold; gint threshold;
gboolean update_preview;
} UnsharpMaskParams; } UnsharpMaskParams;
typedef struct typedef struct
@ -94,12 +93,11 @@ static void preview_update (GimpPreview *preview);
/* create a few globals, set default values */ /* create a few globals, set default values */
static UnsharpMaskParams unsharp_params = static UnsharpMaskParams unsharp_params =
{ {
5.0, /* default radius = 5 */ 5.0, /* default radius */
0.5, /* default amount = .5 */ 0.5, /* default amount */
0, /* default threshold = 0 */ 0 /* default threshold */
TRUE /* default is to update the preview */ };
};
/* Setting PLUG_IN_INFO */ /* Setting PLUG_IN_INFO */
const GimpPlugInInfo PLUG_IN_INFO = const GimpPlugInInfo PLUG_IN_INFO =
@ -662,8 +660,7 @@ unsharp_mask_dialog (GimpDrawable *drawable)
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox);
gtk_widget_show (main_vbox); gtk_widget_show (main_vbox);
preview = gimp_drawable_preview_new (drawable, preview = gimp_drawable_preview_new (drawable, NULL);
&unsharp_params.update_preview);
gtk_box_pack_start (GTK_BOX (main_vbox), preview, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (main_vbox), preview, TRUE, TRUE, 0);
gtk_widget_show (preview); gtk_widget_show (preview);

10
plug-ins/common/vpropagate.c
View File

@ -27,8 +27,8 @@
In other word, pixel itself is not a neighbor of it. In other word, pixel itself is not a neighbor of it.
*/ */
/* /*
in response to bug #156545, after lengthy discussion, the meanings of "dilate" in response to bug #156545, after lengthy discussion, the meanings
and "erode" are being swapped -- 19 May 2006. of "dilate" and "erode" are being swapped -- 19 May 2006.
*/ */
#include "config.h" #include "config.h"
@ -150,7 +150,6 @@ typedef struct
gint direction_mask; gint direction_mask;
gint lower_limit; gint lower_limit;
gint upper_limit; gint upper_limit;
gboolean preview;
} VPValueType; } VPValueType;
static VPValueType vpvals = static VPValueType vpvals =
@ -160,8 +159,7 @@ static VPValueType vpvals =
1.0, /* [0.0:1.0] */ 1.0, /* [0.0:1.0] */
15, /* propagate to all 4 directions */ 15, /* propagate to all 4 directions */
0, /* lower_limit */ 0, /* lower_limit */
255, /* upper_limit */ 255 /* upper_limit */
TRUE /* preview */
}; };
/* dialog variables */ /* dialog variables */
@ -1083,7 +1081,7 @@ vpropagate_dialog (GimpDrawable *drawable)
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox);
gtk_widget_show (main_vbox); gtk_widget_show (main_vbox);
preview = gimp_drawable_preview_new (drawable, &vpvals.preview); preview = gimp_drawable_preview_new (drawable, NULL);
gtk_box_pack_start_defaults (GTK_BOX (main_vbox), preview); gtk_box_pack_start_defaults (GTK_BOX (main_vbox), preview);
gtk_widget_show (preview); gtk_widget_show (preview);
g_signal_connect_swapped (preview, "invalidated", g_signal_connect_swapped (preview, "invalidated",

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

@ -137,12 +137,11 @@ const GimpPlugInInfo PLUG_IN_INFO =
struct config_tag struct config_tag
{ {
gint threshold; /* derivative comparison for edge detection */ gint threshold; /* derivative comparison for edge detection */
direction_t direction; /* of wind, LEFT or RIGHT */ direction_t direction; /* of wind, LEFT or RIGHT */
gint strength; /* how many pixels to bleed */ gint strength; /* how many pixels to bleed */
algorithm_t alg; /* which algorithm */ algorithm_t alg; /* which algorithm */
edge_t edge; /* controls abs, negation of derivative */ edge_t edge; /* controls abs, negation of derivative */
gboolean update_preview; /* should the preview be active? */
}; };
typedef struct config_tag config_t; typedef struct config_tag config_t;
@ -152,8 +151,7 @@ config_t config =
LEFT, /* bleed to the right */ LEFT, /* bleed to the right */
10, /* how many pixels to bleed */ 10, /* how many pixels to bleed */
RENDER_WIND, /* default algorithm */ RENDER_WIND, /* default algorithm */
LEADING, /* abs(derivative); */ LEADING /* abs(derivative) */
TRUE /* update_preview */
}; };
MAIN () MAIN ()
@ -890,7 +888,7 @@ dialog_box (GimpDrawable *drawable)
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox);
gtk_widget_show (main_vbox); gtk_widget_show (main_vbox);
preview = gimp_drawable_preview_new (drawable, &config.update_preview); preview = gimp_drawable_preview_new (drawable, NULL);
gtk_box_pack_start_defaults (GTK_BOX (main_vbox), preview); gtk_box_pack_start_defaults (GTK_BOX (main_vbox), preview);
gtk_widget_show (preview); gtk_widget_show (preview);
g_signal_connect_swapped (preview, "invalidated", g_signal_connect_swapped (preview, "invalidated",