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

return the created label widget so that it can for example be put into a 

2004-05-18  Sven Neumann  <sven@gimp.org>

	* libgimpwidgets/gimpsizeentry.[ch] (gimp_size_entry_attach_label):
	return the created label widget so that it can for example be put
	into a GtkSizeGroup.

	* plug-ins/libgimpoldpreview/gimpoldpreview.[ch]: removed the
	optional "Preview" frame. Always put the preview into a sunken
	frame.

	* plug-ins/common/AlienMap2.c
	* plug-ins/common/blinds.c
	* plug-ins/common/flarefx.c
	* plug-ins/common/glasstile.c
	* plug-ins/common/grid.c
	* plug-ins/common/illusion.c
	* plug-ins/common/jigsaw.c
	* plug-ins/common/max_rgb.c
	* plug-ins/common/nlfilt.c
	* plug-ins/common/noisify.c
	* plug-ins/common/nova.c
	* plug-ins/common/plasma.c
	* plug-ins/common/polar.c
	* plug-ins/common/waves.c
	* plug-ins/common/wind.c: changed accordingly, HIG-ified.
This commit is contained in:
Sven Neumann 2004-05-18 17:06:06 +00:00 committed by Sven Neumann
parent 7ccf507fce
commit b298b90cc7
21 changed files with 436 additions and 548 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ChangeLog
View File

@ -1,3 +1,29 @@
2004-05-18 Sven Neumann <sven@gimp.org>
* libgimpwidgets/gimpsizeentry.[ch] (gimp_size_entry_attach_label):
return the created label widget so that it can for example be put
into a GtkSizeGroup.
* plug-ins/libgimpoldpreview/gimpoldpreview.[ch]: removed the
optional "Preview" frame. Always put the preview into a sunken
frame.
* plug-ins/common/AlienMap2.c
* plug-ins/common/blinds.c
* plug-ins/common/flarefx.c
* plug-ins/common/glasstile.c
* plug-ins/common/grid.c
* plug-ins/common/illusion.c
* plug-ins/common/jigsaw.c
* plug-ins/common/max_rgb.c
* plug-ins/common/nlfilt.c
* plug-ins/common/noisify.c
* plug-ins/common/nova.c
* plug-ins/common/plasma.c
* plug-ins/common/polar.c
* plug-ins/common/waves.c
* plug-ins/common/wind.c: changed accordingly, HIG-ified.
2004-05-18 Sven Neumann <sven@gimp.org>
* plug-ins/common/aa.c

10
libgimpwidgets/gimpsizeentry.c
View File

@ -473,8 +473,10 @@ gimp_size_entry_add_field (GimpSizeEntry *gse,
* @alignment: The horizontal alignment of the label.
*
* Attaches a #GtkLabel to the #GimpSizeEntry (which is a #GtkTable).
*
* Returns: A pointer to the new #GtkLabel widget.
**/
void
GtkWidget *
gimp_size_entry_attach_label (GimpSizeEntry *gse,
const gchar *text,
gint row,
@ -483,8 +485,8 @@ gimp_size_entry_attach_label (GimpSizeEntry *gse,
{
GtkWidget *label;
g_return_if_fail (GIMP_IS_SIZE_ENTRY (gse));
g_return_if_fail (text != NULL);
g_return_val_if_fail (GIMP_IS_SIZE_ENTRY (gse), NULL);
g_return_val_if_fail (text != NULL, NULL);
label = gtk_label_new_with_mnemonic (text);
@ -511,6 +513,8 @@ gimp_size_entry_attach_label (GimpSizeEntry *gse,
gtk_table_attach (GTK_TABLE (gse), label, column, column+1, row, row+1,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
gtk_widget_show (label);
return label;
}

2
libgimpwidgets/gimpsizeentry.h
View File

@ -90,7 +90,7 @@ void gimp_size_entry_add_field (GimpSizeEntry *gse,
GtkSpinButton *value_spinbutton,
GtkSpinButton *refval_spinbutton);
void gimp_size_entry_attach_label (GimpSizeEntry *gse,
GtkWidget * gimp_size_entry_attach_label (GimpSizeEntry *gse,
const gchar *text,
gint row,
gint column,

6
libgimpwidgets/gimpwidgets.c
View File

@ -79,7 +79,7 @@ gimp_radio_group_new (gboolean in_frame,
va_list args;
vbox = gtk_vbox_new (FALSE, 1);
vbox = gtk_vbox_new (FALSE, 2);
group = NULL;
@ -187,7 +187,7 @@ gimp_radio_group_new2 (gboolean in_frame,
va_list args;
vbox = gtk_vbox_new (FALSE, 1);
vbox = gtk_vbox_new (FALSE, 2);
group = NULL;
@ -297,7 +297,7 @@ gimp_int_radio_group_new (gboolean in_frame,
va_list args;
vbox = gtk_vbox_new (FALSE, 1);
vbox = gtk_vbox_new (FALSE, 2);
group = NULL;

11
plug-ins/common/AlienMap2.c
View File

@ -434,15 +434,10 @@ alienmap2_dialog (void)
GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (align);
frame = gtk_frame_new (NULL);
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
gtk_container_add (GTK_CONTAINER (align), frame);
gtk_widget_show (frame);
preview = gimp_old_preview_new (NULL, FALSE);
preview = gimp_old_preview_new (NULL);
gimp_old_preview_fill_scaled (preview, drawable);
gtk_container_add (GTK_CONTAINER (frame), preview->widget);
gtk_widget_show (preview->widget);
gtk_container_add (GTK_CONTAINER (align), preview->frame);
gtk_widget_show (preview->frame);
/* Controls */
table = gtk_table_new (6, 3, FALSE);

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

@ -108,7 +108,7 @@ static void run (const gchar *name,
gint *nreturn_vals,
GimpParam **return_vals);
static gint blinds_dialog (void);
static gboolean blinds_dialog (void);
static void blinds_scale_update (GtkAdjustment *adjustment,
gint *size_val);
@ -254,16 +254,15 @@ run (const gchar *name,
}
/* Build the dialog up. This was the hard part! */
static gint
static gboolean
blinds_dialog (void)
{
GtkWidget *dlg;
GtkWidget *main_vbox;
GtkWidget *hbox;
GtkWidget *vbox;
GtkWidget *align;
GtkWidget *frame;
GtkWidget *toggle_vbox;
GtkWidget *table;
GtkObject *size_data;
GtkWidget *toggle;
@ -282,21 +281,25 @@ blinds_dialog (void)
NULL);
main_vbox = gtk_vbox_new (FALSE, 4);
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 6);
main_vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dlg)->vbox), main_vbox);
gtk_widget_show (main_vbox);
hbox = gtk_hbox_new (FALSE, 6);
hbox = gtk_hbox_new (FALSE, 12);
gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
preview = gimp_old_preview_new (NULL, TRUE);
gimp_old_preview_fill_scaled (preview, blindsdrawable);
gtk_box_pack_start (GTK_BOX (hbox), preview->frame, FALSE, FALSE, 0);
gtk_widget_show (preview->widget);
align = gtk_alignment_new (0.0, 0.0, 0.0, 0.0);
gtk_box_pack_start (GTK_BOX (hbox), align, FALSE, FALSE, 0);
gtk_widget_show (align);
vbox = gtk_vbox_new (FALSE, 4);
preview = gimp_old_preview_new (NULL);
gimp_old_preview_fill_scaled (preview, blindsdrawable);
gtk_container_add (GTK_CONTAINER (align), preview->frame);
gtk_widget_show (preview->frame);
vbox = gtk_vbox_new (FALSE, 12);
gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
gtk_widget_show (vbox);
@ -309,20 +312,15 @@ blinds_dialog (void)
_("_Vertical"), VERTICAL, NULL,
NULL);
gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
gtk_widget_show (frame);
frame = gtk_frame_new (_("Background"));
gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
frame = gimp_frame_new (_("Background"));
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
gtk_widget_show (frame);
toggle_vbox = gtk_vbox_new (FALSE, 2);
gtk_container_set_border_width (GTK_CONTAINER (toggle_vbox), 2);
gtk_container_add (GTK_CONTAINER (frame), toggle_vbox);
gtk_widget_show (toggle_vbox);
toggle = gtk_check_button_new_with_mnemonic (_("_Transparent"));
gtk_box_pack_start (GTK_BOX (toggle_vbox), toggle, FALSE, FALSE, 0);
gtk_container_add (GTK_CONTAINER (frame), toggle);
gtk_widget_show (toggle);
g_signal_connect (toggle, "toggled",
@ -337,15 +335,10 @@ blinds_dialog (void)
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), FALSE);
}
frame = gtk_frame_new (_("Parameter Settings"));
gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
gtk_widget_show (frame);
table = gtk_table_new (2, 3, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
gtk_table_set_col_spacings (GTK_TABLE (table), 6);
gtk_table_set_row_spacings (GTK_TABLE (table), 2);
gtk_container_set_border_width (GTK_CONTAINER (table), 4);
gtk_container_add (GTK_CONTAINER (frame), table);
gtk_box_pack_start (GTK_BOX (main_vbox), table, FALSE, FALSE, 0);
gtk_widget_show (table);
size_data = gimp_scale_entry_new (GTK_TABLE (table), 0, 0,

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

@ -163,7 +163,7 @@ static gint numref;
static RGBfloat color, glow, inner, outer, halo;
static Reflect ref1[19];
static GimpOldPreview *preview;
static gboolean show_cursor = FALSE;
static gboolean show_cursor = TRUE;
/* --- Functions --- */
MAIN ()
@ -292,7 +292,6 @@ static gint
flare_dialog (GimpDrawable *drawable)
{
GtkWidget *dlg;
GtkWidget *main_vbox;
GtkWidget *frame;
FlareCenter *center;
gboolean run;
@ -308,19 +307,12 @@ flare_dialog (GimpDrawable *drawable)
NULL);
/* parameter settings */
main_vbox = gtk_vbox_new (FALSE, 2);
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 0);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), main_vbox, TRUE, TRUE, 0);
gtk_widget_show (main_vbox);
frame = flare_center_create (drawable);
center = g_object_get_data (G_OBJECT (frame), "center");
gtk_container_set_border_width (GTK_CONTAINER (frame), 6);
gtk_box_pack_start (GTK_BOX (main_vbox), frame, TRUE, TRUE, 0);
gtk_container_set_border_width (GTK_CONTAINER (frame), 12);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), frame, TRUE, TRUE, 0);
gtk_widget_show (frame);
gtk_widget_show (dlg);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
@ -707,7 +699,6 @@ flare_center_create (GimpDrawable *drawable)
GtkWidget *frame;
GtkWidget *table;
GtkWidget *label;
GtkWidget *pframe;
GtkWidget *spinbutton;
GtkWidget *check;
@ -725,22 +716,19 @@ flare_center_create (GimpDrawable *drawable)
center->oldy = 0;
center->in_call = TRUE; /* to avoid side effects while initialization */
frame = gtk_frame_new (_("Center of FlareFX"));
gtk_container_set_border_width (GTK_CONTAINER (frame), 6);
frame = gimp_frame_new (_("Center of Flare Effect"));
g_signal_connect (frame, "destroy",
G_CALLBACK (flare_center_destroy),
center);
table = gtk_table_new (3, 4, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
gtk_table_set_row_spacings (GTK_TABLE (table), 4);
gtk_table_set_col_spacing (GTK_TABLE (table), 1, 6);
gtk_container_set_border_width (GTK_CONTAINER (table), 4);
gtk_table_set_col_spacings (GTK_TABLE (table), 6);
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
gtk_container_add (GTK_CONTAINER (frame), table);
label = gtk_label_new_with_mnemonic (_("_X:"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5 );
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5 );
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1,
GTK_SHRINK | GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (label);
@ -781,16 +769,11 @@ flare_center_create (GimpDrawable *drawable)
G_CALLBACK (flare_center_adjustment_update),
&fvals.posy);
/* frame (shadow_in) that contains preview */
pframe = gtk_frame_new (NULL);
gtk_frame_set_shadow_type (GTK_FRAME (pframe), GTK_SHADOW_IN);
gtk_table_attach (GTK_TABLE (table), pframe, 0, 4, 1, 2, 0, 0, 0, 0);
/* PREVIEW */
preview = gimp_old_preview_new (drawable, FALSE);
gtk_widget_set_events (GTK_WIDGET (preview->widget), PREVIEW_MASK);
gtk_container_add (GTK_CONTAINER (pframe), preview->widget);
gtk_widget_show (preview->widget);
preview = gimp_old_preview_new (drawable);
gtk_widget_add_events (GTK_WIDGET (preview->widget), PREVIEW_MASK);
gtk_table_attach (GTK_TABLE (table), preview->frame, 0, 4, 1, 2, 0, 0, 0, 0);
gtk_widget_show (preview->frame);
g_object_set_data (G_OBJECT (preview->widget), "center", center);
@ -801,7 +784,6 @@ flare_center_create (GimpDrawable *drawable)
G_CALLBACK (flare_center_preview_events),
center);
gtk_widget_show (pframe);
gtk_widget_show (table);
g_object_set_data (G_OBJECT (frame), "center", center);
gtk_widget_show (frame);

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

@ -222,8 +222,8 @@ static gint
glass_dialog (GimpDrawable *drawable)
{
GtkWidget *dlg;
GtkWidget *main_vbox;
GtkWidget *frame;
GtkWidget *vbox;
GtkWidget *hbox;
GtkWidget *table;
GtkObject *adj;
gboolean run;
@ -239,27 +239,26 @@ glass_dialog (GimpDrawable *drawable)
NULL);
main_vbox = gtk_vbox_new (FALSE, 4);
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 6);
vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox),
main_vbox, TRUE, TRUE, 0);
gtk_widget_show (main_vbox);
vbox, TRUE, TRUE, 0);
gtk_widget_show (vbox);
preview = gimp_old_preview_new (drawable, TRUE);
gtk_box_pack_start (GTK_BOX (main_vbox), preview->frame, FALSE, FALSE, 0);
gtk_widget_show (preview->widget);
hbox = gtk_hbox_new (FALSE, 0);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
preview = gimp_old_preview_new (drawable);
gtk_box_pack_start (GTK_BOX (hbox), preview->frame, FALSE, FALSE, 0);
gtk_widget_show (preview->frame);
glasstile (drawable, TRUE); /* filter routine, initial pass */
/* Parameter settings */
frame = gtk_frame_new (_("Parameter Settings"));
gtk_box_pack_start (GTK_BOX (main_vbox), frame, TRUE, TRUE, 0);
gtk_widget_show (frame);
table = gtk_table_new (2, 3, FALSE);
gtk_container_set_border_width (GTK_CONTAINER (table), 4);
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
gtk_table_set_row_spacings (GTK_TABLE (table), 2);
gtk_container_add (GTK_CONTAINER (frame), table);
gtk_table_set_col_spacings (GTK_TABLE (table), 6);
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0);
gtk_widget_show (table);
/* Horizontal scale - Width */

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

@ -612,19 +612,18 @@ dialog (gint32 image_ID,
GimpDrawable *drawable)
{
GtkWidget *dlg;
GtkWidget *main_hbox;
GtkWidget *main_vbox;
GtkWidget *frame;
GtkWidget *abox;
GtkWidget *hbox;
GtkWidget *vbox;
GtkSizeGroup *group;
GtkWidget *label;
GtkWidget *button;
GtkWidget *hbox;
GtkWidget *width;
GtkWidget *space;
GtkWidget *offset;
GtkWidget *chain_button;
GtkWidget *table;
GtkWidget *align;
GimpUnit unit;
gdouble xres;
gdouble yres;
@ -648,49 +647,26 @@ dialog (gint32 image_ID,
unit = gimp_image_get_unit (image_ID);
/* main hbox: [ ][ ] */
main_hbox = gtk_hbox_new (FALSE, 2);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox),
main_hbox, FALSE, FALSE, 4);
/* hbox created and packed into the dialog */
/* make a nice frame */
frame = gtk_frame_new (_("Preview"));
gtk_container_set_border_width (GTK_CONTAINER (frame), 4);
gtk_box_pack_start (GTK_BOX (main_hbox), frame, FALSE, FALSE, 0);
gtk_widget_show (frame);
hbox = gtk_vbox_new (FALSE, 2);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 0);
gtk_container_add (GTK_CONTAINER (frame), hbox);
hbox = gtk_hbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 12);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
abox = gtk_alignment_new (0.5, 0.0, 0.0, 0.0);
gtk_container_set_border_width (GTK_CONTAINER (abox), 4);
gtk_box_pack_start (GTK_BOX (hbox), abox, TRUE, TRUE, 0);
gtk_widget_show (abox);
frame = gtk_frame_new (NULL);
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
gtk_container_add (GTK_CONTAINER (abox), frame);
gtk_widget_show (frame);
vbox = gtk_vbox_new (FALSE, 0);
gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
gtk_widget_show (vbox);
preview = gimp_old_preview_new (NULL, FALSE);
preview = gimp_old_preview_new (NULL);
gimp_old_preview_fill (preview, drawable);
gtk_container_add (GTK_CONTAINER (frame), preview->widget);
doit (image_ID, drawable, TRUE); /* render preview */
gtk_widget_show (preview->widget);
gtk_box_pack_start (GTK_BOX (vbox), preview->frame, FALSE, FALSE, 0);
gtk_widget_show (preview->frame);
/* left side of the UI is done */
doit (image_ID, drawable, TRUE); /* render preview */
/* right side */
frame = gtk_frame_new (_("Parameter Settings"));
gtk_container_set_border_width (GTK_CONTAINER (frame), 4);
gtk_box_pack_start (GTK_BOX (main_hbox), frame, FALSE, FALSE, 0);
gtk_widget_show (frame);
main_vbox = gtk_vbox_new (FALSE, 4);
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 6);
gtk_container_add (GTK_CONTAINER (frame), main_vbox);
gtk_widget_show (main_vbox);
vbox = gtk_vbox_new (FALSE, 6);
gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
gtk_widget_show (vbox);
/* The width entries */
width = gimp_size_entry_new (3, /* number_of_fields */
@ -702,6 +678,10 @@ dialog (gint32 image_ID,
SPIN_BUTTON_WIDTH, /* spinbutton_usize */
GIMP_SIZE_ENTRY_UPDATE_SIZE); /* update_policy */
gtk_box_pack_start (GTK_BOX (vbox), width, FALSE, FALSE, 0);
gtk_widget_show (width);
/* set the unit back to pixels, since most times we will want pixels */
gimp_size_entry_set_unit (GIMP_SIZE_ENTRY (width), GIMP_UNIT_PIXEL);
@ -722,8 +702,9 @@ dialog (gint32 image_ID,
drawable->height);
gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (width), 2, 0.0,
MAX (drawable->width, drawable->height));
gtk_table_set_row_spacing (GTK_TABLE (width), 0, 6);
gtk_table_set_col_spacings (GTK_TABLE (width), 6);
gtk_table_set_col_spacing (GTK_TABLE (width), 2, 12);
gtk_table_set_col_spacing (GTK_TABLE (width), 3, 12);
/* initialize the values */
gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (width), 0, grid_cfg.hwidth);
@ -737,8 +718,13 @@ dialog (gint32 image_ID,
0, 2, 0.0);
gimp_size_entry_attach_label (GIMP_SIZE_ENTRY (width), _("Intersection"),
0, 3, 0.0);
gimp_size_entry_attach_label (GIMP_SIZE_ENTRY (width), _("Width:"),
1, 0, 0.0);
label = gimp_size_entry_attach_label (GIMP_SIZE_ENTRY (width), _("Width:"),
1, 0, 0.0);
group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
gtk_size_group_add_widget (group, label);
g_object_unref (group);
/* put a chain_button under the size_entries */
chain_button = gimp_chain_button_new (GIMP_CHAIN_BOTTOM);
@ -754,12 +740,6 @@ dialog (gint32 image_ID,
G_CALLBACK (entry_callback),
chain_button);
abox = gtk_alignment_new (1.0, 0.5, 0.0, 0.0);
gtk_container_add (GTK_CONTAINER (abox), width);
gtk_box_pack_start (GTK_BOX (main_vbox), abox, FALSE, FALSE, 4);
gtk_widget_show (width);
gtk_widget_show (abox);
/* The spacing entries */
space = gimp_size_entry_new (3, /* number_of_fields */
unit, /* unit */
@ -769,6 +749,10 @@ dialog (gint32 image_ID,
FALSE, /* show_refval */
SPIN_BUTTON_WIDTH, /* spinbutton_usize */
GIMP_SIZE_ENTRY_UPDATE_SIZE); /* update_policy */
gtk_box_pack_start (GTK_BOX (vbox), space, FALSE, FALSE, 0);
gtk_widget_show (space);
gimp_size_entry_set_unit (GIMP_SIZE_ENTRY (space), GIMP_UNIT_PIXEL);
/* set the resolution to the image resolution */
@ -788,8 +772,8 @@ dialog (gint32 image_ID,
drawable->height);
gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (space), 2, 0.0,
MAX (drawable->width, drawable->height));
gtk_table_set_col_spacings (GTK_TABLE (space), 6);
gtk_table_set_col_spacing (GTK_TABLE (space), 2, 12);
gtk_table_set_col_spacing (GTK_TABLE (space), 3, 12);
/* initialize the values */
gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (space), 0, grid_cfg.hspace);
@ -797,8 +781,9 @@ dialog (gint32 image_ID,
gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (space), 2, grid_cfg.ispace);
/* attach labels */
gimp_size_entry_attach_label (GIMP_SIZE_ENTRY (space), _("Spacing:"),
1, 0, 0.0);
label = gimp_size_entry_attach_label (GIMP_SIZE_ENTRY (space), _("Spacing:"),
1, 0, 0.0);
gtk_size_group_add_widget (group, label);
/* put a chain_button under the spacing_entries */
chain_button = gimp_chain_button_new (GIMP_CHAIN_BOTTOM);
@ -818,12 +803,6 @@ dialog (gint32 image_ID,
G_CALLBACK (entry_callback),
chain_button);
abox = gtk_alignment_new (1.0, 0.5, 0.0, 0.0);
gtk_container_add (GTK_CONTAINER (abox), space);
gtk_box_pack_start (GTK_BOX (main_vbox), abox, FALSE, FALSE, 4);
gtk_widget_show (space);
gtk_widget_show (abox);
/* The offset entries */
offset = gimp_size_entry_new (3, /* number_of_fields */
unit, /* unit */
@ -833,6 +812,10 @@ dialog (gint32 image_ID,
FALSE, /* show_refval */
SPIN_BUTTON_WIDTH, /* spinbutton_usize */
GIMP_SIZE_ENTRY_UPDATE_SIZE); /* update_policy */
gtk_box_pack_start (GTK_BOX (vbox), offset, FALSE, FALSE, 0);
gtk_widget_show (offset);
gimp_size_entry_set_unit (GIMP_SIZE_ENTRY (offset), GIMP_UNIT_PIXEL);
/* set the resolution to the image resolution */
@ -852,8 +835,8 @@ dialog (gint32 image_ID,
drawable->height);
gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (offset), 2, 0.0,
MAX (drawable->width, drawable->height));
gtk_table_set_col_spacings (GTK_TABLE (offset), 6);
gtk_table_set_col_spacing (GTK_TABLE (offset), 2, 12);
gtk_table_set_col_spacing (GTK_TABLE (offset), 3, 12);
/* initialize the values */
gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (offset), 0, grid_cfg.hoffset);
@ -861,8 +844,9 @@ dialog (gint32 image_ID,
gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (offset), 2, grid_cfg.ioffset);
/* attach labels */
gimp_size_entry_attach_label (GIMP_SIZE_ENTRY (offset), _("Offset:"),
1, 0, 0.0);
label = gimp_size_entry_attach_label (GIMP_SIZE_ENTRY (offset), _("Offset:"),
1, 0, 0.0);
gtk_size_group_add_widget (group, label);
/* this is a weird hack: we put a table into the offset table */
table = gtk_table_new (3, 3, FALSE);
@ -896,16 +880,12 @@ dialog (gint32 image_ID,
gtk_widget_show (chain_button);
/* attach color selectors */
align = gtk_alignment_new (0.0, 0.5, 0, 0);
gtk_table_attach_defaults (GTK_TABLE (table), align, 0, 1, 1, 2);
gtk_widget_show (align);
hcolor_button = gimp_color_button_new (_("Horizontal Color"),
COLOR_BUTTON_WIDTH, 16,
&grid_cfg.hcolor,
GIMP_COLOR_AREA_SMALL_CHECKS);
gimp_color_button_set_update (GIMP_COLOR_BUTTON (hcolor_button), TRUE);
gtk_container_add (GTK_CONTAINER (align), hcolor_button);
gtk_table_attach_defaults (GTK_TABLE (table), hcolor_button, 0, 1, 1, 2);
gtk_widget_show (hcolor_button);
g_signal_connect (hcolor_button, "color_changed",
@ -915,16 +895,12 @@ dialog (gint32 image_ID,
G_CALLBACK (color_callback),
chain_button);
align = gtk_alignment_new (0.0, 0.5, 0, 0);
gtk_table_attach_defaults (GTK_TABLE (table), align, 1, 2, 1, 2);
gtk_widget_show (align);
vcolor_button = gimp_color_button_new (_("Vertical Color"),
COLOR_BUTTON_WIDTH, 16,
&grid_cfg.vcolor,
GIMP_COLOR_AREA_SMALL_CHECKS);
gimp_color_button_set_update (GIMP_COLOR_BUTTON (vcolor_button), TRUE);
gtk_container_add (GTK_CONTAINER (align), vcolor_button);
gtk_table_attach_defaults (GTK_TABLE (table), vcolor_button, 1, 2, 1, 2);
gtk_widget_show (vcolor_button);
g_signal_connect (vcolor_button, "color_changed",
@ -934,16 +910,12 @@ dialog (gint32 image_ID,
G_CALLBACK (color_callback),
chain_button);
align = gtk_alignment_new (0.0, 0.5, 0, 0);
gtk_table_attach_defaults (GTK_TABLE (table), align, 2, 3, 1, 2);
gtk_widget_show (align);
button = gimp_color_button_new (_("Intersection Color"),
COLOR_BUTTON_WIDTH, 16,
&grid_cfg.icolor,
GIMP_COLOR_AREA_SMALL_CHECKS);
gimp_color_button_set_update (GIMP_COLOR_BUTTON (button), TRUE);
gtk_container_add (GTK_CONTAINER (align), button);
gtk_table_attach_defaults (GTK_TABLE (table), button, 2, 3, 1, 2);
gtk_widget_show (button);
g_signal_connect (button, "color_changed",
@ -955,13 +927,6 @@ dialog (gint32 image_ID,
gtk_widget_show (table);
abox = gtk_alignment_new (1.0, 0.5, 0.0, 0.0);
gtk_container_add (GTK_CONTAINER (abox), offset);
gtk_box_pack_start (GTK_BOX (main_vbox), abox, FALSE, FALSE, 4);
gtk_widget_show (offset);
gtk_widget_show (abox);
gtk_widget_show (main_hbox);
gtk_widget_show (dlg);
g_object_set_data (G_OBJECT (dlg), "width", width);

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

@ -385,8 +385,8 @@ static gboolean
dialog (GimpDrawable *mangle)
{
GtkWidget *dlg;
GtkWidget *main_vbox;
GtkWidget *frame;
GtkWidget *vbox;
GtkWidget *hbox;
GtkWidget *table;
GtkWidget *spinbutton;
GtkObject *adj;
@ -405,32 +405,30 @@ dialog (GimpDrawable *mangle)
NULL);
main_vbox = gtk_vbox_new (FALSE, 4);
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 6);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), main_vbox,
TRUE, TRUE, 0);
gtk_widget_show (main_vbox);
vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), vbox, TRUE, TRUE, 0);
gtk_widget_show (vbox);
preview = gimp_old_preview_new (mangle, TRUE);
gtk_box_pack_start (GTK_BOX (main_vbox), preview->frame, FALSE, FALSE, 0);
hbox = gtk_hbox_new (FALSE, 0);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
preview = gimp_old_preview_new (mangle);
gtk_box_pack_start (GTK_BOX (hbox), preview->frame, FALSE, FALSE, 0);
filter_preview();
gtk_widget_show (preview->widget);
frame = gtk_frame_new (_("Parameter Settings"));
gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
gtk_widget_show (frame);
gtk_widget_show (preview->frame);
table = gtk_table_new (3, 2, FALSE);
gtk_container_set_border_width (GTK_CONTAINER (table), 4);
gtk_table_set_row_spacings (GTK_TABLE (table), 2);
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
gtk_container_add (GTK_CONTAINER (frame), table);
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
gtk_table_set_col_spacings (GTK_TABLE (table), 6);
gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0);
gtk_widget_show (table);
spinbutton = gimp_spin_button_new (&adj, parameters.division,
-32, 64, 1, 10, 0, 1, 0);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("_Division:"), 1.0, 0.5,
_("_Divisions:"), 0.0, 0.5,
spinbutton, 1, TRUE);
g_signal_connect (adj, "value_changed",

64
plug-ins/common/jigsaw.c
View File

@ -2530,15 +2530,16 @@ static gboolean
dialog_box (void)
{
GimpDrawable *drawable = globals.drawable;
GtkWidget *dlg;
GtkWidget *hbox;
GtkWidget *vbox;
GtkWidget *frame;
GtkWidget *rbutton1;
GtkWidget *rbutton2;
GtkWidget *table;
GtkObject *adj;
gboolean run;
GtkSizeGroup *group;
GtkWidget *dlg;
GtkWidget *hbox;
GtkWidget *vbox;
GtkWidget *frame;
GtkWidget *rbutton1;
GtkWidget *rbutton2;
GtkWidget *table;
GtkObject *adj;
gboolean run;
gimp_ui_init ("jigsaw", TRUE);
@ -2551,8 +2552,8 @@ dialog_box (void)
NULL);
hbox = gtk_hbox_new (FALSE, 10);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 6);
hbox = gtk_hbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 12);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox),
hbox, TRUE, TRUE, 0);
gtk_widget_show (hbox);
@ -2561,30 +2562,36 @@ dialog_box (void)
gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
gtk_widget_show (vbox);
preview = gimp_old_preview_new (drawable, TRUE);
preview = gimp_old_preview_new (drawable);
gtk_box_pack_start (GTK_BOX (vbox), preview->frame, FALSE, FALSE, 0);
jigsaw(TRUE); /* render preview */
gtk_widget_show (preview->widget);
gtk_widget_show (preview->frame);
vbox = gtk_vbox_new (FALSE, 4);
jigsaw (TRUE); /* render preview */
vbox = gtk_vbox_new (FALSE, 12);
gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
gtk_widget_show (vbox);
frame = gtk_frame_new (_("Number of Tiles"));
frame = gimp_frame_new (_("Number of Tiles"));
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
table = gtk_table_new (2, 3, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
gtk_table_set_row_spacings (GTK_TABLE (table), 2);
gtk_container_set_border_width (GTK_CONTAINER (table), 4);
gtk_table_set_col_spacings (GTK_TABLE (table), 6);
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
gtk_container_add (GTK_CONTAINER (frame), table);
group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
/* xtiles */
adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 0,
_("_Horizontal:"), SCALE_WIDTH, 0,
config.x, MIN_XTILES, MAX_XTILES, 1.0, 4.0, 0,
TRUE, 0, 0,
_("Number of pieces going across"), NULL);
gtk_size_group_add_widget (group, GIMP_SCALE_ENTRY_LABEL (adj));
g_object_unref (group);
g_signal_connect (adj, "value_changed",
G_CALLBACK (gimp_int_adjustment_update),
&config.x);
@ -2598,6 +2605,9 @@ dialog_box (void)
config.y, MIN_YTILES, MAX_YTILES, 1.0, 4.0, 0,
TRUE, 0, 0,
_("Number of pieces going down"), NULL);
gtk_size_group_add_widget (group, GIMP_SCALE_ENTRY_LABEL (adj));
g_signal_connect (adj, "value_changed",
G_CALLBACK (gimp_int_adjustment_update),
&config.y);
@ -2608,13 +2618,12 @@ dialog_box (void)
gtk_widget_show (table);
gtk_widget_show (frame);
frame = gtk_frame_new (_("Bevel Edges"));
frame = gimp_frame_new (_("Bevel Edges"));
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
table = gtk_table_new (2, 3, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
gtk_table_set_row_spacings (GTK_TABLE (table), 2);
gtk_container_set_border_width (GTK_CONTAINER (table), 4);
gtk_table_set_col_spacings (GTK_TABLE (table), 6);
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
gtk_container_add (GTK_CONTAINER (frame), table);
/* number of blending lines */
@ -2624,6 +2633,9 @@ dialog_box (void)
MIN_BLEND_LINES, MAX_BLEND_LINES, 1.0, 2.0, 0,
TRUE, 0, 0,
_("Degree of slope of each piece's edge"), NULL);
gtk_size_group_add_widget (group, GIMP_SCALE_ENTRY_LABEL (adj));
g_signal_connect (adj, "value_changed",
G_CALLBACK (gimp_int_adjustment_update),
&config.blend_lines);
@ -2639,6 +2651,9 @@ dialog_box (void)
TRUE, 0, 0,
_("The amount of highlighting on the edges "
"of each piece"), NULL);
gtk_size_group_add_widget (group, GIMP_SCALE_ENTRY_LABEL (adj));
g_signal_connect (adj, "value_changed",
G_CALLBACK (gimp_double_adjustment_update),
&config.blend_amount);
@ -2681,9 +2696,10 @@ dialog_box (void)
static void
jigsaw_radio_button_update (GtkWidget *widget,
gpointer data)
gpointer data)
{
gimp_radio_button_update (widget, data);
if (GTK_TOGGLE_BUTTON (widget)->active)
jigsaw (TRUE);
}

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

@ -243,7 +243,8 @@ static gint
dialog (GimpDrawable *drawable)
{
GtkWidget *dlg;
GtkWidget *main_vbox;
GtkWidget *vbox;
GtkWidget *hbox;
GtkWidget *frame;
GtkWidget *max;
GtkWidget *min;
@ -260,18 +261,22 @@ dialog (GimpDrawable *drawable)
NULL);
main_vbox = gtk_vbox_new (FALSE, 4);
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 6);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), main_vbox,
TRUE, TRUE, 0);
gtk_widget_show (main_vbox);
vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), vbox, TRUE, TRUE, 0);
gtk_widget_show (vbox);
hbox = gtk_hbox_new (FALSE, 0);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
preview = gimp_old_preview_new (drawable);
gtk_box_pack_start (GTK_BOX (hbox), preview->frame, FALSE, FALSE, 0);
gtk_widget_show (preview->frame);
preview = gimp_old_preview_new (drawable, TRUE);
gtk_box_pack_start (GTK_BOX (main_vbox), preview->frame, FALSE, FALSE, 0);
main_function (drawable, TRUE);
gtk_widget_show (preview->widget);
frame = gimp_int_radio_group_new (TRUE, _("Parameter Settings"),
frame = gimp_int_radio_group_new (FALSE, NULL,
G_CALLBACK (radio_callback),
&pvals.max_p, pvals.max_p,
@ -286,7 +291,7 @@ dialog (GimpDrawable *drawable)
g_object_set_data (G_OBJECT (max), "drawable", drawable);
g_object_set_data (G_OBJECT (min), "drawable", drawable);
gtk_container_add (GTK_CONTAINER (main_vbox), frame);
gtk_container_add (GTK_CONTAINER (vbox), frame);
gtk_widget_show (frame);
gtk_widget_show (dlg);

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

@ -30,14 +30,10 @@
* Algorithm fixes, V2.0 compatibility by David Hodson hodsond@ozemail.com.au
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <math.h>
#include <gtk/gtk.h>
@ -64,8 +60,8 @@ typedef enum
filter_edge_enhance
} FilterType;
static gint do_preview = TRUE;
static GimpOldPreview *preview;
static gboolean do_preview = TRUE;
static GimpOldPreview *preview = NULL;
static GtkWidget * mw_preview_new (GtkWidget *parent,
GimpDrawable *drawable);
@ -308,15 +304,16 @@ nlfilt_double_adjustment_update (GtkAdjustment *adjustment,
}
static gint
pluginCoreIA (piArgs *argp, GimpDrawable *drawable)
pluginCoreIA (piArgs *argp,
GimpDrawable *drawable)
{
gint retval = -1; /* default to error return */
GtkWidget *dlg;
GtkWidget *main_vbox;
GtkWidget *frame;
GtkWidget *vbox;
GtkWidget *hbox;
GtkWidget *table;
GtkWidget *preview;
GtkWidget *frame;
GtkObject *adj;
gboolean run;
@ -331,14 +328,13 @@ pluginCoreIA (piArgs *argp, GimpDrawable *drawable)
NULL);
main_vbox = gtk_vbox_new (FALSE, 4);
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 6);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), main_vbox,
TRUE, TRUE, 0);
gtk_widget_show (main_vbox);
vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), vbox, TRUE, TRUE, 0);
gtk_widget_show (vbox);
hbox = gtk_hbox_new (FALSE, 4);
gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0);
hbox = gtk_hbox_new (FALSE, 12);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
preview = mw_preview_new (hbox, drawable);
@ -361,15 +357,10 @@ pluginCoreIA (piArgs *argp, GimpDrawable *drawable)
gtk_box_pack_start (GTK_BOX (hbox), frame, FALSE, FALSE, 0);
gtk_widget_show (frame);
frame = gtk_frame_new (_("Parameter Settings"));
gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
gtk_widget_show (frame);
table = gtk_table_new (2, 3, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
gtk_table_set_row_spacings (GTK_TABLE (table), 2);
gtk_container_set_border_width (GTK_CONTAINER (table), 4);
gtk_container_add (GTK_CONTAINER (frame), table);
gtk_table_set_col_spacings (GTK_TABLE (table), 6);
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0);
gtk_widget_show (table);
adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 0,
@ -443,30 +434,19 @@ mw_preview_toggle_callback (GtkWidget *widget,
}
static GtkWidget *
mw_preview_new (GtkWidget *parent, GimpDrawable *drawable)
mw_preview_new (GtkWidget *parent,
GimpDrawable *drawable)
{
GtkWidget *frame;
GtkWidget *pframe;
GtkWidget *vbox;
GtkWidget *button;
frame = gtk_frame_new (_("Preview"));
gtk_box_pack_start (GTK_BOX (parent), frame, FALSE, FALSE, 0);
gtk_widget_show (frame);
vbox = gtk_vbox_new (FALSE, 2);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
gtk_container_add (GTK_CONTAINER (frame), vbox);
vbox = gtk_vbox_new (FALSE, 6);
gtk_box_pack_start (GTK_BOX (parent), vbox, FALSE, FALSE, 0);
gtk_widget_show (vbox);
pframe = gtk_frame_new (NULL);
gtk_frame_set_shadow_type (GTK_FRAME(pframe), GTK_SHADOW_IN);
gtk_box_pack_start (GTK_BOX (vbox), pframe, FALSE, FALSE, 0);
gtk_widget_show (pframe);
preview = gimp_old_preview_new (drawable, FALSE);
gtk_container_add (GTK_CONTAINER (pframe), preview->widget);
gtk_widget_show (preview->widget);
preview = gimp_old_preview_new (drawable);
gtk_box_pack_start (GTK_BOX (vbox), preview->frame, FALSE, FALSE, 0);
gtk_widget_show (preview->frame);
button = gtk_check_button_new_with_mnemonic (_("_Do Preview"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), do_preview);
@ -560,13 +540,15 @@ static gdouble rectang_area(gdouble, gdouble, gdouble, gdouble,
gdouble, gdouble, gdouble, gdouble);
static gdouble hex_area(gdouble, gdouble, gdouble, gdouble, gdouble);
gint atfilt0(gint *p);
gint atfilt1(gint *p);
gint atfilt2(gint *p);
gint atfilt3(gint *p);
gint atfilt4(gint *p);
gint atfilt5(gint *p);
gint (*atfuncs[6])(gint *) = {
static gint atfilt0 (gint *p);
static gint atfilt1 (gint *p);
static gint atfilt2 (gint *p);
static gint atfilt3 (gint *p);
static gint atfilt4 (gint *p);
static gint atfilt5 (gint *p);
gint (*atfuncs[6])(gint *) =
{
atfilt0,
atfilt1,
atfilt2,
@ -602,9 +584,9 @@ gint noisevariance; /* global so that pixel processing code can get at it q
* Beware if you use this code anywhere else!
*/
static inline void
nlfiltRow(guchar *srclast, guchar *srcthis, guchar *srcnext, guchar *dst,
gint width, gint bpp, gint filtno) {
nlfiltRow (guchar *srclast, guchar *srcthis, guchar *srcnext, guchar *dst,
gint width, gint bpp, gint filtno)
{
gint pf[9];
guchar *ip0, *ip1, *ip2, *or, *orend;
@ -654,7 +636,8 @@ gint SQUARE[2 * NOCSVAL]; /* scaled square lookup table */
/* Table initialisation function - return alpha range */
static inline gint
nlfiltInit(gdouble alpha, gdouble radius, FilterType filter) {
nlfiltInit (gdouble alpha, gdouble radius, FilterType filter)
{
gint alpharange; /* alpha range value 0 - 3 */
gdouble meanscale; /* scale for finding mean */
gdouble mmeanscale; /* scale for finding mean - midle hex */
@ -792,8 +775,9 @@ nlfiltInit(gdouble alpha, gdouble radius, FilterType filter) {
/* Core pixel processing function - hand it 3x3 pixels and return result. */
/* Mean filter */
gint
atfilt0(gint32 *p) {
static gint
atfilt0(gint32 *p)
{
gint retv;
/* map to scaled hexagon values */
retv = M0[p[0]] + M1[p[3]] + M2[p[7]];
@ -807,8 +791,9 @@ atfilt0(gint32 *p) {
}
/* Mean of 5 - 7 middle values */
gint
atfilt1(gint32 *p) {
static gint
atfilt1 (gint32 *p)
{
gint h0,h1,h2,h3,h4,h5,h6; /* hexagon values 2 3 */
/* 1 0 4 */
/* 6 5 */
@ -841,8 +826,9 @@ atfilt1(gint32 *p) {
}
/* Mean of 3 - 5 middle values */
gint
atfilt2(gint32 *p) {
static gint
atfilt2 (gint32 *p)
{
gint h0,h1,h2,h3,h4,h5,h6; /* hexagon values 2 3 */
/* 1 0 4 */
/* 6 5 */
@ -896,8 +882,9 @@ atfilt2(gint32 *p) {
* Mean of 1 - 3 middle values.
* If only 1 value, then this is a median filter.
*/
gint32
atfilt3(gint32 *p) {
static gint32
atfilt3(gint32 *p)
{
gint h0,h1,h2,h3,h4,h5,h6; /* hexagon values 2 3 */
/* 1 0 4 */
/* 6 5 */
@ -966,8 +953,9 @@ atfilt3(gint32 *p) {
}
/* Edge enhancement */
gint
atfilt4(gint *p) {
static gint
atfilt4 (gint *p)
{
gint hav;
/* map to scaled hexagon values and compute enhance value */
hav = M0[p[0]] + M1[p[3]] + M2[p[7]];
@ -1045,7 +1033,8 @@ atfilt5(gint *p) {
/* compute the area of overlap of a hexagon diameter d, */
/* centered at hx,hy, with a unit square of center sx,sy. */
static gdouble
hex_area(gdouble sx, gdouble sy, gdouble hx, gdouble hy, gdouble d) {
hex_area (gdouble sx, gdouble sy, gdouble hx, gdouble hy, gdouble d)
{
gdouble hx0,hx1,hx2,hy0,hy1,hy2,hy3;
gdouble sx0,sx1,sy0,sy1;
@ -1072,8 +1061,9 @@ hex_area(gdouble sx, gdouble sy, gdouble hx, gdouble hy, gdouble d) {
}
static gdouble
triang_area(gdouble rx0, gdouble ry0, gdouble rx1, gdouble ry1, gdouble tx0,
gdouble ty0, gdouble tx1, gdouble ty1, gint tt) {
triang_area (gdouble rx0, gdouble ry0, gdouble rx1, gdouble ry1, gdouble tx0,
gdouble ty0, gdouble tx1, gdouble ty1, gint tt)
{
gdouble a,b,c,d;
gdouble lx0,ly0,lx1,ly1;
/* Convert everything to a NW triangle */
@ -1149,9 +1139,10 @@ triang_area(gdouble rx0, gdouble ry0, gdouble rx1, gdouble ry1, gdouble tx0,
/* Compute rectangle area */
static gdouble
rectang_area(gdouble rx0, gdouble ry0, gdouble rx1, gdouble ry1, gdouble tx0,
gdouble ty0, gdouble tx1, gdouble ty1) {
/* Compute overlapping box */
rectang_area (gdouble rx0, gdouble ry0, gdouble rx1, gdouble ry1, gdouble tx0,
gdouble ty0, gdouble tx1, gdouble ty1)
{
/* Compute overlapping box */
if (tx0 > rx0)
rx0 = tx0;
if (ty0 > ry0)

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

@ -263,9 +263,7 @@ static void
noisify (GimpDrawable *drawable,
gboolean preview_mode)
{
GRand *gr;
gr = g_rand_new ();
GRand *gr = g_rand_new ();
if (preview_mode)
gimp_old_preview_update (preview, noisify_func, gr);
@ -301,9 +299,9 @@ noisify_dialog (GimpDrawable *drawable,
gint channels)
{
GtkWidget *dlg;
GtkWidget *main_vbox;
GtkWidget *vbox;
GtkWidget *hbox;
GtkWidget *toggle;
GtkWidget *frame;
GtkWidget *table;
gboolean run;
@ -318,34 +316,25 @@ noisify_dialog (GimpDrawable *drawable,
NULL);
main_vbox = gtk_vbox_new (FALSE, 2);
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 0);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), main_vbox, TRUE, TRUE, 0);
gtk_widget_show (main_vbox);
vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), vbox, TRUE, TRUE, 0);
gtk_widget_show (vbox);
/* preview */
preview = gimp_old_preview_new (NULL, TRUE);
gtk_box_pack_start (GTK_BOX (main_vbox), preview->frame, FALSE, FALSE, 0);
gtk_widget_show (preview->widget);
hbox = gtk_hbox_new (FALSE, 0);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
preview = gimp_old_preview_new (NULL);
gtk_box_pack_start (GTK_BOX (hbox), preview->frame, FALSE, FALSE, 0);
gtk_widget_show (preview->frame);
gimp_old_preview_fill (preview, drawable);
noisify (drawable, TRUE); /* preview noisify */
/* parameter settings */
frame = gtk_frame_new (_("Parameter Settings"));
gtk_container_set_border_width (GTK_CONTAINER (frame), 6);
gtk_box_pack_start (GTK_BOX (main_vbox), frame, TRUE, TRUE, 0);
gtk_widget_show (frame);
table = gtk_table_new (channels + 1, 3, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
gtk_table_set_row_spacings (GTK_TABLE (table), 2);
gtk_table_set_row_spacing (GTK_TABLE (table), 0, 4);
gtk_container_set_border_width (GTK_CONTAINER (table), 4);
gtk_container_add (GTK_CONTAINER (frame), table);
gtk_widget_show (table);
toggle = gtk_check_button_new_with_mnemonic (_("_Independent"));
gtk_table_attach (GTK_TABLE (table), toggle, 0, 3, 0, 1, GTK_FILL, 0, 0, 0);
gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, FALSE, 0);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), nvals.independent);
gtk_widget_show (toggle);
@ -353,6 +342,12 @@ noisify_dialog (GimpDrawable *drawable,
G_CALLBACK (gimp_toggle_button_update),
&nvals.independent);
table = gtk_table_new (channels, 3, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (table), 6);
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
gtk_box_pack_start (GTK_BOX (vbox), table, TRUE, TRUE, 0);
gtk_widget_show (table);
noise_int.channels = channels;
if (channels == 1)

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

@ -90,7 +90,8 @@ static char rcsid[] = "$Id$";
GDK_BUTTON1_MOTION_MASK)
static GimpOldPreview *preview;
static gboolean show_cursor = FALSE;
static gboolean show_cursor = TRUE;
typedef struct
{
@ -309,7 +310,6 @@ static gboolean
nova_dialog (GimpDrawable *drawable)
{
GtkWidget *dlg;
GtkWidget *frame;
GtkWidget *table;
GtkWidget *button;
GtkWidget *center_frame;
@ -327,22 +327,16 @@ nova_dialog (GimpDrawable *drawable)
NULL);
/* parameter settings */
frame = gtk_frame_new (_("Parameter Settings"));
gtk_container_set_border_width (GTK_CONTAINER (frame), 6);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), frame, TRUE, TRUE, 0);
gtk_widget_show (frame);
table = gtk_table_new (5, 3, FALSE);
gtk_table_set_row_spacings (GTK_TABLE (table), 2);
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
gtk_container_set_border_width (GTK_CONTAINER (table), 4);
gtk_container_add (GTK_CONTAINER (frame), table);
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
gtk_table_set_col_spacings (GTK_TABLE (table), 6);
gtk_container_set_border_width (GTK_CONTAINER (table), 12);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), table, TRUE, TRUE, 0);
gtk_widget_show (table);
center_frame = nova_center_create (drawable);
gtk_table_attach (GTK_TABLE (table), center_frame, 0, 3, 0, 1,
0, 0, 0, 0);
GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0);
/* Color */
if (gimp_drawable_is_rgb (drawable->drawable_id))
@ -351,7 +345,7 @@ nova_dialog (GimpDrawable *drawable)
SCALE_WIDTH - 8, 16,
&pvals.color, GIMP_COLOR_AREA_FLAT);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 2,
_("Co_lor:"), 1.0, 0.5,
_("Co_lor:"), 0.0, 0.5,
button, 1, TRUE);
g_signal_connect (button, "color_changed",
@ -429,7 +423,6 @@ nova_center_create (GimpDrawable *drawable)
GtkWidget *frame;
GtkWidget *table;
GtkWidget *label;
GtkWidget *pframe;
GtkWidget *spinbutton;
GtkWidget *check;
@ -449,24 +442,22 @@ nova_center_create (GimpDrawable *drawable)
center->oldy = 0;
center->in_call = TRUE; /* to avoid side effects while initialization */
frame = gtk_frame_new (_("Center of SuperNova"));
gtk_container_set_border_width (GTK_CONTAINER (frame), 4);
frame = gimp_frame_new (_("Center of SuperNova"));
g_signal_connect (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);
gtk_table_set_col_spacing (GTK_TABLE (table), 1, 6);
gtk_container_set_border_width (GTK_CONTAINER (table), 4);
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
gtk_table_set_col_spacings (GTK_TABLE (table), 6);
gtk_container_add (GTK_CONTAINER (frame), table);
gtk_widget_show (table);
label = gtk_label_new_with_mnemonic (_("_X:"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1,
GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (label);
spinbutton =
@ -485,9 +476,9 @@ nova_center_create (GimpDrawable *drawable)
&pvals.xcenter);
label = gtk_label_new_with_mnemonic (_("_Y:"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_table_attach (GTK_TABLE (table), label, 2, 3, 0, 1,
GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (label);
spinbutton =
@ -505,17 +496,12 @@ nova_center_create (GimpDrawable *drawable)
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);
gtk_table_attach (GTK_TABLE (table), pframe, 0, 4, 1, 2,
0, 0, 0, 0);
/* PREVIEW */
preview = gimp_old_preview_new (drawable, FALSE);
gtk_widget_set_events (preview->widget, PREVIEW_MASK);
gtk_container_add (GTK_CONTAINER (pframe), preview->widget);
gtk_widget_show (preview->widget);
preview = gimp_old_preview_new (drawable);
gtk_widget_add_events (preview->widget, PREVIEW_MASK);
gtk_table_attach (GTK_TABLE (table), preview->frame, 0, 4, 1, 2,
0, 0, 0, 0);
gtk_widget_show (preview->frame);
g_signal_connect_after (preview->widget, "expose_event",
G_CALLBACK (nova_center_preview_expose),
@ -524,9 +510,6 @@ nova_center_create (GimpDrawable *drawable)
G_CALLBACK (nova_center_preview_events),
center);
gtk_widget_show (pframe);
gtk_widget_show (table);
g_object_set_data (G_OBJECT (frame), "center", center);
gtk_widget_show (frame);

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

@ -69,12 +69,13 @@
#include "gimpoldpreview.h"
/* Some useful macros */
#define ENTRY_WIDTH 75
#define SCALE_WIDTH 128
#define SCALE_WIDTH 48
#define TILE_CACHE_SIZE 32
typedef struct
{
guint32 seed;
@ -296,8 +297,8 @@ plasma_dialog (GimpDrawable *drawable,
GimpImageType drawable_type)
{
GtkWidget *dlg;
GtkWidget *main_vbox;
GtkWidget *frame;
GtkWidget *vbox;
GtkWidget *hbox;
GtkWidget *label;
GtkWidget *table;
GtkWidget *seed;
@ -315,35 +316,31 @@ plasma_dialog (GimpDrawable *drawable,
NULL);
main_vbox = gtk_vbox_new (FALSE, 4);
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 6);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox),
main_vbox, TRUE, TRUE, 0);
gtk_widget_show (main_vbox);
vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), vbox, TRUE, TRUE, 0);
gtk_widget_show (vbox);
preview = gimp_old_preview_new2 (drawable_type, TRUE);
gtk_box_pack_start (GTK_BOX (main_vbox), preview->frame, FALSE, FALSE, 0);
hbox = gtk_hbox_new (FALSE, 0);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
preview = gimp_old_preview_new2 (drawable_type);
gtk_box_pack_start (GTK_BOX (hbox), preview->frame, FALSE, FALSE, 0);
gtk_widget_show (preview->frame);
plasma_seed_changed_callback (drawable, NULL); /* preview image */
gtk_widget_show (preview->widget);
/* parameter settings */
frame = gtk_frame_new (_("Parameter Settings"));
gtk_box_pack_start (GTK_BOX (main_vbox), frame, TRUE, TRUE, 0);
gtk_widget_show (frame);
table = gtk_table_new (2, 3, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
gtk_table_set_row_spacings (GTK_TABLE (table), 2);
gtk_container_set_border_width (GTK_CONTAINER (table), 4);
gtk_container_add (GTK_CONTAINER (frame), table);
gtk_table_set_col_spacings (GTK_TABLE (table), 6);
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
gtk_box_pack_start (GTK_BOX (vbox), table, TRUE, TRUE, 0);
gtk_widget_show (table);
seed = gimp_random_seed_new (&pvals.seed, &pvals.random_seed);
label = gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Random _Seed:"), 1.0, 0.5,
seed, 1, TRUE);
_("Random _Seed:"), 0.0, 0.5,
seed, 2, TRUE);
gtk_label_set_mnemonic_widget (GTK_LABEL (label),
GIMP_RANDOM_SEED_SPINBUTTON (seed));

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

@ -576,14 +576,10 @@ static gint
polarize_dialog (void)
{
GtkWidget *dialog;
GtkWidget *main_vbox;
GtkWidget *vbox;
GtkWidget *frame;
GtkWidget *table;
GtkWidget *abox;
GtkWidget *pframe;
GtkWidget *toggle;
GtkWidget *hbox;
GtkWidget *toggle;
GtkObject *adj;
gboolean run;
@ -598,44 +594,26 @@ polarize_dialog (void)
NULL);
main_vbox = gtk_vbox_new (FALSE, 4);
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 6);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG(dialog)->vbox), main_vbox,
FALSE, FALSE, 0);
gtk_widget_show (main_vbox);
/* Preview */
frame = gtk_frame_new (_("Preview"));
gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
gtk_widget_show (frame);
abox = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
gtk_container_add (GTK_CONTAINER (frame), abox);
gtk_widget_show (abox);
pframe = gtk_frame_new (NULL);
gtk_frame_set_shadow_type (GTK_FRAME (pframe), GTK_SHADOW_IN);
gtk_container_set_border_width (GTK_CONTAINER (pframe), 4);
gtk_container_add (GTK_CONTAINER (abox), pframe);
gtk_widget_show (pframe);
preview = gimp_old_preview_new (drawable, FALSE);
gtk_container_add (GTK_CONTAINER (pframe), preview->widget);
gtk_widget_show (preview->widget);
/* Controls */
frame = gtk_frame_new (_("Parameter Settings"));
gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
gtk_widget_show (frame);
vbox = gtk_vbox_new (FALSE, 4);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
gtk_container_add (GTK_CONTAINER (frame), vbox);
vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), vbox,
FALSE, FALSE, 0);
gtk_widget_show (vbox);
/* Preview */
hbox = gtk_hbox_new (FALSE, 0);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
preview = gimp_old_preview_new (drawable);
gtk_box_pack_start (GTK_BOX (hbox), preview->frame, FALSE, FALSE, 0);
gtk_widget_show (preview->frame);
/* Controls */
table = gtk_table_new (2, 3, FALSE);
gtk_table_set_row_spacings (GTK_TABLE (table), 2);
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
gtk_table_set_col_spacings (GTK_TABLE (table), 6);
gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0);
gtk_widget_show (table);
@ -658,7 +636,7 @@ polarize_dialog (void)
&pcvals.angle);
/* togglebuttons for backwards, top, polar->rectangular */
hbox = gtk_hbox_new (TRUE, 4);
hbox = gtk_hbox_new (TRUE, 6);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
toggle = gtk_check_button_new_with_mnemonic (_("_Map Backwards"));

60
plug-ins/common/waves.c
View File

@ -59,7 +59,7 @@ typedef struct
static gint do_preview = TRUE;
static GimpOldPreview *preview;
static GtkWidget *mw_preview_new (GtkWidget *parent,
static GtkWidget *mw_preview_new (GtkWidget *parent,
GimpDrawable *drawable);
static void query (void);
@ -285,7 +285,6 @@ pluginCoreIA (piArgs *argp,
GtkWidget *frame;
GtkWidget *hbox;
GtkWidget *vbox;
GtkWidget *sep;
GtkWidget *table;
GtkWidget *preview;
GtkWidget *toggle;
@ -303,13 +302,13 @@ pluginCoreIA (piArgs *argp,
NULL);
main_vbox = gtk_vbox_new (FALSE, 4);
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 6);
main_vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), main_vbox,
TRUE, TRUE, 0);
gtk_widget_show (main_vbox);
hbox = gtk_hbox_new (FALSE, 4);
hbox = gtk_hbox_new (FALSE, 12);
gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
@ -317,6 +316,10 @@ pluginCoreIA (piArgs *argp,
g_object_set_data (G_OBJECT (preview), "piArgs", argp);
waves_do_preview ();
vbox = gtk_vbox_new (FALSE, 12);
gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
gtk_widget_show (vbox);
frame = gimp_int_radio_group_new (TRUE, _("Mode"),
G_CALLBACK (waves_radio_button_update),
&argp->type, argp->type,
@ -325,15 +328,9 @@ pluginCoreIA (piArgs *argp,
_("_Blacken"), MODE_BLACKEN, NULL,
NULL);
gtk_box_pack_start (GTK_BOX (hbox), frame, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
gtk_widget_show (frame);
vbox = GTK_BIN (frame)->child;
sep = gtk_hseparator_new ();
gtk_box_pack_start (GTK_BOX (vbox), sep, FALSE, FALSE, 2);
gtk_widget_show (sep);
toggle = gtk_check_button_new_with_mnemonic ( _("_Reflective"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), argp->reflective);
gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, FALSE, 0);
@ -343,15 +340,11 @@ pluginCoreIA (piArgs *argp,
G_CALLBACK (waves_toggle_button_update),
&argp->reflective);
frame = gtk_frame_new ( _("Parameter Settings"));
gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
gtk_widget_show (frame);
table = gtk_table_new (3, 3, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
gtk_table_set_row_spacings (GTK_TABLE (table), 2);
gtk_container_set_border_width (GTK_CONTAINER (table), 4);
gtk_container_add (GTK_CONTAINER (frame), table);
gtk_table_set_col_spacings (GTK_TABLE (table), 6);
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
gtk_box_pack_start (GTK_BOX (main_vbox), table, FALSE, FALSE, 0);
gtk_widget_show (table);
adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 0,
_("_Amplitude:"), 140, 6,
@ -380,8 +373,6 @@ pluginCoreIA (piArgs *argp,
G_CALLBACK (waves_double_adjustment_update),
&argp->wavelength);
gtk_widget_show (table);
gtk_widget_show (dlg);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
@ -431,32 +422,21 @@ mw_preview_toggle_callback (GtkWidget *widget,
}
static GtkWidget *
mw_preview_new (GtkWidget *parent, GimpDrawable *drawable)
mw_preview_new (GtkWidget *parent,
GimpDrawable *drawable)
{
GtkWidget *frame;
GtkWidget *pframe;
GtkWidget *vbox;
GtkWidget *button;
frame = gtk_frame_new (_("Preview"));
gtk_box_pack_start (GTK_BOX (parent), frame, FALSE, FALSE, 0);
gtk_widget_show (frame);
vbox = gtk_vbox_new (FALSE, 2);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
gtk_container_add (GTK_CONTAINER (frame), vbox);
vbox = gtk_vbox_new (FALSE, 6);
gtk_box_pack_start (GTK_BOX (parent), vbox, FALSE, FALSE, 0);
gtk_widget_show (vbox);
pframe = gtk_frame_new (NULL);
gtk_frame_set_shadow_type (GTK_FRAME(pframe), GTK_SHADOW_IN);
gtk_box_pack_start (GTK_BOX (vbox), pframe, FALSE, FALSE, 0);
gtk_widget_show (pframe);
preview = gimp_old_preview_new (drawable, FALSE);
preview = gimp_old_preview_new (drawable);
/* FIXME: this forces gimp_old_preview to set its alpha correctly */
gimp_old_preview_fill_scaled (preview, drawable);
gtk_container_add (GTK_CONTAINER (pframe), preview->widget);
gtk_widget_show (preview->widget);
gtk_box_pack_start (GTK_BOX (vbox), preview->frame, FALSE, FALSE, 0);
gtk_widget_show (preview->frame);
button = gtk_check_button_new_with_mnemonic (_("_Do Preview"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), do_preview);

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

@ -359,7 +359,7 @@ render_blast (GimpDrawable *drawable,
if (preview_mode)
{
gimp_old_preview_do_row(preview, row, width, buffer);
gimp_old_preview_do_row (preview, row, width, buffer);
}
else
{
@ -379,13 +379,16 @@ render_blast (GimpDrawable *drawable,
{
if (preview_mode)
{
memcpy (buffer, preview->cache + (row * row_stride), row_stride);
gimp_old_preview_do_row(preview, row, width, buffer);
memcpy (buffer,
preview->cache + (row * row_stride), row_stride);
gimp_old_preview_do_row (preview, row, width, buffer);
}
else
{
gimp_pixel_rgn_get_row (&src_region, buffer, x1, row, width);
gimp_pixel_rgn_set_row (&dest_region, buffer, x1, row, width);
gimp_pixel_rgn_get_row (&src_region,
buffer, x1, row, width);
gimp_pixel_rgn_set_row (&dest_region,
buffer, x1, row, width);
}
}
}
@ -476,7 +479,7 @@ render_wind (GimpDrawable *drawable,
if (preview_mode)
{
gimp_old_preview_do_row(preview, row, width, sb);
gimp_old_preview_do_row (preview, row, width, sb);
}
else
{
@ -855,8 +858,8 @@ radio_callback (GtkWidget *widget,
static gint
dialog_box (GimpDrawable *drawable)
{
GtkWidget *main_vbox;
GtkWidget *vbox;
GtkWidget *hbox;
GtkWidget *table;
GtkObject *adj;
GtkWidget *frame;
@ -881,35 +884,30 @@ dialog_box (GimpDrawable *drawable)
NULL);
vbox = gtk_vbox_new (FALSE, 2);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 0);
vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), vbox, TRUE, TRUE, 0);
gtk_widget_show (vbox);
preview = gimp_old_preview_new (NULL, TRUE);
gimp_old_preview_fill (preview, drawable);
gtk_box_pack_start (GTK_BOX (vbox), preview->frame, FALSE, FALSE, 0);
render_effect (drawable, TRUE);
gtk_widget_show (preview->widget);
hbox = gtk_hbox_new (FALSE, 0);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
frame = gtk_frame_new (_("Parameter Settings"));
gtk_container_set_border_width (GTK_CONTAINER (frame), 6);
gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
gtk_widget_show (frame);
main_vbox = gtk_vbox_new (FALSE, 4);
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 6);
gtk_container_add (GTK_CONTAINER (frame), main_vbox);
gtk_widget_show (main_vbox);
preview = gimp_old_preview_new (NULL);
gimp_old_preview_fill (preview, drawable);
gtk_box_pack_start (GTK_BOX (hbox), preview->frame, FALSE, FALSE, 0);
gtk_widget_show (preview->frame);
render_effect (drawable, TRUE);
/*****************************************************
outer frame and table
***************************************************/
table = gtk_table_new (1, 3, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
gtk_table_set_row_spacings (GTK_TABLE (table), 2);
gtk_box_pack_start (GTK_BOX (main_vbox), table, FALSE, FALSE, 0);
gtk_table_set_col_spacings (GTK_TABLE (table), 6);
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0);
/*********************************************************
radio buttons for choosing wind rendering algorithm
@ -979,9 +977,9 @@ dialog_box (GimpDrawable *drawable)
table for sliders
****************************************************/
table = gtk_table_new (2, 3, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
gtk_table_set_row_spacings (GTK_TABLE (table), 2);
gtk_box_pack_start (GTK_BOX (main_vbox), table, FALSE, FALSE, 0);
gtk_table_set_col_spacings (GTK_TABLE (table), 6);
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0);
/*****************************************************
slider and entry for threshold

41
plug-ins/libgimpoldpreview/gimpoldpreview.c
View File

@ -3,7 +3,7 @@
*
* gimpoldpreview.c
* This file contains the implementation of the gimpoldpreview widget
* witch is used a a few plug-ins. This shouldn't be used by any
* which is used by a few plug-ins. This shouldn't be used by any
* foreign plug-in, because it uses some deprecated stuff. We only
* used it there since we do not a better preview widget for now.
*
@ -33,40 +33,28 @@
#undef GTK_DISABLE_DEPRECATED
#include <gtk/gtk.h>
#include <libgimp/gimp.h>
#include "libgimp/gimp.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "gimpoldpreview.h"
#include "libgimp/stdplugins-intl.h"
#define PREVIEW_SIZE 128
#define PREVIEW_BPP 3
static void
gimp_old_preview_put_in_frame (GimpOldPreview* preview)
gimp_old_preview_put_in_frame (GimpOldPreview *preview)
{
GtkWidget *frame, *abox;
preview->frame = gtk_frame_new (NULL);
gtk_frame_set_shadow_type (GTK_FRAME (preview->frame), GTK_SHADOW_IN);
preview->frame = gtk_frame_new (_("Preview"));
gtk_widget_show (preview->frame);
abox = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
gtk_container_set_border_width (GTK_CONTAINER (abox), 4);
gtk_container_add (GTK_CONTAINER (preview->frame), abox);
gtk_widget_show (abox);
frame = gtk_frame_new (NULL);
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
gtk_container_add (GTK_CONTAINER (abox), frame);
gtk_widget_show (frame);
gtk_container_add (GTK_CONTAINER (frame), preview->widget);
gtk_container_add (GTK_CONTAINER (preview->frame), preview->widget);
gtk_widget_show (preview->widget);
}
GimpOldPreview*
gimp_old_preview_new (GimpDrawable *drawable,
gboolean has_frame)
gimp_old_preview_new (GimpDrawable *drawable)
{
GimpOldPreview *preview = g_new0 (GimpOldPreview, 1);
@ -76,8 +64,7 @@ gimp_old_preview_new (GimpDrawable *drawable,
if (drawable)
gimp_old_preview_fill_with_thumb (preview, drawable->drawable_id);
if (has_frame)
gimp_old_preview_put_in_frame (preview);
gimp_old_preview_put_in_frame (preview);
return preview;
}
@ -93,8 +80,7 @@ gimp_old_preview_free (GimpOldPreview *preview)
}
GimpOldPreview*
gimp_old_preview_new2 (GimpImageType drawable_type,
gboolean has_frame)
gimp_old_preview_new2 (GimpImageType drawable_type)
{
GimpOldPreview *preview;
guchar *buf = NULL;
@ -131,8 +117,7 @@ gimp_old_preview_new2 (GimpImageType drawable_type,
g_free (buf);
if (has_frame)
gimp_old_preview_put_in_frame (preview);
gimp_old_preview_put_in_frame (preview);
preview->buffer = GTK_PREVIEW (preview->widget)->buffer;
preview->width = GTK_PREVIEW (preview->widget)->buffer_width;

44
plug-ins/libgimpoldpreview/gimpoldpreview.h
View File

@ -3,7 +3,7 @@
*
* gimpoldpreview.h
* This file contains the implementation of the gimpoldpreview widget
* witch is used a a few plug-ins. This shouldn't be used by any
* which is used by a few plug-ins. This shouldn't be used by any
* foreign plug-in, because it uses some deprecated stuff. We only
* used it there since we do not a better preview widget for now.
*
@ -63,10 +63,8 @@ typedef void (*GimpOldPreviewFunc) (const guchar *src,
gint bpp,
gpointer data);
GimpOldPreview * gimp_old_preview_new (GimpDrawable *drawable,
gboolean has_frame);
GimpOldPreview * gimp_old_preview_new2 (GimpImageType drawable_type,
gboolean has_frame);
GimpOldPreview * gimp_old_preview_new (GimpDrawable *drawable);
GimpOldPreview * gimp_old_preview_new2 (GimpImageType drawable_type);
void gimp_old_preview_free (GimpOldPreview *preview);
void gimp_old_preview_update (GimpOldPreview *preview,
@ -74,26 +72,26 @@ void gimp_old_preview_update (GimpOldPreview *preview,
gpointer data);
void gimp_old_preview_fill_with_thumb (GimpOldPreview *preview,
gint32 drawable_ID);
void gimp_old_preview_fill (GimpOldPreview *preview,
GimpDrawable *drawable);
void gimp_old_preview_fill_scaled (GimpOldPreview *preview,
GimpDrawable *drawable);
void gimp_old_preview_fill_with_thumb (GimpOldPreview *preview,
gint32 drawable_ID);
void gimp_old_preview_fill (GimpOldPreview *preview,
GimpDrawable *drawable);
void gimp_old_preview_fill_scaled (GimpOldPreview *preview,
GimpDrawable *drawable);
void gimp_old_preview_do_row (GimpOldPreview *preview,
gint row,
gint width,
const guchar *src);
void gimp_old_preview_do_row (GimpOldPreview *preview,
gint row,
gint width,
const guchar *src);
void gimp_old_preview_put_pixel (GimpOldPreview *preview,
gint x,
gint y,
const guchar *pixel);
void gimp_old_preview_get_pixel (GimpOldPreview *preview,
gint x,
gint y,
guchar *pixel);
void gimp_old_preview_put_pixel (GimpOldPreview *preview,
gint x,
gint y,
const guchar *pixel);
void gimp_old_preview_get_pixel (GimpOldPreview *preview,
gint x,
gint y,
guchar *pixel);
G_END_DECLS