[gimp/gtk3-port: 433/440] libgimpwidgets: rename the _grid()-Variants of gimp_scale_entry_*
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/gtk3-port: 433/440] libgimpwidgets: rename the _grid()-Variants of gimp_scale_entry_*
- Date: Sun, 13 May 2018 12:54:58 +0000 (UTC)
commit 2c1cb36377eb949a0f54d4a351f69b29b802fbc5
Author: Simon Budig <simon budig de>
Date: Fri May 11 13:52:33 2018 +0200
libgimpwidgets: rename the _grid()-Variants of gimp_scale_entry_*
Adjust all plugins to follow accordingly.
This concludes the GtkTable'ocide.
app/dialogs/palette-import-dialog.c | 6 +-
libgimpwidgets/gimpcolorscales.c | 22 +-
libgimpwidgets/gimppropwidgets.c | 32 +-
libgimpwidgets/gimpscaleentry.c | 66 ++--
libgimpwidgets/gimpscaleentry.h | 4 +-
modules/color-selector-cmyk.c | 20 +-
plug-ins/common/align-layers.c | 10 +-
plug-ins/common/blinds.c | 20 +-
plug-ins/common/cartoon.c | 20 +-
plug-ins/common/cml-explorer.c | 140 +++++-----
plug-ins/common/compose.c | 8 +-
plug-ins/common/contrast-retinex.c | 28 +-
plug-ins/common/depth-merge.c | 40 ++--
plug-ins/common/despeckle.c | 30 +-
plug-ins/common/destripe.c | 10 +-
plug-ins/common/edge-neon.c | 22 +-
plug-ins/common/emboss.c | 30 +-
plug-ins/common/file-csource.c | 10 +-
plug-ins/common/file-raw-data.c | 40 ++--
plug-ins/common/file-xpm.c | 10 +-
plug-ins/common/film.c | 84 +++---
plug-ins/common/fractal-trace.c | 50 ++--
plug-ins/common/jigsaw.c | 46 ++--
plug-ins/common/newsprint.c | 72 +++---
plug-ins/common/nl-filter.c | 20 +-
plug-ins/common/oilify.c | 20 +-
plug-ins/common/photocopy.c | 40 ++--
plug-ins/common/sharpen.c | 12 +-
plug-ins/common/softglow.c | 30 +-
plug-ins/common/sparkle.c | 18 +-
plug-ins/common/sphere-designer.c | 80 +++---
plug-ins/common/tile-small.c | 20 +-
plug-ins/common/unsharp-mask.c | 30 +-
plug-ins/common/van-gogh-lic.c | 50 ++--
plug-ins/common/wavelet-decompose.c | 12 +-
plug-ins/file-jpeg/jpeg-save.c | 28 +-
plug-ins/file-webp/file-webp-dialog.c | 48 ++--
plug-ins/flame/flame.c | 120 ++++----
.../fractal-explorer/fractal-explorer-dialogs.c | 106 ++++----
plug-ins/gfig/gfig-dialog.c | 58 ++--
plug-ins/gimpressionist/brush.c | 28 +-
plug-ins/gimpressionist/color.c | 14 +-
plug-ins/gimpressionist/general.c | 70 +++---
plug-ins/gimpressionist/orientation.c | 42 ++--
plug-ins/gimpressionist/orientmap.c | 56 ++--
plug-ins/gimpressionist/paper.c | 28 +-
plug-ins/gimpressionist/placement.c | 14 +-
plug-ins/gimpressionist/size.c | 42 ++--
plug-ins/gimpressionist/sizemap.c | 42 ++--
plug-ins/gradient-flare/gradient-flare.c | 220 +++++++-------
plug-ins/lighting/lighting-ui.c | 14 +-
plug-ins/map-object/map-object-ui.c | 126 ++++----
plug-ins/pagecurl/pagecurl.c | 12 +-
plug-ins/script-fu/script-fu-interface.c | 22 +-
.../selection-to-path/selection-to-path-dialog.c | 308 ++++++++++----------
55 files changed, 1275 insertions(+), 1275 deletions(-)
---
diff --git a/app/dialogs/palette-import-dialog.c b/app/dialogs/palette-import-dialog.c
index 3aaa106..dfaaf88 100644
--- a/app/dialogs/palette-import-dialog.c
+++ b/app/dialogs/palette-import-dialog.c
@@ -312,7 +312,7 @@ palette_import_dialog_new (GimpContext *context)
private->entry, 2);
/* The # of colors */
- private->num_colors = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 1,
+ private->num_colors = gimp_scale_entry_new (GTK_GRID (grid), 0, 1,
_("N_umber of colors:"), -1, 5,
256, 2, 10000, 1, 10, 0,
TRUE, 0.0, 0.0,
@@ -325,7 +325,7 @@ palette_import_dialog_new (GimpContext *context)
private);
/* The columns */
- private->columns = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 2,
+ private->columns = gimp_scale_entry_new (GTK_GRID (grid), 0, 2,
_("C_olumns:"), -1, 5,
16, 0, 64, 1, 8, 0,
TRUE, 0.0, 0.0,
@@ -336,7 +336,7 @@ palette_import_dialog_new (GimpContext *context)
private);
/* The interval */
- private->threshold = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 3,
+ private->threshold = gimp_scale_entry_new (GTK_GRID (grid), 0, 3,
_("I_nterval:"), -1, 5,
1, 1, 128, 1, 8, 0,
TRUE, 0.0, 0.0,
diff --git a/libgimpwidgets/gimpcolorscales.c b/libgimpwidgets/gimpcolorscales.c
index c0ca1be..8fd8bc1 100644
--- a/libgimpwidgets/gimpcolorscales.c
+++ b/libgimpwidgets/gimpcolorscales.c
@@ -309,17 +309,17 @@ create_group (GimpColorScales *scales,
gtk_size_group_add_widget (size_group0, scales->toggles[i]);
scales->adjustments[i] = (GtkAdjustment *)
- gimp_color_scale_entry_new_grid (GTK_GRID (grid), 1, row,
- gettext (enum_desc->value_desc),
- -1, -1,
- scale_defs[i].default_value,
- scale_defs[i].scale_min_value,
- scale_defs[i].scale_max_value,
- 1.0,
- scale_defs[i].scale_inc,
- 1,
- gettext (enum_desc->value_help),
- NULL);
+ gimp_color_scale_entry_new (GTK_GRID (grid), 1, row,
+ gettext (enum_desc->value_desc),
+ -1, -1,
+ scale_defs[i].default_value,
+ scale_defs[i].scale_min_value,
+ scale_defs[i].scale_max_value,
+ 1.0,
+ scale_defs[i].scale_inc,
+ 1,
+ gettext (enum_desc->value_help),
+ NULL);
gtk_adjustment_configure (scales->adjustments[i],
scale_defs[i].default_value,
diff --git a/libgimpwidgets/gimppropwidgets.c b/libgimpwidgets/gimppropwidgets.c
index 7f23495..1e2d838 100644
--- a/libgimpwidgets/gimppropwidgets.c
+++ b/libgimpwidgets/gimppropwidgets.c
@@ -1377,25 +1377,25 @@ gimp_prop_scale_entry_new (GObject *config,
if (! limit_scale)
{
- adjustment = gimp_scale_entry_new_grid (grid, column, row,
- label, -1, -1,
- value, lower, upper,
- step_increment, page_increment,
- digits,
- TRUE, 0.0, 0.0,
- tooltip,
- NULL);
+ adjustment = gimp_scale_entry_new (grid, column, row,
+ label, -1, -1,
+ value, lower, upper,
+ step_increment, page_increment,
+ digits,
+ TRUE, 0.0, 0.0,
+ tooltip,
+ NULL);
}
else
{
- adjustment = gimp_scale_entry_new_grid (grid, column, row,
- label, -1, -1,
- value, lower_limit, upper_limit,
- step_increment, page_increment,
- digits,
- FALSE, lower, upper,
- tooltip,
- NULL);
+ adjustment = gimp_scale_entry_new (grid, column, row,
+ label, -1, -1,
+ value, lower_limit, upper_limit,
+ step_increment, page_increment,
+ digits,
+ FALSE, lower, upper,
+ tooltip,
+ NULL);
}
set_param_spec (G_OBJECT (adjustment), NULL, param_spec);
diff --git a/libgimpwidgets/gimpscaleentry.c b/libgimpwidgets/gimpscaleentry.c
index 59d0495..95d07f1 100644
--- a/libgimpwidgets/gimpscaleentry.c
+++ b/libgimpwidgets/gimpscaleentry.c
@@ -210,7 +210,7 @@ gimp_scale_entry_new_internal (gboolean color_scale,
}
/**
- * gimp_scale_entry_new_grid:
+ * gimp_scale_entry_new:
* @grid: The #GtkGrid the widgets will be attached to.
* @column: The column to start with.
* @row: The row to attach the widgets.
@@ -239,23 +239,23 @@ gimp_scale_entry_new_internal (gboolean color_scale,
* Returns: The #GtkSpinButton's #GtkAdjustment.
**/
GtkAdjustment *
-gimp_scale_entry_new_grid (GtkGrid *grid,
- gint column,
- gint row,
- const gchar *text,
- gint scale_width,
- gint spinbutton_width,
- gdouble value,
- gdouble lower,
- gdouble upper,
- gdouble step_increment,
- gdouble page_increment,
- guint digits,
- gboolean constrain,
- gdouble unconstrained_lower,
- gdouble unconstrained_upper,
- const gchar *tooltip,
- const gchar *help_id)
+gimp_scale_entry_new (GtkGrid *grid,
+ gint column,
+ gint row,
+ const gchar *text,
+ gint scale_width,
+ gint spinbutton_width,
+ gdouble value,
+ gdouble lower,
+ gdouble upper,
+ gdouble step_increment,
+ gdouble page_increment,
+ guint digits,
+ gboolean constrain,
+ gdouble unconstrained_lower,
+ gdouble unconstrained_upper,
+ const gchar *tooltip,
+ const gchar *help_id)
{
return gimp_scale_entry_new_internal (FALSE,
grid, column, row,
@@ -270,7 +270,7 @@ gimp_scale_entry_new_grid (GtkGrid *grid,
}
/**
- * gimp_color_scale_entry_new_grid:
+ * gimp_color_scale_entry_new:
* @grid: The #GtkGrid the widgets will be attached to.
* @column: The column to start with.
* @row: The row to attach the widgets.
@@ -293,20 +293,20 @@ gimp_scale_entry_new_grid (GtkGrid *grid,
* Returns: The #GtkSpinButton's #GtkAdjustment.
**/
GtkAdjustment *
-gimp_color_scale_entry_new_grid (GtkGrid *grid,
- gint column,
- gint row,
- const gchar *text,
- gint scale_width,
- gint spinbutton_width,
- gdouble value,
- gdouble lower,
- gdouble upper,
- gdouble step_increment,
- gdouble page_increment,
- guint digits,
- const gchar *tooltip,
- const gchar *help_id)
+gimp_color_scale_entry_new (GtkGrid *grid,
+ gint column,
+ gint row,
+ const gchar *text,
+ gint scale_width,
+ gint spinbutton_width,
+ gdouble value,
+ gdouble lower,
+ gdouble upper,
+ gdouble step_increment,
+ gdouble page_increment,
+ guint digits,
+ const gchar *tooltip,
+ const gchar *help_id)
{
return gimp_scale_entry_new_internal (TRUE,
grid, column, row,
diff --git a/libgimpwidgets/gimpscaleentry.h b/libgimpwidgets/gimpscaleentry.h
index eb0e730..28c117b 100644
--- a/libgimpwidgets/gimpscaleentry.h
+++ b/libgimpwidgets/gimpscaleentry.h
@@ -78,7 +78,7 @@ G_BEGIN_DECLS
(GTK_SPIN_BUTTON (g_object_get_data (G_OBJECT (adj), "spinbutton")))
-GtkAdjustment * gimp_scale_entry_new_grid (GtkGrid *grid,
+GtkAdjustment * gimp_scale_entry_new (GtkGrid *grid,
gint column,
gint row,
const gchar *text,
@@ -96,7 +96,7 @@ GtkAdjustment * gimp_scale_entry_new_grid (GtkGrid *grid,
const gchar *tooltip,
const gchar *help_id);
-GtkAdjustment * gimp_color_scale_entry_new_grid (GtkGrid *grid,
+GtkAdjustment * gimp_color_scale_entry_new (GtkGrid *grid,
gint column,
gint row,
const gchar *text,
diff --git a/modules/color-selector-cmyk.c b/modules/color-selector-cmyk.c
index 0129630..8b2806e 100644
--- a/modules/color-selector-cmyk.c
+++ b/modules/color-selector-cmyk.c
@@ -167,16 +167,16 @@ colorsel_cmyk_init (ColorselCmyk *module)
for (i = 0; i < 4; i++)
{
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 1, i,
- gettext (cmyk_labels[i]),
- -1, -1,
- 0.0,
- 0.0, 100.0,
- 1.0, 10.0,
- 0,
- TRUE, 0.0, 0.0,
- gettext (cmyk_tips[i]),
- NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 1, i,
+ gettext (cmyk_labels[i]),
+ -1, -1,
+ 0.0,
+ 0.0, 100.0,
+ 1.0, 10.0,
+ 0,
+ TRUE, 0.0, 0.0,
+ gettext (cmyk_tips[i]),
+ NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (colorsel_cmyk_adj_update),
diff --git a/plug-ins/common/align-layers.c b/plug-ins/common/align-layers.c
index 0b8db95..72a0dac 100644
--- a/plug-ins/common/align-layers.c
+++ b/plug-ins/common/align-layers.c
@@ -708,11 +708,11 @@ align_layers_dialog (void)
_("Ver_tical base:"), 0.0, 0.5,
combo, 2);
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 4,
- _("_Grid size:"), SCALE_WIDTH, 0,
- VALS.grid_size, 1, 200, 1, 10, 0,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, 4,
+ _("_Grid size:"), SCALE_WIDTH, 0,
+ VALS.grid_size, 1, 200, 1, 10, 0,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_int_adjustment_update),
&VALS.grid_size);
diff --git a/plug-ins/common/blinds.c b/plug-ins/common/blinds.c
index f3275b0..5112024 100644
--- a/plug-ins/common/blinds.c
+++ b/plug-ins/common/blinds.c
@@ -303,11 +303,11 @@ blinds_dialog (GimpDrawable *drawable)
gtk_box_pack_start (GTK_BOX (main_vbox), grid, FALSE, FALSE, 0);
gtk_widget_show (grid);
- size_data = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 0,
- _("_Displacement:"), SCALE_WIDTH, 0,
- bvals.angledsp, 1, 90, 1, 15, 0,
- TRUE, 0, 0,
- NULL, NULL);
+ size_data = gimp_scale_entry_new (GTK_GRID (grid), 0, 0,
+ _("_Displacement:"), SCALE_WIDTH, 0,
+ bvals.angledsp, 1, 90, 1, 15, 0,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (size_data, "value-changed",
G_CALLBACK (gimp_int_adjustment_update),
&bvals.angledsp);
@@ -315,11 +315,11 @@ blinds_dialog (GimpDrawable *drawable)
G_CALLBACK (gimp_preview_invalidate),
preview);
- size_data = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 1,
- _("_Number of segments:"), SCALE_WIDTH, 0,
- bvals.numsegs, 1, MAX_FANS, 1, 2, 0,
- TRUE, 0, 0,
- NULL, NULL);
+ size_data = gimp_scale_entry_new (GTK_GRID (grid), 0, 1,
+ _("_Number of segments:"), SCALE_WIDTH, 0,
+ bvals.numsegs, 1, MAX_FANS, 1, 2, 0,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (size_data, "value-changed",
G_CALLBACK (gimp_int_adjustment_update),
&bvals.numsegs);
diff --git a/plug-ins/common/cartoon.c b/plug-ins/common/cartoon.c
index 105fa68..2eeb1ce 100644
--- a/plug-ins/common/cartoon.c
+++ b/plug-ins/common/cartoon.c
@@ -843,11 +843,11 @@ cartoon_dialog (GimpDrawable *drawable)
gtk_widget_show (grid);
/* Label, scale, entry for cvals.amount */
- scale_data = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 0,
- _("_Mask radius:"), 100, 5,
- cvals.mask_radius, 1.0, 50.0, 1, 5.0, 2,
- TRUE, 0, 0,
- NULL, NULL);
+ scale_data = gimp_scale_entry_new (GTK_GRID (grid), 0, 0,
+ _("_Mask radius:"), 100, 5,
+ cvals.mask_radius, 1.0, 50.0, 1, 5.0, 2,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (scale_data, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
@@ -857,11 +857,11 @@ cartoon_dialog (GimpDrawable *drawable)
preview);
/* Label, scale, entry for cvals.amount */
- scale_data = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 1,
- _("_Percent black:"), 50, 5,
- cvals.pct_black, 0.0, 1.0, 0.01, 0.1, 3,
- TRUE, 0, 0,
- NULL, NULL);
+ scale_data = gimp_scale_entry_new (GTK_GRID (grid), 0, 1,
+ _("_Percent black:"), 50, 5,
+ cvals.pct_black, 0.0, 1.0, 0.01, 0.1, 3,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (scale_data, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
diff --git a/plug-ins/common/cml-explorer.c b/plug-ins/common/cml-explorer.c
index bb681f2..c1816ef 100644
--- a/plug-ins/common/cml-explorer.c
+++ b/plug-ins/common/cml-explorer.c
@@ -1347,20 +1347,20 @@ CML_explorer_dialog (void)
gtk_size_group_add_widget (group, label);
g_object_unref (group);
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 1,
- _("Zoom scale:"), SCALE_WIDTH, 3,
- VALS.scale, 1, 10, 1, 2, 0,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, 1,
+ _("Zoom scale:"), SCALE_WIDTH, 3,
+ VALS.scale, 1, 10, 1, 2, 0,
+ TRUE, 0, 0,
+ NULL, NULL);
gtk_size_group_add_widget (group, GIMP_SCALE_ENTRY_LABEL (adj));
CML_explorer_int_entry_init (&widget_pointers[3][1],
adj, &VALS.scale);
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 2,
- _("Start offset:"), SCALE_WIDTH, 3,
- VALS.start_offset, 0, 100, 1, 10, 0,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, 2,
+ _("Start offset:"), SCALE_WIDTH, 3,
+ VALS.start_offset, 0, 100, 1, 10, 0,
+ TRUE, 0, 0,
+ NULL, NULL);
gtk_size_group_add_widget (group, GIMP_SCALE_ENTRY_LABEL (adj));
CML_explorer_int_entry_init (&widget_pointers[3][2],
adj, &VALS.start_offset);
@@ -1376,11 +1376,11 @@ CML_explorer_dialog (void)
gtk_container_add (GTK_CONTAINER (frame), grid);
gtk_widget_show (grid);
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 0,
- _("Seed:"), SCALE_WIDTH, 0,
- VALS.seed, 0, (guint32) -1, 1, 10, 0,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, 0,
+ _("Seed:"), SCALE_WIDTH, 0,
+ VALS.seed, 0, (guint32) -1, 1, 10, 0,
+ TRUE, 0, 0,
+ NULL, NULL);
gtk_size_group_add_widget (group, GIMP_SCALE_ENTRY_LABEL (adj));
CML_explorer_int_entry_init (&widget_pointers[3][3],
adj, &VALS.seed);
@@ -1614,74 +1614,74 @@ CML_dialog_channel_panel_new (CML_PARAM *param,
gtk_widget_show (toggle);
index++;
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, index,
- _("Mod. rate:"), SCALE_WIDTH, 5,
- param->mod_rate, 0.0, 1.0, 0.01, 0.1, 2,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, index,
+ _("Mod. rate:"), SCALE_WIDTH, 5,
+ param->mod_rate, 0.0, 1.0, 0.01, 0.1, 2,
+ TRUE, 0, 0,
+ NULL, NULL);
CML_explorer_double_entry_init (&widget_pointers[channel_id][index],
adj, ¶m->mod_rate);
index++;
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, index,
- _("Env. sensitivity:"), SCALE_WIDTH, 5,
- param->env_sensitivity, 0.0, 1.0, 0.01, 0.1, 2,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, index,
+ _("Env. sensitivity:"), SCALE_WIDTH, 5,
+ param->env_sensitivity, 0.0, 1.0, 0.01, 0.1, 2,
+ TRUE, 0, 0,
+ NULL, NULL);
CML_explorer_double_entry_init (&widget_pointers[channel_id][index],
adj, ¶m->env_sensitivity);
index++;
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, index,
- _("Diffusion dist.:"), SCALE_WIDTH, 5,
- param->diffusion_dist, 2, 10, 1, 2, 0,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, index,
+ _("Diffusion dist.:"), SCALE_WIDTH, 5,
+ param->diffusion_dist, 2, 10, 1, 2, 0,
+ TRUE, 0, 0,
+ NULL, NULL);
CML_explorer_int_entry_init (&widget_pointers[channel_id][index],
adj, ¶m->diffusion_dist);
index++;
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, index,
- _("# of subranges:"), SCALE_WIDTH, 5,
- param->range_num, 1, 10, 1, 2, 0,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, index,
+ _("# of subranges:"), SCALE_WIDTH, 5,
+ param->range_num, 1, 10, 1, 2, 0,
+ TRUE, 0, 0,
+ NULL, NULL);
CML_explorer_int_entry_init (&widget_pointers[channel_id][index],
adj, ¶m->range_num);
index++;
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, index,
- _("P(ower factor):"), SCALE_WIDTH, 5,
- param->power, 0.0, 10.0, 0.1, 1.0, 2,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, index,
+ _("P(ower factor):"), SCALE_WIDTH, 5,
+ param->power, 0.0, 10.0, 0.1, 1.0, 2,
+ TRUE, 0, 0,
+ NULL, NULL);
CML_explorer_double_entry_init (&widget_pointers[channel_id][index],
adj, ¶m->power);
index++;
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, index,
- _("Parameter k:"), SCALE_WIDTH, 5,
- param->parameter_k, 0.0, 10.0, 0.1, 1.0, 2,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, index,
+ _("Parameter k:"), SCALE_WIDTH, 5,
+ param->parameter_k, 0.0, 10.0, 0.1, 1.0, 2,
+ TRUE, 0, 0,
+ NULL, NULL);
CML_explorer_double_entry_init (&widget_pointers[channel_id][index],
adj, ¶m->parameter_k);
index++;
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, index,
- _("Range low:"), SCALE_WIDTH, 5,
- param->range_l, 0.0, 1.0, 0.01, 0.1, 2,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, index,
+ _("Range low:"), SCALE_WIDTH, 5,
+ param->range_l, 0.0, 1.0, 0.01, 0.1, 2,
+ TRUE, 0, 0,
+ NULL, NULL);
CML_explorer_double_entry_init (&widget_pointers[channel_id][index],
adj, ¶m->range_l);
index++;
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, index,
- _("Range high:"), SCALE_WIDTH, 5,
- param->range_h, 0.0, 1.0, 0.01, 0.1, 2,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, index,
+ _("Range high:"), SCALE_WIDTH, 5,
+ param->range_h, 0.0, 1.0, 0.01, 0.1, 2,
+ TRUE, 0, 0,
+ NULL, NULL);
CML_explorer_double_entry_init (&widget_pointers[channel_id][index],
adj, ¶m->range_h);
index++;
@@ -1732,31 +1732,31 @@ CML_dialog_advanced_panel_new (void)
index = 0;
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, index,
- _("Ch. sensitivity:"), SCALE_WIDTH, 0,
- param->ch_sensitivity, 0.0, 1.0, 0.01, 0.1, 2,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, index,
+ _("Ch. sensitivity:"), SCALE_WIDTH, 0,
+ param->ch_sensitivity, 0.0, 1.0, 0.01, 0.1, 2,
+ TRUE, 0, 0,
+ NULL, NULL);
CML_explorer_double_entry_init (&widget_pointers[channel_id][index +
widget_offset],
adj, ¶m->ch_sensitivity);
index++;
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, index,
- _("Mutation rate:"), SCALE_WIDTH, 0,
- param->mutation_rate, 0.0, 1.0, 0.01, 0.1, 2,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, index,
+ _("Mutation rate:"), SCALE_WIDTH, 0,
+ param->mutation_rate, 0.0, 1.0, 0.01, 0.1, 2,
+ TRUE, 0, 0,
+ NULL, NULL);
CML_explorer_double_entry_init (&widget_pointers[channel_id][index +
widget_offset],
adj, ¶m->mutation_rate);
index++;
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, index,
- _("Mutation dist.:"), SCALE_WIDTH, 0,
- param->mutation_dist, 0.0, 1.0, 0.01, 0.1, 2,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, index,
+ _("Mutation dist.:"), SCALE_WIDTH, 0,
+ param->mutation_dist, 0.0, 1.0, 0.01, 0.1, 2,
+ TRUE, 0, 0,
+ NULL, NULL);
CML_explorer_double_entry_init (&widget_pointers[channel_id][index +
widget_offset],
adj, ¶m->mutation_dist);
diff --git a/plug-ins/common/compose.c b/plug-ins/common/compose.c
index 6f0c641..31d7626 100644
--- a/plug-ins/common/compose.c
+++ b/plug-ins/common/compose.c
@@ -1212,10 +1212,10 @@ compose_dialog (const gchar *compose_type,
gtk_label_set_mnemonic_widget (GTK_LABEL (label), combo);
- scale = gimp_color_scale_entry_new_grid (GTK_GRID (grid), 2, j, NULL,
- 100, 4,
- 255.0, 0.0, 255.0, 1.0, 10.0, 0,
- NULL, NULL);
+ scale = gimp_color_scale_entry_new (GTK_GRID (grid), 2, j, NULL,
+ 100, 4,
+ 255.0, 0.0, 255.0, 1.0, 10.0, 0,
+ NULL, NULL);
composeint.color_scales[j] = GIMP_SCALE_ENTRY_SCALE (scale);
composeint.color_spins[j] = GIMP_SCALE_ENTRY_SPINBUTTON (scale);
diff --git a/plug-ins/common/contrast-retinex.c b/plug-ins/common/contrast-retinex.c
index e95c245..bcc8409 100644
--- a/plug-ins/common/contrast-retinex.c
+++ b/plug-ins/common/contrast-retinex.c
@@ -335,11 +335,11 @@ retinex_dialog (GimpDrawable *drawable)
combo, 2);
gtk_widget_show (combo);
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 1,
- _("_Scale:"), SCALE_WIDTH, ENTRY_WIDTH,
- rvals.scale,
- MIN_GAUSSIAN_SCALE, MAX_GAUSSIAN_SCALE, 1, 1, 0,
- TRUE, 0, 0, NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, 1,
+ _("_Scale:"), SCALE_WIDTH, ENTRY_WIDTH,
+ rvals.scale,
+ MIN_GAUSSIAN_SCALE, MAX_GAUSSIAN_SCALE, 1, 1, 0,
+ TRUE, 0, 0, NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_int_adjustment_update),
@@ -348,11 +348,11 @@ retinex_dialog (GimpDrawable *drawable)
G_CALLBACK (gimp_preview_invalidate),
preview);
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 2,
- _("Scale _division:"), SCALE_WIDTH, ENTRY_WIDTH,
- rvals.nscales,
- 0, MAX_RETINEX_SCALES, 1, 1, 0,
- TRUE, 0, 0, NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, 2,
+ _("Scale _division:"), SCALE_WIDTH, ENTRY_WIDTH,
+ rvals.nscales,
+ 0, MAX_RETINEX_SCALES, 1, 1, 0,
+ TRUE, 0, 0, NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_int_adjustment_update),
@@ -361,10 +361,10 @@ retinex_dialog (GimpDrawable *drawable)
G_CALLBACK (gimp_preview_invalidate),
preview);
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 3,
- _("Dy_namic:"), SCALE_WIDTH, ENTRY_WIDTH,
- rvals.cvar, 0, 4, 0.1, 0.1, 1,
- TRUE, 0, 0, NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, 3,
+ _("Dy_namic:"), SCALE_WIDTH, ENTRY_WIDTH,
+ rvals.cvar, 0, 4, 0.1, 0.1, 1,
+ TRUE, 0, 0, NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_float_adjustment_update),
diff --git a/plug-ins/common/depth-merge.c b/plug-ins/common/depth-merge.c
index 5f50433..6c3ae84 100644
--- a/plug-ins/common/depth-merge.c
+++ b/plug-ins/common/depth-merge.c
@@ -755,41 +755,41 @@ DepthMerge_dialog (DepthMerge *dm)
gtk_widget_show (combo);
/* Numeric parameters */
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 4,
- _("O_verlap:"), 0, 6,
- dm->params.overlap, 0, 2, 0.001, 0.01, 3,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, 4,
+ _("O_verlap:"), 0, 6,
+ dm->params.overlap, 0, 2, 0.001, 0.01, 3,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (dialogValueScaleUpdateCallback),
&(dm->params.overlap));
g_object_set_data (G_OBJECT (adj), "dm", dm);
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 5,
- _("O_ffset:"), 0, 6,
- dm->params.offset, -1, 1, 0.001, 0.01, 3,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, 5,
+ _("O_ffset:"), 0, 6,
+ dm->params.offset, -1, 1, 0.001, 0.01, 3,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (dialogValueScaleUpdateCallback),
&(dm->params.offset));
g_object_set_data (G_OBJECT (adj), "dm", dm);
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 6,
- _("Sc_ale 1:"), 0, 6,
- dm->params.scale1, -1, 1, 0.001, 0.01, 3,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, 6,
+ _("Sc_ale 1:"), 0, 6,
+ dm->params.scale1, -1, 1, 0.001, 0.01, 3,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (dialogValueScaleUpdateCallback),
&(dm->params.scale1));
g_object_set_data (G_OBJECT (adj), "dm", dm);
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 7,
- _("Sca_le 2:"), 0, 6,
- dm->params.scale2, -1, 1, 0.001, 0.01, 3,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, 7,
+ _("Sca_le 2:"), 0, 6,
+ dm->params.scale2, -1, 1, 0.001, 0.01, 3,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (dialogValueScaleUpdateCallback),
&(dm->params.scale2));
diff --git a/plug-ins/common/despeckle.c b/plug-ins/common/despeckle.c
index 106bec0..2349b0f 100644
--- a/plug-ins/common/despeckle.c
+++ b/plug-ins/common/despeckle.c
@@ -506,11 +506,11 @@ despeckle_dialog (void)
* Box size (diameter) control...
*/
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 0,
- _("_Radius:"), SCALE_WIDTH, ENTRY_WIDTH,
- despeckle_radius, 1, MAX_RADIUS, 1, 5, 0,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, 0,
+ _("_Radius:"), SCALE_WIDTH, ENTRY_WIDTH,
+ despeckle_radius, 1, MAX_RADIUS, 1, 5, 0,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_int_adjustment_update),
&despeckle_radius);
@@ -522,11 +522,11 @@ despeckle_dialog (void)
* Black level control...
*/
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 1,
- _("_Black level:"), SCALE_WIDTH, ENTRY_WIDTH,
- black_level, -1, 255, 1, 8, 0,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, 1,
+ _("_Black level:"), SCALE_WIDTH, ENTRY_WIDTH,
+ black_level, -1, 255, 1, 8, 0,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_int_adjustment_update),
&black_level);
@@ -538,11 +538,11 @@ despeckle_dialog (void)
* White level control...
*/
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 2,
- _("_White level:"), SCALE_WIDTH, ENTRY_WIDTH,
- white_level, 0, 256, 1, 8, 0,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, 2,
+ _("_White level:"), SCALE_WIDTH, ENTRY_WIDTH,
+ white_level, 0, 256, 1, 8, 0,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_int_adjustment_update),
&white_level);
diff --git a/plug-ins/common/destripe.c b/plug-ins/common/destripe.c
index 11cee1a..cf9b4eb 100644
--- a/plug-ins/common/destripe.c
+++ b/plug-ins/common/destripe.c
@@ -472,11 +472,11 @@ destripe_dialog (GimpDrawable *drawable)
gtk_box_pack_start (GTK_BOX (main_vbox), grid, FALSE, FALSE, 0);
gtk_widget_show (grid);
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 1,
- _("_Width:"), SCALE_WIDTH, 0,
- vals.avg_width, 2, MAX_AVG, 1, 10, 0,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, 1,
+ _("_Width:"), SCALE_WIDTH, 0,
+ vals.avg_width, 2, MAX_AVG, 1, 10, 0,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_int_adjustment_update),
&vals.avg_width);
diff --git a/plug-ins/common/edge-neon.c b/plug-ins/common/edge-neon.c
index 91a876c..b98833b 100644
--- a/plug-ins/common/edge-neon.c
+++ b/plug-ins/common/edge-neon.c
@@ -730,12 +730,12 @@ neon_dialog (GimpDrawable *drawable)
gtk_widget_show (grid);
/* Label, scale, entry for evals.radius */
- scale_data = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 0,
- _("_Radius:"), 100, 8,
- evals.radius, 0.0, 64.0, 1, 10, 2,
- FALSE, 0.0,
- 8 * MAX (drawable->width, drawable->height),
- NULL, NULL);
+ scale_data = gimp_scale_entry_new (GTK_GRID (grid), 0, 0,
+ _("_Radius:"), 100, 8,
+ evals.radius, 0.0, 64.0, 1, 10, 2,
+ FALSE, 0.0,
+ 8 * MAX (drawable->width, drawable->height),
+ NULL, NULL);
g_signal_connect (scale_data, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
@@ -745,11 +745,11 @@ neon_dialog (GimpDrawable *drawable)
preview);
/* Label, scale, entry for evals.amount */
- scale_data = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 1,
- _("_Amount:"), 100, 8,
- evals.amount, 0.0, 1.0, 0.01, 0.1, 2,
- TRUE, 0, 0,
- NULL, NULL);
+ scale_data = gimp_scale_entry_new (GTK_GRID (grid), 0, 1,
+ _("_Amount:"), 100, 8,
+ evals.amount, 0.0, 1.0, 0.01, 0.1, 2,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (scale_data, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
diff --git a/plug-ins/common/emboss.c b/plug-ins/common/emboss.c
index d6f8749..eabbc10 100644
--- a/plug-ins/common/emboss.c
+++ b/plug-ins/common/emboss.c
@@ -499,11 +499,11 @@ emboss_dialog (GimpDrawable *drawable)
gtk_grid_set_column_spacing (GTK_GRID (grid), 6);
gtk_box_pack_start (GTK_BOX (main_vbox), grid, FALSE, FALSE, 0);
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 0,
- _("_Azimuth:"), 100, 6,
- evals.azimuth, 0.0, 360.0, 1.0, 10.0, 2,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, 0,
+ _("_Azimuth:"), 100, 6,
+ evals.azimuth, 0.0, 360.0, 1.0, 10.0, 2,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&evals.azimuth);
@@ -511,11 +511,11 @@ emboss_dialog (GimpDrawable *drawable)
G_CALLBACK (gimp_preview_invalidate),
preview);
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 1,
- _("E_levation:"), 100, 6,
- evals.elevation, 0.0, 180.0, 1.0, 10.0, 2,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, 1,
+ _("E_levation:"), 100, 6,
+ evals.elevation, 0.0, 180.0, 1.0, 10.0, 2,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&evals.elevation);
@@ -523,11 +523,11 @@ emboss_dialog (GimpDrawable *drawable)
G_CALLBACK (gimp_preview_invalidate),
preview);
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 2,
- _("_Depth:"), 100, 6,
- evals.depth, 1.0, 100.0, 1.0, 5.0, 0,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, 2,
+ _("_Depth:"), 100, 6,
+ evals.depth, 1.0, 100.0, 1.0, 5.0, 0,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_int_adjustment_update),
&evals.depth);
diff --git a/plug-ins/common/file-csource.c b/plug-ins/common/file-csource.c
index 1a4ad8f..f2489b1 100644
--- a/plug-ins/common/file-csource.c
+++ b/plug-ins/common/file-csource.c
@@ -1001,11 +1001,11 @@ run_save_dialog (Config *config)
gtk_box_pack_start (GTK_BOX (vbox), grid, FALSE, FALSE, 0);
gtk_widget_show (grid);
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 0,
- _("Op_acity:"), 100, 0,
- config->opacity, 0, 100, 1, 10, 1,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, 0,
+ _("Op_acity:"), 100, 0,
+ config->opacity, 0, 100, 1, 10, 1,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&config->opacity);
diff --git a/plug-ins/common/file-raw-data.c b/plug-ins/common/file-raw-data.c
index e1d4a67..fd791a9 100644
--- a/plug-ins/common/file-raw-data.c
+++ b/plug-ins/common/file-raw-data.c
@@ -1971,11 +1971,11 @@ load_dialog (const gchar *filename,
G_CALLBACK (preview_update),
preview);
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 1,
- _("O_ffset:"), -1, 9,
- runtime->file_offset, 0, file_size, 1, 1000, 0,
- TRUE, 0.0, 0.0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, 1,
+ _("O_ffset:"), -1, 9,
+ runtime->file_offset, 0, file_size, 1, 1000, 0,
+ TRUE, 0.0, 0.0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_int_adjustment_update),
@@ -1986,11 +1986,11 @@ load_dialog (const gchar *filename,
if (! is_hgt)
{
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 2,
- _("_Width:"), -1, 9,
- runtime->image_width, 1, file_size, 1, 10, 0,
- TRUE, 0.0, 0.0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, 2,
+ _("_Width:"), -1, 9,
+ runtime->image_width, 1, file_size, 1, 10, 0,
+ TRUE, 0.0, 0.0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_int_adjustment_update),
@@ -2002,11 +2002,11 @@ load_dialog (const gchar *filename,
G_CALLBACK (preview_update),
preview);
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 3,
- _("_Height:"), -1, 9,
- runtime->image_height, 1, file_size, 1, 10, 0,
- TRUE, 0.0, 0.0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, 3,
+ _("_Height:"), -1, 9,
+ runtime->image_height, 1, file_size, 1, 10, 0,
+ TRUE, 0.0, 0.0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_int_adjustment_update),
@@ -2046,11 +2046,11 @@ load_dialog (const gchar *filename,
G_CALLBACK (palette_update),
preview);
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 1,
- _("Off_set:"), -1, 0,
- runtime->palette_offset, 0, 1 << 24, 1, 768, 0,
- TRUE, 0.0, 0.0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, 1,
+ _("Off_set:"), -1, 0,
+ runtime->palette_offset, 0, 1 << 24, 1, 768, 0,
+ TRUE, 0.0, 0.0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_int_adjustment_update),
diff --git a/plug-ins/common/file-xpm.c b/plug-ins/common/file-xpm.c
index 2f072d3..e863737 100644
--- a/plug-ins/common/file-xpm.c
+++ b/plug-ins/common/file-xpm.c
@@ -838,11 +838,11 @@ save_dialog (void)
grid, TRUE, TRUE, 0);
gtk_widget_show (grid);
- scale_data = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 0,
- _("_Alpha threshold:"), SCALE_WIDTH, 0,
- xpmvals.threshold, 0, 255, 1, 8, 0,
- TRUE, 0, 0,
- NULL, NULL);
+ scale_data = gimp_scale_entry_new (GTK_GRID (grid), 0, 0,
+ _("_Alpha threshold:"), SCALE_WIDTH, 0,
+ xpmvals.threshold, 0, 255, 1, 8, 0,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (scale_data, "value-changed",
G_CALLBACK (gimp_int_adjustment_update),
diff --git a/plug-ins/common/film.c b/plug-ins/common/film.c
index 4d97c60..551dc95 100644
--- a/plug-ins/common/film.c
+++ b/plug-ins/common/film.c
@@ -1164,23 +1164,23 @@ create_advanced_tab (GtkWidget *notebook)
row = 0;
filmint.advanced_adj[0] = adj =
- gimp_scale_entry_new_grid (GTK_GRID (grid), 0, row++,
- _("Image _height:"), 0, 0,
- filmvals.picture_height,
- 0.0, 1.0, 0.001, 0.01, 3,
- TRUE, 0, 0,
- NULL, NULL);
+ gimp_scale_entry_new (GTK_GRID (grid), 0, row++,
+ _("Image _height:"), 0, 0,
+ filmvals.picture_height,
+ 0.0, 1.0, 0.001, 0.01, 3,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&filmvals.picture_height);
filmint.advanced_adj[1] = adj =
- gimp_scale_entry_new_grid (GTK_GRID (grid), 0, row++,
- _("Image spac_ing:"), 0, 0,
- filmvals.picture_space,
- 0.0, 1.0, 0.001, 0.01, 3,
- TRUE, 0, 0,
- NULL, NULL);
+ gimp_scale_entry_new (GTK_GRID (grid), 0, row++,
+ _("Image spac_ing:"), 0, 0,
+ filmvals.picture_space,
+ 0.0, 1.0, 0.001, 0.01, 3,
+ TRUE, 0, 0,
+ NULL, NULL);
gtk_widget_set_margin_bottom (gtk_grid_get_child_at (GTK_GRID (grid), 0, 1), 6);
gtk_widget_set_margin_bottom (gtk_grid_get_child_at (GTK_GRID (grid), 1, 1), 6);
gtk_widget_set_margin_bottom (gtk_grid_get_child_at (GTK_GRID (grid), 2, 1), 6);
@@ -1189,45 +1189,45 @@ create_advanced_tab (GtkWidget *notebook)
&filmvals.picture_space);
filmint.advanced_adj[2] = adj =
- gimp_scale_entry_new_grid (GTK_GRID (grid), 0, row++,
- _("_Hole offset:"), 0, 0,
- filmvals.hole_offset,
- 0.0, 1.0, 0.001, 0.01, 3,
- TRUE, 0, 0,
- NULL, NULL);
+ gimp_scale_entry_new (GTK_GRID (grid), 0, row++,
+ _("_Hole offset:"), 0, 0,
+ filmvals.hole_offset,
+ 0.0, 1.0, 0.001, 0.01, 3,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&filmvals.hole_offset);
filmint.advanced_adj[3] = adj =
- gimp_scale_entry_new_grid (GTK_GRID (grid), 0, row++,
- _("Ho_le width:"), 0, 0,
- filmvals.hole_width,
- 0.0, 1.0, 0.001, 0.01, 3,
- TRUE, 0, 0,
- NULL, NULL);
+ gimp_scale_entry_new (GTK_GRID (grid), 0, row++,
+ _("Ho_le width:"), 0, 0,
+ filmvals.hole_width,
+ 0.0, 1.0, 0.001, 0.01, 3,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&filmvals.hole_width);
filmint.advanced_adj[4] = adj =
- gimp_scale_entry_new_grid (GTK_GRID (grid), 0, row++,
- _("Hol_e height:"), 0, 0,
- filmvals.hole_height,
- 0.0, 1.0, 0.001, 0.01, 3,
- TRUE, 0, 0,
- NULL, NULL);
+ gimp_scale_entry_new (GTK_GRID (grid), 0, row++,
+ _("Hol_e height:"), 0, 0,
+ filmvals.hole_height,
+ 0.0, 1.0, 0.001, 0.01, 3,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&filmvals.hole_height);
filmint.advanced_adj[5] = adj =
- gimp_scale_entry_new_grid (GTK_GRID (grid), 0, row++,
- _("Hole sp_acing:"), 0, 0,
- filmvals.hole_space,
- 0.0, 1.0, 0.001, 0.01, 3,
- TRUE, 0, 0,
- NULL, NULL);
+ gimp_scale_entry_new (GTK_GRID (grid), 0, row++,
+ _("Hole sp_acing:"), 0, 0,
+ filmvals.hole_space,
+ 0.0, 1.0, 0.001, 0.01, 3,
+ TRUE, 0, 0,
+ NULL, NULL);
gtk_widget_set_margin_bottom (gtk_grid_get_child_at (GTK_GRID (grid), 0, 5), 6);
gtk_widget_set_margin_bottom (gtk_grid_get_child_at (GTK_GRID (grid), 1, 5), 6);
gtk_widget_set_margin_bottom (gtk_grid_get_child_at (GTK_GRID (grid), 2, 5), 6);
@@ -1236,12 +1236,12 @@ create_advanced_tab (GtkWidget *notebook)
&filmvals.hole_space);
filmint.advanced_adj[6] = adj =
- gimp_scale_entry_new_grid (GTK_GRID (grid), 0, row++,
- _("_Number height:"), 0, 0,
- filmvals.number_height,
- 0.0, 1.0, 0.001, 0.01, 3,
- TRUE, 0, 0,
- NULL, NULL);
+ gimp_scale_entry_new (GTK_GRID (grid), 0, row++,
+ _("_Number height:"), 0, 0,
+ filmvals.number_height,
+ 0.0, 1.0, 0.001, 0.01, 3,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&filmvals.number_height);
diff --git a/plug-ins/common/fractal-trace.c b/plug-ins/common/fractal-trace.c
index 6e52c99..4b63d5a 100644
--- a/plug-ins/common/fractal-trace.c
+++ b/plug-ins/common/fractal-trace.c
@@ -773,47 +773,47 @@ dialog_show (void)
gtk_container_add (GTK_CONTAINER (frame), grid);
gtk_widget_show (grid);
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 0,
- _("X_1:"), 0, 6,
- parameters.x1, -50, 50, 0.1, 0.5, 2,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, 0,
+ _("X_1:"), 0, 6,
+ parameters.x1, -50, 50, 0.1, 0.5, 2,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (dialog_double_adjustment_update),
¶meters.x1);
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 1,
- _("X_2:"), 0, 6,
- parameters.x2, -50, 50, 0.1, 0.5, 2,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, 1,
+ _("X_2:"), 0, 6,
+ parameters.x2, -50, 50, 0.1, 0.5, 2,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (dialog_double_adjustment_update),
¶meters.x2);
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 2,
- _("Y_1:"), 0, 6,
- parameters.y1, -50, 50, 0.1, 0.5, 2,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, 2,
+ _("Y_1:"), 0, 6,
+ parameters.y1, -50, 50, 0.1, 0.5, 2,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (dialog_double_adjustment_update),
¶meters.y1);
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 3,
- _("Y_2:"), 0, 6,
- parameters.y2, -50, 50, 0.1, 0.5, 2,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, 3,
+ _("Y_2:"), 0, 6,
+ parameters.y2, -50, 50, 0.1, 0.5, 2,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (dialog_double_adjustment_update),
¶meters.y2);
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 4,
- _("_Depth:"), 0, 6,
- parameters.depth, 1, 50, 1, 5, 0,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, 4,
+ _("_Depth:"), 0, 6,
+ parameters.depth, 1, 50, 1, 5, 0,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (dialog_int_adjustment_update),
¶meters.depth);
diff --git a/plug-ins/common/jigsaw.c b/plug-ins/common/jigsaw.c
index 4581b32..21e0c47 100644
--- a/plug-ins/common/jigsaw.c
+++ b/plug-ins/common/jigsaw.c
@@ -2431,11 +2431,11 @@ jigsaw_dialog (GimpDrawable *drawable)
group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
/* xtiles */
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 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);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 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);
@@ -2448,11 +2448,11 @@ jigsaw_dialog (GimpDrawable *drawable)
preview);
/* ytiles */
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 1,
- _("_Vertical:"), SCALE_WIDTH, 0,
- config.y, MIN_YTILES, MAX_YTILES, 1.0, 4.0, 0,
- TRUE, 0, 0,
- _("Number of pieces going down"), NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, 1,
+ _("_Vertical:"), SCALE_WIDTH, 0,
+ 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));
@@ -2475,12 +2475,12 @@ jigsaw_dialog (GimpDrawable *drawable)
gtk_container_add (GTK_CONTAINER (frame), grid);
/* number of blending lines */
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 0,
- _("_Bevel width:"), SCALE_WIDTH, 4,
- config.blend_lines,
- MIN_BLEND_LINES, MAX_BLEND_LINES, 1.0, 2.0, 0,
- TRUE, 0, 0,
- _("Degree of slope of each piece's edge"), NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, 0,
+ _("_Bevel width:"), SCALE_WIDTH, 4,
+ config.blend_lines,
+ 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));
@@ -2492,13 +2492,13 @@ jigsaw_dialog (GimpDrawable *drawable)
preview);
/* blending amount */
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 1,
- _("H_ighlight:"), SCALE_WIDTH, 4,
- config.blend_amount,
- MIN_BLEND_AMOUNT, MAX_BLEND_AMOUNT, 0.05, 0.1, 2,
- TRUE, 0, 0,
- _("The amount of highlighting on the edges "
- "of each piece"), NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, 1,
+ _("H_ighlight:"), SCALE_WIDTH, 4,
+ config.blend_amount,
+ MIN_BLEND_AMOUNT, MAX_BLEND_AMOUNT, 0.05, 0.1, 2,
+ 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));
diff --git a/plug-ins/common/newsprint.c b/plug-ins/common/newsprint.c
index 3f0e6c2..8e35f8f 100644
--- a/plug-ins/common/newsprint.c
+++ b/plug-ins/common/newsprint.c
@@ -988,12 +988,12 @@ new_channel (const chan_tmpl *ct, GtkWidget *preview)
group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
/* angle slider */
- chst->angle_adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 0,
- _("_Angle:"), SCALE_WIDTH, 0,
- *ct->angle,
- -90, 90, 1, 15, 1,
- TRUE, 0, 0,
- NULL, NULL);
+ chst->angle_adj = gimp_scale_entry_new (GTK_GRID (grid), 0, 0,
+ _("_Angle:"), SCALE_WIDTH, 0,
+ *ct->angle,
+ -90, 90, 1, 15, 1,
+ TRUE, 0, 0,
+ NULL, NULL);
g_object_set_data (G_OBJECT (chst->angle_adj), "angle", ct->angle);
gtk_size_group_add_widget (group, GIMP_SCALE_ENTRY_LABEL (chst->angle_adj));
@@ -1243,12 +1243,12 @@ newsprint_dialog (GimpDrawable *drawable)
pvals_ui.input_spi = xres;
st.input_spi =
- gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 0,
- _("_Input SPI:"), SCALE_WIDTH, 7,
- pvals_ui.input_spi,
- 1.0, 1200.0, 1.0, 10.0, 0,
- FALSE, GIMP_MIN_RESOLUTION, GIMP_MAX_RESOLUTION,
- NULL, NULL);
+ gimp_scale_entry_new (GTK_GRID (grid), 0, 0,
+ _("_Input SPI:"), SCALE_WIDTH, 7,
+ pvals_ui.input_spi,
+ 1.0, 1200.0, 1.0, 10.0, 0,
+ FALSE, GIMP_MIN_RESOLUTION, GIMP_MAX_RESOLUTION,
+ NULL, NULL);
g_signal_connect (st.input_spi, "value-changed",
G_CALLBACK (spi_callback),
&st);
@@ -1257,12 +1257,12 @@ newsprint_dialog (GimpDrawable *drawable)
preview);
st.output_lpi =
- gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 1,
- _("O_utput LPI:"), SCALE_WIDTH, 7,
- pvals_ui.output_lpi,
- 1.0, 1200.0, 1.0, 10.0, 1,
- FALSE, GIMP_MIN_RESOLUTION, GIMP_MAX_RESOLUTION,
- NULL, NULL);
+ gimp_scale_entry_new (GTK_GRID (grid), 0, 1,
+ _("O_utput LPI:"), SCALE_WIDTH, 7,
+ pvals_ui.output_lpi,
+ 1.0, 1200.0, 1.0, 10.0, 1,
+ FALSE, GIMP_MIN_RESOLUTION, GIMP_MAX_RESOLUTION,
+ NULL, NULL);
g_signal_connect (st.output_lpi, "value-changed",
G_CALLBACK (lpi_callback),
&st);
@@ -1270,12 +1270,12 @@ newsprint_dialog (GimpDrawable *drawable)
G_CALLBACK (gimp_preview_invalidate),
preview);
- st.cellsize = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 2,
- _("C_ell size:"), SCALE_WIDTH, 7,
- pvals.cell_width,
- 3.0, 100.0, 1.0, 5.0, 0,
- FALSE, 3.0, GIMP_MAX_IMAGE_SIZE,
- NULL, NULL);
+ st.cellsize = gimp_scale_entry_new (GTK_GRID (grid), 0, 2,
+ _("C_ell size:"), SCALE_WIDTH, 7,
+ pvals.cell_width,
+ 3.0, 100.0, 1.0, 5.0, 0,
+ FALSE, 3.0, GIMP_MAX_IMAGE_SIZE,
+ NULL, NULL);
g_signal_connect (st.cellsize, "value-changed",
G_CALLBACK (cellsize_callback),
&st);
@@ -1302,12 +1302,12 @@ newsprint_dialog (GimpDrawable *drawable)
gtk_grid_set_column_spacing (GTK_GRID (st.pull_grid), 6);
/* black pullout */
- st.pull = gimp_scale_entry_new_grid (GTK_GRID (st.pull_grid), 0, 0,
- _("B_lack pullout (%):"), SCALE_WIDTH, 0,
- pvals.k_pullout,
- 0, 100, 1, 10, 0,
- TRUE, 0, 0,
- NULL, NULL);
+ st.pull = gimp_scale_entry_new (GTK_GRID (st.pull_grid), 0, 0,
+ _("B_lack pullout (%):"), SCALE_WIDTH, 0,
+ pvals.k_pullout,
+ 0, 100, 1, 10, 0,
+ TRUE, 0, 0,
+ NULL, NULL);
gtk_widget_set_sensitive (st.pull_grid, (pvals.colorspace == CS_CMYK));
gtk_widget_show (st.pull_grid);
@@ -1434,12 +1434,12 @@ newsprint_dialog (GimpDrawable *drawable)
gtk_grid_set_column_spacing (GTK_GRID (grid), 6);
gtk_container_add (GTK_CONTAINER (frame), grid);
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 0,
- _("O_versample:"), SCALE_WIDTH, 0,
- pvals.oversample,
- 1.0, 15.0, 1.0, 5.0, 0,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, 0,
+ _("O_versample:"), SCALE_WIDTH, 0,
+ pvals.oversample,
+ 1.0, 15.0, 1.0, 5.0, 0,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_int_adjustment_update),
&pvals.oversample);
diff --git a/plug-ins/common/nl-filter.c b/plug-ins/common/nl-filter.c
index 4ce3a62..1b42012 100644
--- a/plug-ins/common/nl-filter.c
+++ b/plug-ins/common/nl-filter.c
@@ -1076,11 +1076,11 @@ nlfilter_dialog (GimpDrawable *drawable)
gtk_box_pack_start (GTK_BOX (main_vbox), grid, FALSE, FALSE, 0);
gtk_widget_show (grid);
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 0,
- _("A_lpha:"), 0, 0,
- nlfvals.alpha, 0.0, 1.0, 0.05, 0.1, 2,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, 0,
+ _("A_lpha:"), 0, 0,
+ nlfvals.alpha, 0.0, 1.0, 0.05, 0.1, 2,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&nlfvals.alpha);
@@ -1088,11 +1088,11 @@ nlfilter_dialog (GimpDrawable *drawable)
G_CALLBACK (gimp_preview_invalidate),
preview);
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 1,
- _("_Radius:"), 0, 0,
- nlfvals.radius, 1.0 / 3.0, 1.0, 0.05, 0.1, 2,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, 1,
+ _("_Radius:"), 0, 0,
+ nlfvals.radius, 1.0 / 3.0, 1.0, 0.05, 0.1, 2,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&nlfvals.radius);
diff --git a/plug-ins/common/oilify.c b/plug-ins/common/oilify.c
index 0e4942c..7aadf6c 100644
--- a/plug-ins/common/oilify.c
+++ b/plug-ins/common/oilify.c
@@ -816,11 +816,11 @@ oilify_dialog (GimpDrawable *drawable)
* Mask-size scale
*/
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 0,
- _("_Mask size:"), SCALE_WIDTH, 0,
- ovals.mask_size, 3.0, 50.0, 1.0, 5.0, 0,
- TRUE, 0.0, 0.0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, 0,
+ _("_Mask size:"), SCALE_WIDTH, 0,
+ ovals.mask_size, 3.0, 50.0, 1.0, 5.0, 0,
+ TRUE, 0.0, 0.0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&ovals.mask_size);
@@ -869,11 +869,11 @@ oilify_dialog (GimpDrawable *drawable)
* Exponent scale
*/
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 3,
- _("_Exponent:"), SCALE_WIDTH, 0,
- ovals.exponent, 1.0, 20.0, 1.0, 4.0, 0,
- TRUE, 0.0, 0.0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, 3,
+ _("_Exponent:"), SCALE_WIDTH, 0,
+ ovals.exponent, 1.0, 20.0, 1.0, 4.0, 0,
+ TRUE, 0.0, 0.0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&ovals.exponent);
diff --git a/plug-ins/common/photocopy.c b/plug-ins/common/photocopy.c
index a0f5c7a..4f86c11 100644
--- a/plug-ins/common/photocopy.c
+++ b/plug-ins/common/photocopy.c
@@ -870,11 +870,11 @@ photocopy_dialog (GimpDrawable *drawable)
gtk_widget_show (grid);
/* Label, scale, entry for pvals.amount */
- scale_data = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 0,
- _("_Mask radius:"), 100, 5,
- pvals.mask_radius, 3.0, 50.0, 1, 5.0, 2,
- TRUE, 0, 0,
- NULL, NULL);
+ scale_data = gimp_scale_entry_new (GTK_GRID (grid), 0, 0,
+ _("_Mask radius:"), 100, 5,
+ pvals.mask_radius, 3.0, 50.0, 1, 5.0, 2,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (scale_data, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
@@ -884,11 +884,11 @@ photocopy_dialog (GimpDrawable *drawable)
preview);
/* Label, scale, entry for pvals.amount */
- scale_data = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 1,
- _("_Sharpness:"), 50, 5,
- pvals.sharpness, 0.0, 1.0, 0.01, 0.1, 3,
- TRUE, 0, 0,
- NULL, NULL);
+ scale_data = gimp_scale_entry_new (GTK_GRID (grid), 0, 1,
+ _("_Sharpness:"), 50, 5,
+ pvals.sharpness, 0.0, 1.0, 0.01, 0.1, 3,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (scale_data, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
@@ -898,11 +898,11 @@ photocopy_dialog (GimpDrawable *drawable)
preview);
/* Label, scale, entry for pvals.amount */
- scale_data = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 2,
- _("Percent _black:"), 50, 5,
- pvals.pct_black, 0.0, 1.0, 0.01, 0.1, 3,
- TRUE, 0, 0,
- NULL, NULL);
+ scale_data = gimp_scale_entry_new (GTK_GRID (grid), 0, 2,
+ _("Percent _black:"), 50, 5,
+ pvals.pct_black, 0.0, 1.0, 0.01, 0.1, 3,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (scale_data, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
@@ -912,11 +912,11 @@ photocopy_dialog (GimpDrawable *drawable)
preview);
/* Label, scale, entry for pvals.amount */
- scale_data = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 3,
- _("Percent _white:"), 50, 5,
- pvals.pct_white, 0.0, 1.0, 0.01, 0.1, 3,
- TRUE, 0, 0,
- NULL, NULL);
+ scale_data = gimp_scale_entry_new (GTK_GRID (grid), 0, 3,
+ _("Percent _white:"), 50, 5,
+ pvals.pct_white, 0.0, 1.0, 0.01, 0.1, 3,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (scale_data, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
diff --git a/plug-ins/common/sharpen.c b/plug-ins/common/sharpen.c
index 63f89f6..67dc64e 100644
--- a/plug-ins/common/sharpen.c
+++ b/plug-ins/common/sharpen.c
@@ -504,12 +504,12 @@ sharpen_dialog (GimpDrawable *drawable)
gtk_box_pack_start (GTK_BOX (main_vbox), grid, FALSE, FALSE, 0);
gtk_widget_show (grid);
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 0,
- _("_Sharpness:"), SCALE_WIDTH, 0,
- sharpen_params.sharpen_percent,
- 1, 99, 1, 10, 0,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, 0,
+ _("_Sharpness:"), SCALE_WIDTH, 0,
+ sharpen_params.sharpen_percent,
+ 1, 99, 1, 10, 0,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_int_adjustment_update),
&sharpen_params.sharpen_percent);
diff --git a/plug-ins/common/softglow.c b/plug-ins/common/softglow.c
index c445e0e..44b92a8 100644
--- a/plug-ins/common/softglow.c
+++ b/plug-ins/common/softglow.c
@@ -662,11 +662,11 @@ softglow_dialog (GimpDrawable *drawable)
gtk_widget_show (grid);
/* Label, scale, entry for svals.amount */
- scale_data = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 0,
- _("_Glow radius:"), 100, 5,
- svals.glow_radius, 1.0, 50.0, 1, 5.0, 2,
- TRUE, 0, 0,
- NULL, NULL);
+ scale_data = gimp_scale_entry_new (GTK_GRID (grid), 0, 0,
+ _("_Glow radius:"), 100, 5,
+ svals.glow_radius, 1.0, 50.0, 1, 5.0, 2,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (scale_data, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
@@ -676,11 +676,11 @@ softglow_dialog (GimpDrawable *drawable)
preview);
/* Label, scale, entry for svals.amount */
- scale_data = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 1,
- _("_Brightness:"), 100, 5,
- svals.brightness, 0.0, 1.0, 0.01, 0.1, 2,
- TRUE, 0, 0,
- NULL, NULL);
+ scale_data = gimp_scale_entry_new (GTK_GRID (grid), 0, 1,
+ _("_Brightness:"), 100, 5,
+ svals.brightness, 0.0, 1.0, 0.01, 0.1, 2,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (scale_data, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
@@ -690,11 +690,11 @@ softglow_dialog (GimpDrawable *drawable)
preview);
/* Label, scale, entry for svals.amount */
- scale_data = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 2,
- _("_Sharpness:"), 100, 5,
- svals.sharpness, 0.0, 1.0, 0.01, 0.1, 2,
- TRUE, 0, 0,
- NULL, NULL);
+ scale_data = gimp_scale_entry_new (GTK_GRID (grid), 0, 2,
+ _("_Sharpness:"), 100, 5,
+ svals.sharpness, 0.0, 1.0, 0.01, 0.1, 2,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (scale_data, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
diff --git a/plug-ins/common/sparkle.c b/plug-ins/common/sparkle.c
index b79f65e..0d25ff4 100644
--- a/plug-ins/common/sparkle.c
+++ b/plug-ins/common/sparkle.c
@@ -370,7 +370,7 @@ sparkle_dialog (GimpDrawable *drawable)
gtk_widget_show (grid);
scale_data =
- gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 0,
+ gimp_scale_entry_new (GTK_GRID (grid), 0, 0,
_("Luminosity _threshold:"), SCALE_WIDTH, ENTRY_WIDTH,
svals.lum_threshold, 0.0, 0.1, 0.001, 0.01, 3,
TRUE, 0, 0,
@@ -383,7 +383,7 @@ sparkle_dialog (GimpDrawable *drawable)
preview);
scale_data =
- gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 1,
+ gimp_scale_entry_new (GTK_GRID (grid), 0, 1,
_("F_lare intensity:"), SCALE_WIDTH, ENTRY_WIDTH,
svals.flare_inten, 0.0, 1.0, 0.01, 0.1, 2,
TRUE, 0, 0,
@@ -396,7 +396,7 @@ sparkle_dialog (GimpDrawable *drawable)
preview);
scale_data =
- gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 2,
+ gimp_scale_entry_new (GTK_GRID (grid), 0, 2,
_("_Spike length:"), SCALE_WIDTH, ENTRY_WIDTH,
svals.spike_len, 1, 100, 1, 10, 0,
TRUE, 0, 0,
@@ -409,7 +409,7 @@ sparkle_dialog (GimpDrawable *drawable)
preview);
scale_data =
- gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 3,
+ gimp_scale_entry_new (GTK_GRID (grid), 0, 3,
_("Sp_ike points:"), SCALE_WIDTH, ENTRY_WIDTH,
svals.spike_pts, 0, 16, 1, 4, 0,
TRUE, 0, 0,
@@ -422,7 +422,7 @@ sparkle_dialog (GimpDrawable *drawable)
preview);
scale_data =
- gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 4,
+ gimp_scale_entry_new (GTK_GRID (grid), 0, 4,
_("Spi_ke angle (-1: random):"), SCALE_WIDTH, ENTRY_WIDTH,
svals.spike_angle, -1, 360, 1, 15, 0,
TRUE, 0, 0,
@@ -436,7 +436,7 @@ sparkle_dialog (GimpDrawable *drawable)
preview);
scale_data =
- gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 5,
+ gimp_scale_entry_new (GTK_GRID (grid), 0, 5,
_("Spik_e density:"), SCALE_WIDTH, ENTRY_WIDTH,
svals.density, 0.0, 1.0, 0.01, 0.1, 2,
TRUE, 0, 0,
@@ -449,7 +449,7 @@ sparkle_dialog (GimpDrawable *drawable)
preview);
scale_data =
- gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 6,
+ gimp_scale_entry_new (GTK_GRID (grid), 0, 6,
_("Tr_ansparency:"), SCALE_WIDTH, ENTRY_WIDTH,
svals.transparency, 0.0, 1.0, 0.01, 0.1, 2,
TRUE, 0, 0,
@@ -462,7 +462,7 @@ sparkle_dialog (GimpDrawable *drawable)
preview);
scale_data =
- gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 7,
+ gimp_scale_entry_new (GTK_GRID (grid), 0, 7,
_("_Random hue:"), SCALE_WIDTH, ENTRY_WIDTH,
svals.random_hue, 0.0, 1.0, 0.01, 0.1, 2,
TRUE, 0, 0,
@@ -475,7 +475,7 @@ sparkle_dialog (GimpDrawable *drawable)
preview);
scale_data =
- gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 8,
+ gimp_scale_entry_new (GTK_GRID (grid), 0, 8,
_("Rando_m saturation:"), SCALE_WIDTH, ENTRY_WIDTH,
svals.random_saturation, 0.0, 1.0, 0.01, 0.1, 2,
TRUE, 0, 0,
diff --git a/plug-ins/common/sphere-designer.c b/plug-ins/common/sphere-designer.c
index b6c7f3c..203aa41 100644
--- a/plug-ins/common/sphere-designer.c
+++ b/plug-ins/common/sphere-designer.c
@@ -2749,31 +2749,31 @@ makewindow (void)
G_CALLBACK (color2_changed),
NULL);
- scalescale = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 3, _("Scale:"),
- 100, -1, 1.0, 0.0, 10.0, 0.1, 1.0, 1,
- TRUE, 0.0, 0.0, NULL, NULL);
+ scalescale = gimp_scale_entry_new (GTK_GRID (grid), 0, 3, _("Scale:"),
+ 100, -1, 1.0, 0.0, 10.0, 0.1, 1.0, 1,
+ TRUE, 0.0, 0.0, NULL, NULL);
g_signal_connect (scalescale, "value-changed",
G_CALLBACK (getscales),
NULL);
- turbulencescale = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 4,
- _("Turbulence:"),
- 100, -1, 1.0, 0.0, 10.0, 0.1, 1.0, 1,
- TRUE, 0.0, 0.0, NULL, NULL);
+ turbulencescale = gimp_scale_entry_new (GTK_GRID (grid), 0, 4,
+ _("Turbulence:"),
+ 100, -1, 1.0, 0.0, 10.0, 0.1, 1.0, 1,
+ TRUE, 0.0, 0.0, NULL, NULL);
g_signal_connect (turbulencescale, "value-changed",
G_CALLBACK (getscales),
NULL);
- amountscale = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 5, _("Amount:"),
- 100, -1, 1.0, 0.0, 1.0, 0.01, 0.1, 2,
- TRUE, 0.0, 0.0, NULL, NULL);
+ amountscale = gimp_scale_entry_new (GTK_GRID (grid), 0, 5, _("Amount:"),
+ 100, -1, 1.0, 0.0, 1.0, 0.01, 0.1, 2,
+ TRUE, 0.0, 0.0, NULL, NULL);
g_signal_connect (amountscale, "value-changed",
G_CALLBACK (getscales),
NULL);
- expscale = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 6, _("Exp.:"),
- 100, -1, 1.0, 0.0, 1.0, 0.01, 0.1, 2,
- TRUE, 0.0, 0.0, NULL, NULL);
+ expscale = gimp_scale_entry_new (GTK_GRID (grid), 0, 6, _("Exp.:"),
+ 100, -1, 1.0, 0.0, 1.0, 0.01, 0.1, 2,
+ TRUE, 0.0, 0.0, NULL, NULL);
g_signal_connect (expscale, "value-changed",
G_CALLBACK (getscales),
NULL);
@@ -2792,22 +2792,22 @@ makewindow (void)
gtk_box_pack_start (GTK_BOX (vbox), grid, FALSE, FALSE, 0);
gtk_widget_show (grid);
- scalexscale = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 0, _("Scale X:"),
- 100, -1, 1.0, 0.0, 10.0, 0.1, 1.0, 2,
- TRUE, 0.0, 0.0, NULL, NULL);
+ scalexscale = gimp_scale_entry_new (GTK_GRID (grid), 0, 0, _("Scale X:"),
+ 100, -1, 1.0, 0.0, 10.0, 0.1, 1.0, 2,
+ TRUE, 0.0, 0.0, NULL, NULL);
g_signal_connect (scalexscale, "value-changed",
G_CALLBACK (getscales),
NULL);
- scaleyscale = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 1, _("Scale Y:"),
- 100, -1, 1.0, 0.0, 10.0, 0.1, 1.0, 2,
- TRUE, 0.0, 0.0, NULL, NULL);
+ scaleyscale = gimp_scale_entry_new (GTK_GRID (grid), 0, 1, _("Scale Y:"),
+ 100, -1, 1.0, 0.0, 10.0, 0.1, 1.0, 2,
+ TRUE, 0.0, 0.0, NULL, NULL);
g_signal_connect (scaleyscale, "value-changed",
G_CALLBACK (getscales),
NULL);
- scalezscale = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 2, _("Scale Z:"),
- 100, -1, 1.0, 0.0, 10.0, 0.1, 1.0, 2,
- TRUE, 0.0, 0.0, NULL, NULL);
+ scalezscale = gimp_scale_entry_new (GTK_GRID (grid), 0, 2, _("Scale Z:"),
+ 100, -1, 1.0, 0.0, 10.0, 0.1, 1.0, 2,
+ TRUE, 0.0, 0.0, NULL, NULL);
gtk_widget_set_margin_bottom (gtk_grid_get_child_at (GTK_GRID (grid), 0, 2), 6);
gtk_widget_set_margin_bottom (gtk_grid_get_child_at (GTK_GRID (grid), 1, 2), 6);
gtk_widget_set_margin_bottom (gtk_grid_get_child_at (GTK_GRID (grid), 2, 2), 6);
@@ -2815,23 +2815,23 @@ makewindow (void)
G_CALLBACK (getscales),
NULL);
- rotxscale = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 3, _("Rotate X:"),
- 100, -1, 0.0, 0.0, 360.0, 1.0, 10.0, 1,
- TRUE, 0.0, 0.0, NULL, NULL);
+ rotxscale = gimp_scale_entry_new (GTK_GRID (grid), 0, 3, _("Rotate X:"),
+ 100, -1, 0.0, 0.0, 360.0, 1.0, 10.0, 1,
+ TRUE, 0.0, 0.0, NULL, NULL);
g_signal_connect (rotxscale, "value-changed",
G_CALLBACK (getscales),
NULL);
- rotyscale = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 4, _("Rotate Y:"),
- 100, -1, 0.0, 0.0, 360.0, 1.0, 10.0, 1,
- TRUE, 0.0, 0.0, NULL, NULL);
+ rotyscale = gimp_scale_entry_new (GTK_GRID (grid), 0, 4, _("Rotate Y:"),
+ 100, -1, 0.0, 0.0, 360.0, 1.0, 10.0, 1,
+ TRUE, 0.0, 0.0, NULL, NULL);
g_signal_connect (rotyscale, "value-changed",
G_CALLBACK (getscales),
NULL);
- rotzscale = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 5, _("Rotate Z:"),
- 100, -1, 0.0, 0.0, 360.0, 1.0, 10.0, 1,
- TRUE, 0.0, 0.0, NULL, NULL);
+ rotzscale = gimp_scale_entry_new (GTK_GRID (grid), 0, 5, _("Rotate Z:"),
+ 100, -1, 0.0, 0.0, 360.0, 1.0, 10.0, 1,
+ TRUE, 0.0, 0.0, NULL, NULL);
gtk_widget_set_margin_bottom (gtk_grid_get_child_at (GTK_GRID (grid), 0, 5), 6);
gtk_widget_set_margin_bottom (gtk_grid_get_child_at (GTK_GRID (grid), 1, 5), 6);
gtk_widget_set_margin_bottom (gtk_grid_get_child_at (GTK_GRID (grid), 2, 5), 6);
@@ -2839,23 +2839,23 @@ makewindow (void)
G_CALLBACK (getscales),
NULL);
- posxscale = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 6, _("Position X:"),
- 100, -1, 0.0, -20.0, 20.0, 0.1, 1.0, 1,
- TRUE, 0.0, 0.0, NULL, NULL);
+ posxscale = gimp_scale_entry_new (GTK_GRID (grid), 0, 6, _("Position X:"),
+ 100, -1, 0.0, -20.0, 20.0, 0.1, 1.0, 1,
+ TRUE, 0.0, 0.0, NULL, NULL);
g_signal_connect (posxscale, "value-changed",
G_CALLBACK (getscales),
NULL);
- posyscale = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 7, _("Position Y:"),
- 100, -1, 0.0, -20.0, 20.0, 0.1, 1.0, 1,
- TRUE, 0.0, 0.0, NULL, NULL);
+ posyscale = gimp_scale_entry_new (GTK_GRID (grid), 0, 7, _("Position Y:"),
+ 100, -1, 0.0, -20.0, 20.0, 0.1, 1.0, 1,
+ TRUE, 0.0, 0.0, NULL, NULL);
g_signal_connect (posyscale, "value-changed",
G_CALLBACK (getscales),
NULL);
- poszscale = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 8, _("Position Z:"),
- 100, -1, 0.0, -20.0, 20.0, 0.1, 1.0, 1,
- TRUE, 0.0, 0.0, NULL, NULL);
+ poszscale = gimp_scale_entry_new (GTK_GRID (grid), 0, 8, _("Position Z:"),
+ 100, -1, 0.0, -20.0, 20.0, 0.1, 1.0, 1,
+ TRUE, 0.0, 0.0, NULL, NULL);
g_signal_connect (poszscale, "value-changed",
G_CALLBACK (getscales),
NULL);
diff --git a/plug-ins/common/tile-small.c b/plug-ins/common/tile-small.c
index 4dff809..38eaaaa 100644
--- a/plug-ins/common/tile-small.c
+++ b/plug-ins/common/tile-small.c
@@ -598,11 +598,11 @@ tileit_dialog (void)
gtk_box_pack_start (GTK_BOX (vbox), grid2, FALSE, FALSE, 0);
gtk_widget_show (grid2);
- scale = gimp_scale_entry_new_grid (GTK_GRID (grid2), 0, 0,
- _("O_pacity:"), SCALE_WIDTH, -1,
- opacity, 0, 100, 1, 10, 0,
- TRUE, 0, 0,
- NULL, NULL);
+ scale = gimp_scale_entry_new (GTK_GRID (grid2), 0, 0,
+ _("O_pacity:"), SCALE_WIDTH, -1,
+ opacity, 0, 100, 1, 10, 0,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (scale, "value-changed",
G_CALLBACK (tileit_scale_update),
&opacity);
@@ -619,11 +619,11 @@ tileit_dialog (void)
gtk_widget_set_sensitive (grid2, has_alpha);
- scale = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 0,
- "_n²", SCALE_WIDTH, -1,
- itvals.numtiles, 2, MAX_SEGS, 1, 1, 0,
- TRUE, 0, 0,
- NULL, NULL);
+ scale = gimp_scale_entry_new (GTK_GRID (grid), 0, 0,
+ "_n²", SCALE_WIDTH, -1,
+ itvals.numtiles, 2, MAX_SEGS, 1, 1, 0,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (scale, "value-changed",
G_CALLBACK (tileit_scale_update),
&itvals.numtiles);
diff --git a/plug-ins/common/unsharp-mask.c b/plug-ins/common/unsharp-mask.c
index 565e77a..a2d0af9 100644
--- a/plug-ins/common/unsharp-mask.c
+++ b/plug-ins/common/unsharp-mask.c
@@ -871,11 +871,11 @@ unsharp_mask_dialog (GimpDrawable *drawable)
gtk_box_pack_start (GTK_BOX (main_vbox), grid, FALSE, FALSE, 0);
gtk_widget_show (grid);
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 0,
- _("_Radius:"), SCALE_WIDTH, ENTRY_WIDTH,
- unsharp_params.radius, 0.1, 500.0, 0.1, 1.0, 1,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, 0,
+ _("_Radius:"), SCALE_WIDTH, ENTRY_WIDTH,
+ unsharp_params.radius, 0.1, 500.0, 0.1, 1.0, 1,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
@@ -884,11 +884,11 @@ unsharp_mask_dialog (GimpDrawable *drawable)
G_CALLBACK (gimp_preview_invalidate),
preview);
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 1,
- _("_Amount:"), SCALE_WIDTH, ENTRY_WIDTH,
- unsharp_params.amount, 0.0, 10.0, 0.01, 0.1, 2,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, 1,
+ _("_Amount:"), SCALE_WIDTH, ENTRY_WIDTH,
+ unsharp_params.amount, 0.0, 10.0, 0.01, 0.1, 2,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
@@ -897,11 +897,11 @@ unsharp_mask_dialog (GimpDrawable *drawable)
G_CALLBACK (gimp_preview_invalidate),
preview);
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 2,
- _("_Threshold:"), SCALE_WIDTH, ENTRY_WIDTH,
- unsharp_params.threshold,
- 0.0, 255.0, 1.0, 10.0, 0,
- TRUE, 0, 0,
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, 2,
+ _("_Threshold:"), SCALE_WIDTH, ENTRY_WIDTH,
+ unsharp_params.threshold,
+ 0.0, 255.0, 1.0, 10.0, 0,
+ TRUE, 0, 0,
NULL, NULL);
g_signal_connect (adj, "value-changed",
diff --git a/plug-ins/common/van-gogh-lic.c b/plug-ins/common/van-gogh-lic.c
index 1a6d517..0620ee7 100644
--- a/plug-ins/common/van-gogh-lic.c
+++ b/plug-ins/common/van-gogh-lic.c
@@ -726,47 +726,47 @@ create_main_dialog (void)
row = 0;
- scale_data = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, row++,
- _("_Filter length:"), 0, 6,
- licvals.filtlen, 0.1, 64, 1.0, 8.0, 1,
- TRUE, 0, 0,
- NULL, NULL);
+ scale_data = gimp_scale_entry_new (GTK_GRID (grid), 0, row++,
+ _("_Filter length:"), 0, 6,
+ licvals.filtlen, 0.1, 64, 1.0, 8.0, 1,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (scale_data, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&licvals.filtlen);
- scale_data = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, row++,
- _("_Noise magnitude:"), 0, 6,
- licvals.noisemag, 1, 5, 0.1, 1.0, 1,
- TRUE, 0, 0,
- NULL, NULL);
+ scale_data = gimp_scale_entry_new (GTK_GRID (grid), 0, row++,
+ _("_Noise magnitude:"), 0, 6,
+ licvals.noisemag, 1, 5, 0.1, 1.0, 1,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (scale_data, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&licvals.noisemag);
- scale_data = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, row++,
- _("In_tegration steps:"), 0, 6,
- licvals.intsteps, 1, 40, 1.0, 5.0, 1,
- TRUE, 0, 0,
- NULL, NULL);
+ scale_data = gimp_scale_entry_new (GTK_GRID (grid), 0, row++,
+ _("In_tegration steps:"), 0, 6,
+ licvals.intsteps, 1, 40, 1.0, 5.0, 1,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (scale_data, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&licvals.intsteps);
- scale_data = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, row++,
- _("_Minimum value:"), 0, 6,
- licvals.minv, -100, 0, 1, 10, 1,
- TRUE, 0, 0,
- NULL, NULL);
+ scale_data = gimp_scale_entry_new (GTK_GRID (grid), 0, row++,
+ _("_Minimum value:"), 0, 6,
+ licvals.minv, -100, 0, 1, 10, 1,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (scale_data, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&licvals.minv);
- scale_data = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, row++,
- _("M_aximum value:"), 0, 6,
- licvals.maxv, 0, 100, 1, 10, 1,
- TRUE, 0, 0,
- NULL, NULL);
+ scale_data = gimp_scale_entry_new (GTK_GRID (grid), 0, row++,
+ _("M_aximum value:"), 0, 6,
+ licvals.maxv, 0, 100, 1, 10, 1,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (scale_data, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&licvals.maxv);
diff --git a/plug-ins/common/wavelet-decompose.c b/plug-ins/common/wavelet-decompose.c
index 87d89a0..704c4ca 100644
--- a/plug-ins/common/wavelet-decompose.c
+++ b/plug-ins/common/wavelet-decompose.c
@@ -377,12 +377,12 @@ wavelet_decompose_dialog (void)
/* scales */
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 0,
- _("Scales:"), SCALE_WIDTH, ENTRY_WIDTH,
- wavelet_params.scales,
- 1.0, 7.0, 1.0, 1.0, 0,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, 0,
+ _("Scales:"), SCALE_WIDTH, ENTRY_WIDTH,
+ wavelet_params.scales,
+ 1.0, 7.0, 1.0, 1.0, 0,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_int_adjustment_update),
diff --git a/plug-ins/file-jpeg/jpeg-save.c b/plug-ins/file-jpeg/jpeg-save.c
index 48d3a55..92841e3 100644
--- a/plug-ins/file-jpeg/jpeg-save.c
+++ b/plug-ins/file-jpeg/jpeg-save.c
@@ -771,13 +771,13 @@ save_dialog (void)
gtk_widget_show (grid);
pg.quality = entry = (GtkAdjustment *)
- gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 0,
- _("_Quality:"),
- SCALE_WIDTH, 0, jsvals.quality,
- 0.0, 100.0, 1.0, 10.0, 0,
- TRUE, 0.0, 0.0,
- _("JPEG quality parameter"),
- "file-jpeg-save-quality");
+ gimp_scale_entry_new (GTK_GRID (grid), 0, 0,
+ _("_Quality:"),
+ SCALE_WIDTH, 0, jsvals.quality,
+ 0.0, 100.0, 1.0, 10.0, 0,
+ TRUE, 0.0, 0.0,
+ _("JPEG quality parameter"),
+ "file-jpeg-save-quality");
g_signal_connect (entry, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
@@ -838,13 +838,13 @@ save_dialog (void)
gtk_widget_show (grid2);
pg.smoothing = entry = (GtkAdjustment *)
- gimp_scale_entry_new_grid (GTK_GRID (grid2), 0, 0,
- _("S_moothing:"),
- 100, 0, jsvals.smoothing,
- 0.0, 1.0, 0.01, 0.1, 2,
- TRUE, 0.0, 0.0,
- NULL,
- "file-jpeg-save-smoothing");
+ gimp_scale_entry_new (GTK_GRID (grid2), 0, 0,
+ _("S_moothing:"),
+ 100, 0, jsvals.smoothing,
+ 0.0, 1.0, 0.01, 0.1, 2,
+ TRUE, 0.0, 0.0,
+ NULL,
+ "file-jpeg-save-smoothing");
g_signal_connect (entry, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&jsvals.smoothing);
diff --git a/plug-ins/file-webp/file-webp-dialog.c b/plug-ins/file-webp/file-webp-dialog.c
index fdea28c..46ee817 100644
--- a/plug-ins/file-webp/file-webp-dialog.c
+++ b/plug-ins/file-webp/file-webp-dialog.c
@@ -133,18 +133,18 @@ save_dialog (WebPSaveParams *params,
¶ms->lossless);
/* Create the slider for image quality */
- quality_scale = gimp_scale_entry_new_grid (GTK_GRID (grid),
- 0, row++,
- _("Image quality:"),
- 125,
- 0,
- params->quality,
- 0.0, 100.0,
- 1.0, 10.0,
- 0, TRUE,
- 0.0, 0.0,
- _("Image quality"),
- NULL);
+ quality_scale = gimp_scale_entry_new (GTK_GRID (grid),
+ 0, row++,
+ _("Image quality:"),
+ 125,
+ 0,
+ params->quality,
+ 0.0, 100.0,
+ 1.0, 10.0,
+ 0, TRUE,
+ 0.0, 0.0,
+ _("Image quality"),
+ NULL);
gimp_scale_entry_set_sensitive (quality_scale, ! params->lossless);
g_signal_connect (quality_scale, "value-changed",
@@ -152,18 +152,18 @@ save_dialog (WebPSaveParams *params,
¶ms->quality);
/* Create the slider for alpha channel quality */
- alpha_quality_scale = gimp_scale_entry_new_grid (GTK_GRID (grid),
- 0, row++,
- _("Alpha quality:"),
- 125,
- 0,
- params->alpha_quality,
- 0.0, 100.0,
- 1.0, 10.0,
- 0, TRUE,
- 0.0, 0.0,
- _("Alpha channel quality"),
- NULL);
+ alpha_quality_scale = gimp_scale_entry_new (GTK_GRID (grid),
+ 0, row++,
+ _("Alpha quality:"),
+ 125,
+ 0,
+ params->alpha_quality,
+ 0.0, 100.0,
+ 1.0, 10.0,
+ 0, TRUE,
+ 0.0, 0.0,
+ _("Alpha channel quality"),
+ NULL);
gimp_scale_entry_set_sensitive (alpha_quality_scale, ! params->lossless);
g_signal_connect (alpha_quality_scale, "value-changed",
diff --git a/plug-ins/flame/flame.c b/plug-ins/flame/flame.c
index c9ae063..3b3922a 100644
--- a/plug-ins/flame/flame.c
+++ b/plug-ins/flame/flame.c
@@ -715,12 +715,12 @@ edit_callback (GtkWidget *widget,
gtk_box_pack_start (GTK_BOX (vbox), grid, FALSE, FALSE, 0);
gtk_widget_show(grid);
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 0,
- _("_Speed:"), SCALE_WIDTH, 0,
- pick_speed,
- 0.05, 0.5, 0.01, 0.1, 2,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, 0,
+ _("_Speed:"), SCALE_WIDTH, 0,
+ pick_speed,
+ 0.05, 0.5, 0.01, 0.1, 2,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
@@ -1078,12 +1078,12 @@ flame_dialog (void)
gtk_box_pack_start (GTK_BOX (box), grid, FALSE, FALSE, 0);
gtk_widget_show (grid);
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 0,
- _("_Brightness:"), SCALE_WIDTH, 5,
- config.cp.brightness,
- 0, 5, 0.1, 1, 2,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, 0,
+ _("_Brightness:"), SCALE_WIDTH, 5,
+ config.cp.brightness,
+ 0, 5, 0.1, 1, 2,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
@@ -1092,12 +1092,12 @@ flame_dialog (void)
G_CALLBACK (set_flame_preview),
NULL);
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 1,
- _("Co_ntrast:"), SCALE_WIDTH, 5,
- config.cp.contrast,
- 0, 5, 0.1, 1, 2,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, 1,
+ _("Co_ntrast:"), SCALE_WIDTH, 5,
+ config.cp.contrast,
+ 0, 5, 0.1, 1, 2,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
@@ -1106,12 +1106,12 @@ flame_dialog (void)
G_CALLBACK (set_flame_preview),
NULL);
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 2,
- _("_Gamma:"), SCALE_WIDTH, 5,
- config.cp.gamma,
- 1, 5, 0.1, 1, 2,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, 2,
+ _("_Gamma:"), SCALE_WIDTH, 5,
+ config.cp.gamma,
+ 1, 5, 0.1, 1, 2,
+ TRUE, 0, 0,
+ NULL, NULL);
gtk_widget_set_margin_bottom (gtk_grid_get_child_at (GTK_GRID (grid), 0, 2), 6);
gtk_widget_set_margin_bottom (gtk_grid_get_child_at (GTK_GRID (grid), 1, 2), 6);
gtk_widget_set_margin_bottom (gtk_grid_get_child_at (GTK_GRID (grid), 2, 2), 6);
@@ -1123,34 +1123,34 @@ flame_dialog (void)
G_CALLBACK (set_flame_preview),
NULL);
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 3,
- _("Sample _density:"), SCALE_WIDTH, 5,
- config.cp.sample_density,
- 0.1, 20, 1, 5, 2,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, 3,
+ _("Sample _density:"), SCALE_WIDTH, 5,
+ config.cp.sample_density,
+ 0.1, 20, 1, 5, 2,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&config.cp.sample_density);
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 4,
- _("Spa_tial oversample:"), SCALE_WIDTH, 5,
- config.cp.spatial_oversample,
- 1, 4, 0.01, 0.1, 0,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, 4,
+ _("Spa_tial oversample:"), SCALE_WIDTH, 5,
+ config.cp.spatial_oversample,
+ 1, 4, 0.01, 0.1, 0,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_int_adjustment_update),
&config.cp.spatial_oversample);
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 5,
- _("Spatial _filter radius:"), SCALE_WIDTH, 5,
- config.cp.spatial_filter_radius,
- 0, 4, 0.2, 1, 2,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, 5,
+ _("Spatial _filter radius:"), SCALE_WIDTH, 5,
+ config.cp.spatial_filter_radius,
+ 0, 4, 0.2, 1, 2,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
@@ -1237,12 +1237,12 @@ flame_dialog (void)
gtk_notebook_append_page (GTK_NOTEBOOK (notebook), grid, label);
gtk_widget_show (grid);
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 0,
- _("_Zoom:"), SCALE_WIDTH, 0,
- config.cp.zoom,
- -4, 4, 0.5, 1, 2,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, 0,
+ _("_Zoom:"), SCALE_WIDTH, 0,
+ config.cp.zoom,
+ -4, 4, 0.5, 1, 2,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
@@ -1251,12 +1251,12 @@ flame_dialog (void)
G_CALLBACK (set_flame_preview),
NULL);
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 1,
- _("_X:"), SCALE_WIDTH, 0,
- config.cp.center[0],
- -2, 2, 0.5, 1, 2,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, 1,
+ _("_X:"), SCALE_WIDTH, 0,
+ config.cp.center[0],
+ -2, 2, 0.5, 1, 2,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
@@ -1265,12 +1265,12 @@ flame_dialog (void)
G_CALLBACK (set_flame_preview),
NULL);
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 2,
- _("_Y:"), SCALE_WIDTH, 0,
- config.cp.center[1],
- -2, 2, 0.5, 1, 2,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, 2,
+ _("_Y:"), SCALE_WIDTH, 0,
+ config.cp.center[1],
+ -2, 2, 0.5, 1, 2,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
diff --git a/plug-ins/fractal-explorer/fractal-explorer-dialogs.c
b/plug-ins/fractal-explorer/fractal-explorer-dialogs.c
index bbfbd88..1e8e3b0 100644
--- a/plug-ins/fractal-explorer/fractal-explorer-dialogs.c
+++ b/plug-ins/fractal-explorer/fractal-explorer-dialogs.c
@@ -733,68 +733,68 @@ explorer_dialog (void)
gtk_widget_show (grid);
elements->xmin =
- gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 0,
- _("Left:"), SCALE_WIDTH, 10,
- wvals.xmin, -3, 3, 0.001, 0.01, 5,
- TRUE, 0, 0, NULL, NULL);
+ gimp_scale_entry_new (GTK_GRID (grid), 0, 0,
+ _("Left:"), SCALE_WIDTH, 10,
+ wvals.xmin, -3, 3, 0.001, 0.01, 5,
+ TRUE, 0, 0, NULL, NULL);
g_signal_connect (elements->xmin, "value-changed",
G_CALLBACK (explorer_double_adjustment_update),
&wvals.xmin);
elements->xmax =
- gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 1,
- _("Right:"), SCALE_WIDTH, 10,
- wvals.xmax, -3, 3, 0.001, 0.01, 5,
- TRUE, 0, 0, NULL, NULL);
+ gimp_scale_entry_new (GTK_GRID (grid), 0, 1,
+ _("Right:"), SCALE_WIDTH, 10,
+ wvals.xmax, -3, 3, 0.001, 0.01, 5,
+ TRUE, 0, 0, NULL, NULL);
g_signal_connect (elements->xmax, "value-changed",
G_CALLBACK (explorer_double_adjustment_update),
&wvals.xmax);
elements->ymin =
- gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 2,
- _("Top:"), SCALE_WIDTH, 10,
- wvals.ymin, -3, 3, 0.001, 0.01, 5,
- TRUE, 0, 0, NULL, NULL);
+ gimp_scale_entry_new (GTK_GRID (grid), 0, 2,
+ _("Top:"), SCALE_WIDTH, 10,
+ wvals.ymin, -3, 3, 0.001, 0.01, 5,
+ TRUE, 0, 0, NULL, NULL);
g_signal_connect (elements->ymin, "value-changed",
G_CALLBACK (explorer_double_adjustment_update),
&wvals.ymin);
elements->ymax =
- gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 3,
- _("Bottom:"), SCALE_WIDTH, 10,
- wvals.ymax, -3, 3, 0.001, 0.01, 5,
- TRUE, 0, 0, NULL, NULL);
+ gimp_scale_entry_new (GTK_GRID (grid), 0, 3,
+ _("Bottom:"), SCALE_WIDTH, 10,
+ wvals.ymax, -3, 3, 0.001, 0.01, 5,
+ TRUE, 0, 0, NULL, NULL);
g_signal_connect (elements->ymax, "value-changed",
G_CALLBACK (explorer_double_adjustment_update),
&wvals.ymax);
elements->iter =
- gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 4,
- _("Iterations:"), SCALE_WIDTH, 10,
- wvals.iter, 1, 1000, 1, 10, 0,
- TRUE, 0, 0,
- _("The higher the number of iterations, "
- "the more details will be calculated"), NULL);
+ gimp_scale_entry_new (GTK_GRID (grid), 0, 4,
+ _("Iterations:"), SCALE_WIDTH, 10,
+ wvals.iter, 1, 1000, 1, 10, 0,
+ TRUE, 0, 0,
+ _("The higher the number of iterations, "
+ "the more details will be calculated"), NULL);
g_signal_connect (elements->iter, "value-changed",
G_CALLBACK (explorer_double_adjustment_update),
&wvals.iter);
elements->cx =
- gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 5,
- _("CX:"), SCALE_WIDTH, 10,
- wvals.cx, -2.5, 2.5, 0.001, 0.01, 5,
- TRUE, 0, 0,
- _("Changes aspect of fractal"), NULL);
+ gimp_scale_entry_new (GTK_GRID (grid), 0, 5,
+ _("CX:"), SCALE_WIDTH, 10,
+ wvals.cx, -2.5, 2.5, 0.001, 0.01, 5,
+ TRUE, 0, 0,
+ _("Changes aspect of fractal"), NULL);
g_signal_connect (elements->cx, "value-changed",
G_CALLBACK (explorer_double_adjustment_update),
&wvals.cx);
elements->cy =
- gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 6,
- _("CY:"), SCALE_WIDTH, 10,
- wvals.cy, -2.5, 2.5, 0.001, 0.01, 5,
- TRUE, 0, 0,
- _("Changes aspect of fractal"), NULL);
+ gimp_scale_entry_new (GTK_GRID (grid), 0, 6,
+ _("CY:"), SCALE_WIDTH, 10,
+ wvals.cy, -2.5, 2.5, 0.001, 0.01, 5,
+ TRUE, 0, 0,
+ _("Changes aspect of fractal"), NULL);
g_signal_connect (elements->cy, "value-changed",
G_CALLBACK (explorer_double_adjustment_update),
&wvals.cy);
@@ -921,12 +921,12 @@ explorer_dialog (void)
gtk_widget_show (grid);
elements->ncol =
- gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 0,
- _("Number of colors:"), SCALE_WIDTH, 0,
- wvals.ncolors, 2, MAXNCOLORS, 1, 10, 0,
- TRUE, 0, 0,
- _("Change the number of colors in the mapping"),
- NULL);
+ gimp_scale_entry_new (GTK_GRID (grid), 0, 0,
+ _("Number of colors:"), SCALE_WIDTH, 0,
+ wvals.ncolors, 2, MAXNCOLORS, 1, 10, 0,
+ TRUE, 0, 0,
+ _("Change the number of colors in the mapping"),
+ NULL);
g_signal_connect (elements->ncol, "value-changed",
G_CALLBACK (explorer_number_of_colors_callback),
&wvals.ncolors);
@@ -954,31 +954,31 @@ explorer_dialog (void)
gtk_widget_show (grid);
elements->red =
- gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 0,
- _("Red:"), SCALE_WIDTH, 0,
- wvals.redstretch, 0, 1, 0.01, 0.1, 2,
- TRUE, 0, 0,
- _("Change the intensity of the red channel"), NULL);
+ gimp_scale_entry_new (GTK_GRID (grid), 0, 0,
+ _("Red:"), SCALE_WIDTH, 0,
+ wvals.redstretch, 0, 1, 0.01, 0.1, 2,
+ TRUE, 0, 0,
+ _("Change the intensity of the red channel"), NULL);
g_signal_connect (elements->red, "value-changed",
G_CALLBACK (explorer_double_adjustment_update),
&wvals.redstretch);
elements->green =
- gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 1,
- _("Green:"), SCALE_WIDTH, 0,
- wvals.greenstretch, 0, 1, 0.01, 0.1, 2,
- TRUE, 0, 0,
- _("Change the intensity of the green channel"), NULL);
+ gimp_scale_entry_new (GTK_GRID (grid), 0, 1,
+ _("Green:"), SCALE_WIDTH, 0,
+ wvals.greenstretch, 0, 1, 0.01, 0.1, 2,
+ TRUE, 0, 0,
+ _("Change the intensity of the green channel"), NULL);
g_signal_connect (elements->green, "value-changed",
G_CALLBACK (explorer_double_adjustment_update),
&wvals.greenstretch);
elements->blue =
- gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 2,
- _("Blue:"), SCALE_WIDTH, 0,
- wvals.bluestretch, 0, 1, 0.01, 0.1, 2,
- TRUE, 0, 0,
- _("Change the intensity of the blue channel"), NULL);
+ gimp_scale_entry_new (GTK_GRID (grid), 0, 2,
+ _("Blue:"), SCALE_WIDTH, 0,
+ wvals.bluestretch, 0, 1, 0.01, 0.1, 2,
+ TRUE, 0, 0,
+ _("Change the intensity of the blue channel"), NULL);
g_signal_connect (elements->blue, "value-changed",
G_CALLBACK (explorer_double_adjustment_update),
&wvals.bluestretch);
diff --git a/plug-ins/gfig/gfig-dialog.c b/plug-ins/gfig/gfig-dialog.c
index 410db01..5e25aaf 100644
--- a/plug-ins/gfig/gfig-dialog.c
+++ b/plug-ins/gfig/gfig-dialog.c
@@ -1309,12 +1309,12 @@ gfig_prefs_action_callback (GtkAction *widget,
gtk_box_pack_start (GTK_BOX (main_vbox), grid, FALSE, FALSE, 6);
gtk_widget_show (grid);
- size_data = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 0,
- _("Max undo:"), 100, 50,
- selvals.maxundo,
- MIN_UNDO, MAX_UNDO, 1, 2, 0,
- TRUE, 0, 0,
- NULL, NULL);
+ size_data = gimp_scale_entry_new (GTK_GRID (grid), 0, 0,
+ _("Max undo:"), 100, 50,
+ selvals.maxundo,
+ MIN_UNDO, MAX_UNDO, 1, 2, 0,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (size_data, "value-changed",
G_CALLBACK (gimp_int_adjustment_update),
&selvals.maxundo);
@@ -1420,12 +1420,12 @@ gfig_grid_action_callback (GtkAction *action,
gtk_box_pack_start (GTK_BOX (main_vbox), grid, FALSE, FALSE, 0);
gtk_widget_show (grid);
- size_data = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 0,
- _("Grid spacing:"), 100, 50,
- selvals.opts.gridspacing,
- MIN_GRID, MAX_GRID, 1, 10, 0,
- TRUE, 0, 0,
- NULL, NULL);
+ size_data = gimp_scale_entry_new (GTK_GRID (grid), 0, 0,
+ _("Grid spacing:"), 100, 50,
+ selvals.opts.gridspacing,
+ MIN_GRID, MAX_GRID, 1, 10, 0,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (size_data, "value-changed",
G_CALLBACK (gimp_int_adjustment_update),
&selvals.opts.gridspacing);
@@ -1437,12 +1437,12 @@ gfig_grid_action_callback (GtkAction *action,
g_object_add_weak_pointer (G_OBJECT (gfig_opt_widget.gridspacing),
(gpointer) &gfig_opt_widget.gridspacing);
- sectors_data = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 3,
- _("Polar grid sectors desired:"), 1, 5,
- selvals.opts.grid_sectors_desired,
- 5, 360, 5, 1, 0,
- TRUE, 0, 0,
- NULL, NULL);
+ sectors_data = gimp_scale_entry_new (GTK_GRID (grid), 0, 3,
+ _("Polar grid sectors desired:"), 1, 5,
+ selvals.opts.grid_sectors_desired,
+ 5, 360, 5, 1, 0,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (sectors_data, "value-changed",
G_CALLBACK (gimp_int_adjustment_update),
&selvals.opts.grid_sectors_desired);
@@ -1459,12 +1459,12 @@ gfig_grid_action_callback (GtkAction *action,
g_object_add_weak_pointer (G_OBJECT (gfig_opt_widget.gridspacing),
(gpointer) &gfig_opt_widget.gridspacing);
- radius_data = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 4,
- _("Polar grid radius interval:"), 1, 5,
- selvals.opts.grid_radius_interval,
- 5, 50, 5, 1, 0,
- TRUE, 0, 0,
- NULL, NULL);
+ radius_data = gimp_scale_entry_new (GTK_GRID (grid), 0, 4,
+ _("Polar grid radius interval:"), 1, 5,
+ selvals.opts.grid_radius_interval,
+ 5, 50, 5, 1, 0,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (radius_data, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&selvals.opts.grid_radius_interval);
@@ -1728,11 +1728,11 @@ num_sides_widget (const gchar *d_title,
gtk_container_set_border_width (GTK_CONTAINER (grid), 12);
gtk_widget_show (grid);
- size_data = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 0,
- _("Sides:"), 0, 0,
- *num_sides, adj_min, adj_max, 1, 10, 0,
- TRUE, 0, 0,
- NULL, NULL);
+ size_data = gimp_scale_entry_new (GTK_GRID (grid), 0, 0,
+ _("Sides:"), 0, 0,
+ *num_sides, adj_min, adj_max, 1, 10, 0,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (size_data, "value-changed",
G_CALLBACK (gimp_int_adjustment_update),
num_sides);
diff --git a/plug-ins/gimpressionist/brush.c b/plug-ins/gimpressionist/brush.c
index 247b2d5..a9ebb93 100644
--- a/plug-ins/gimpressionist/brush.c
+++ b/plug-ins/gimpressionist/brush.c
@@ -592,26 +592,26 @@ create_brushpage (GtkNotebook *notebook)
gtk_widget_show (grid);
brush_aspect_adjust = (GtkAdjustment *)
- gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 0,
- _("Aspect ratio:"),
- 150, -1, pcvals.brush_aspect,
- -1.0, 1.0, 0.1, 0.1, 2,
- TRUE, 0, 0,
- _("Specifies the aspect ratio of the brush"),
- NULL);
+ gimp_scale_entry_new (GTK_GRID (grid), 0, 0,
+ _("Aspect ratio:"),
+ 150, -1, pcvals.brush_aspect,
+ -1.0, 1.0, 0.1, 0.1, 2,
+ TRUE, 0, 0,
+ _("Specifies the aspect ratio of the brush"),
+ NULL);
gtk_size_group_add_widget (group,
GIMP_SCALE_ENTRY_LABEL (brush_aspect_adjust));
g_signal_connect (brush_aspect_adjust, "value-changed",
G_CALLBACK (brush_asepct_adjust_cb), &pcvals.brush_aspect);
brush_relief_adjust = (GtkAdjustment *)
- gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 1,
- _("Relief:"),
- 150, -1, pcvals.brush_relief,
- 0.0, 100.0, 1.0, 10.0, 1,
- TRUE, 0, 0,
- _("Specifies the amount of embossing to apply to the image (in percent)"),
- NULL);
+ gimp_scale_entry_new (GTK_GRID (grid), 0, 1,
+ _("Relief:"),
+ 150, -1, pcvals.brush_relief,
+ 0.0, 100.0, 1.0, 10.0, 1,
+ TRUE, 0, 0,
+ _("Specifies the amount of embossing to apply to the image (in percent)"),
+ NULL);
gtk_size_group_add_widget (group,
GIMP_SCALE_ENTRY_LABEL (brush_relief_adjust));
g_signal_connect (brush_relief_adjust, "value-changed",
diff --git a/plug-ins/gimpressionist/color.c b/plug-ins/gimpressionist/color.c
index 2fa4387..49fd375 100644
--- a/plug-ins/gimpressionist/color.c
+++ b/plug-ins/gimpressionist/color.c
@@ -89,13 +89,13 @@ create_colorpage (GtkNotebook *notebook)
gtk_widget_show (grid);
colornoiseadjust =
- gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 0,
- _("Color _noise:"),
- 100, -1, pcvals.color_noise,
- 0.0, 100.0, 1.0, 5.0, 0,
- TRUE, 0, 0,
- _("Adds random noise to the color"),
- NULL);
+ gimp_scale_entry_new (GTK_GRID (grid), 0, 0,
+ _("Color _noise:"),
+ 100, -1, pcvals.color_noise,
+ 0.0, 100.0, 1.0, 5.0, 0,
+ TRUE, 0, 0,
+ _("Adds random noise to the color"),
+ NULL);
g_signal_connect (colornoiseadjust, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&pcvals.color_noise);
diff --git a/plug-ins/gimpressionist/general.c b/plug-ins/gimpressionist/general.c
index 044a2fd..07c43ce 100644
--- a/plug-ins/gimpressionist/general.c
+++ b/plug-ins/gimpressionist/general.c
@@ -235,49 +235,49 @@ create_generalpage (GtkNotebook *notebook)
gtk_widget_show (grid);
general_dark_edge_adjust =
- gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 0,
- _("Edge darken:"),
- 150, 6, pcvals.general_dark_edge,
- 0.0, 1.0, 0.01, 0.1, 2,
- TRUE, 0, 0,
- _("How much to \"darken\" the edges of each brush stroke"),
- NULL);
+ gimp_scale_entry_new (GTK_GRID (grid), 0, 0,
+ _("Edge darken:"),
+ 150, 6, pcvals.general_dark_edge,
+ 0.0, 1.0, 0.01, 0.1, 2,
+ TRUE, 0, 0,
+ _("How much to \"darken\" the edges of each brush stroke"),
+ NULL);
general_shadow_adjust =
- gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 1,
- _("Shadow darken:"),
- 150, 6, pcvals.general_shadow_darkness,
- 0.0, 99.0, 0.1, 1, 2,
- TRUE, 0, 0,
- _("How much to \"darken\" the drop shadow"),
- NULL);
+ gimp_scale_entry_new (GTK_GRID (grid), 0, 1,
+ _("Shadow darken:"),
+ 150, 6, pcvals.general_shadow_darkness,
+ 0.0, 99.0, 0.1, 1, 2,
+ TRUE, 0, 0,
+ _("How much to \"darken\" the drop shadow"),
+ NULL);
general_shadow_depth =
- gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 2,
- _("Shadow depth:"),
- 150, 6, pcvals.general_shadow_depth,
- 0, 99, 1, 5, 0,
- TRUE, 0, 0,
- _("The depth of the drop shadow, i.e. how far apart from the object it should
be"),
- NULL);
+ gimp_scale_entry_new (GTK_GRID (grid), 0, 2,
+ _("Shadow depth:"),
+ 150, 6, pcvals.general_shadow_depth,
+ 0, 99, 1, 5, 0,
+ TRUE, 0, 0,
+ _("The depth of the drop shadow, i.e. how far apart from the object it should be"),
+ NULL);
general_shadow_blur =
- gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 3,
- _("Shadow blur:"),
- 150, 6, pcvals.general_shadow_blur,
- 0, 99, 1, 5, 0,
- TRUE, 0, 0,
- _("How much to blur the drop shadow"),
- NULL);
+ gimp_scale_entry_new (GTK_GRID (grid), 0, 3,
+ _("Shadow blur:"),
+ 150, 6, pcvals.general_shadow_blur,
+ 0, 99, 1, 5, 0,
+ TRUE, 0, 0,
+ _("How much to blur the drop shadow"),
+ NULL);
dev_thresh_adjust =
- gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 4,
- _("Deviation threshold:"),
- 150, 6, pcvals.devthresh,
- 0.0, 1.0, 0.01, 0.01, 2,
- TRUE, 0, 0,
- _("A bailout-value for adaptive selections"),
- NULL);
+ gimp_scale_entry_new (GTK_GRID (grid), 0, 4,
+ _("Deviation threshold:"),
+ 150, 6, pcvals.devthresh,
+ 0.0, 1.0, 0.01, 0.01, 2,
+ TRUE, 0, 0,
+ _("A bailout-value for adaptive selections"),
+ NULL);
gtk_notebook_append_page_menu (notebook, thispage, label, NULL);
}
diff --git a/plug-ins/gimpressionist/orientation.c b/plug-ins/gimpressionist/orientation.c
index 3e3347e..8cb137f 100644
--- a/plug-ins/gimpressionist/orientation.c
+++ b/plug-ins/gimpressionist/orientation.c
@@ -101,37 +101,37 @@ create_orientationpage (GtkNotebook *notebook)
gtk_widget_show (grid);
orient_num_adjust =
- gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 0,
- _("Directions:"),
- 150, -1, pcvals.orient_num,
- 1.0, 30.0, 1.0, 1.0, 0,
- TRUE, 0, 0,
- _("The number of directions (i.e. brushes) to use"),
- NULL);
+ gimp_scale_entry_new (GTK_GRID (grid), 0, 0,
+ _("Directions:"),
+ 150, -1, pcvals.orient_num,
+ 1.0, 30.0, 1.0, 1.0, 0,
+ TRUE, 0, 0,
+ _("The number of directions (i.e. brushes) to use"),
+ NULL);
g_signal_connect (orient_num_adjust, "value-changed",
G_CALLBACK (gimp_int_adjustment_update),
&pcvals.orient_num);
orient_first_adjust =
- gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 1,
- _("Start angle:"),
- 150, -1, pcvals.orient_first,
- 0.0, 360.0, 1.0, 10.0, 0,
- TRUE, 0, 0,
- _("The starting angle of the first brush to create"),
- NULL);
+ gimp_scale_entry_new (GTK_GRID (grid), 0, 1,
+ _("Start angle:"),
+ 150, -1, pcvals.orient_first,
+ 0.0, 360.0, 1.0, 10.0, 0,
+ TRUE, 0, 0,
+ _("The starting angle of the first brush to create"),
+ NULL);
g_signal_connect (orient_first_adjust, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&pcvals.orient_first);
orient_last_adjust =
- gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 2,
- _("Angle span:"),
- 150, -1, pcvals.orient_last,
- 0.0, 360.0, 1.0, 10.0, 0,
- TRUE, 0, 0,
- _("The angle span of the first brush to create"),
- NULL);
+ gimp_scale_entry_new (GTK_GRID (grid), 0, 2,
+ _("Angle span:"),
+ 150, -1, pcvals.orient_last,
+ 0.0, 360.0, 1.0, 10.0, 0,
+ TRUE, 0, 0,
+ _("The angle span of the first brush to create"),
+ NULL);
g_signal_connect (orient_last_adjust, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&pcvals.orient_last);
diff --git a/plug-ins/gimpressionist/orientmap.c b/plug-ins/gimpressionist/orientmap.c
index 2f02b7d..507527c 100644
--- a/plug-ins/gimpressionist/orientmap.c
+++ b/plug-ins/gimpressionist/orientmap.c
@@ -665,46 +665,46 @@ create_orientmap_dialog (GtkWidget *parent)
gtk_widget_show (grid2);
angle_adjust = (GtkAdjustment *)
- gimp_scale_entry_new_grid (GTK_GRID (grid2), 0, 0,
- _("A_ngle:"),
- 150, 6, 0.0,
- 0.0, 360.0, 1.0, 10.0, 1,
- TRUE, 0, 0,
- _("Change the angle of the selected vector"),
- NULL);
+ gimp_scale_entry_new (GTK_GRID (grid2), 0, 0,
+ _("A_ngle:"),
+ 150, 6, 0.0,
+ 0.0, 360.0, 1.0, 10.0, 1,
+ TRUE, 0, 0,
+ _("Change the angle of the selected vector"),
+ NULL);
g_signal_connect (angle_adjust, "value-changed",
G_CALLBACK (angle_adjust_move_callback), NULL);
angle_offset_adjust = (GtkAdjustment *)
- gimp_scale_entry_new_grid (GTK_GRID (grid2), 0, 1,
- _("Ang_le offset:"),
- 150, 6, 0.0,
- 0.0, 360.0, 1.0, 10.0, 1,
- TRUE, 0, 0,
- _("Offset all vectors with a given angle"),
- NULL);
+ gimp_scale_entry_new (GTK_GRID (grid2), 0, 1,
+ _("Ang_le offset:"),
+ 150, 6, 0.0,
+ 0.0, 360.0, 1.0, 10.0, 1,
+ TRUE, 0, 0,
+ _("Offset all vectors with a given angle"),
+ NULL);
g_signal_connect (angle_offset_adjust, "value-changed",
G_CALLBACK (angle_offset_adjust_move_callback), NULL);
strength_adjust = (GtkAdjustment *)
- gimp_scale_entry_new_grid (GTK_GRID (grid2), 0, 2,
- _("_Strength:"),
- 150, 6, 1.0,
- 0.1, 5.0, 0.1, 1.0, 1,
- TRUE, 0, 0,
- _("Change the strength of the selected vector"),
- NULL);
+ gimp_scale_entry_new (GTK_GRID (grid2), 0, 2,
+ _("_Strength:"),
+ 150, 6, 1.0,
+ 0.1, 5.0, 0.1, 1.0, 1,
+ TRUE, 0, 0,
+ _("Change the strength of the selected vector"),
+ NULL);
g_signal_connect (strength_adjust, "value-changed",
G_CALLBACK (strength_adjust_move_callback), NULL);
orient_map_str_exp_adjust = (GtkAdjustment *)
- gimp_scale_entry_new_grid (GTK_GRID (grid2), 0, 3,
- _("S_trength exp.:"),
- 150, 6, 1.0,
- 0.1, 10.9, 0.1, 1.0, 1,
- TRUE, 0, 0,
- _("Change the exponent of the strength"),
- NULL);
+ gimp_scale_entry_new (GTK_GRID (grid2), 0, 3,
+ _("S_trength exp.:"),
+ 150, 6, 1.0,
+ 0.1, 10.9, 0.1, 1.0, 1,
+ TRUE, 0, 0,
+ _("Change the exponent of the strength"),
+ NULL);
g_signal_connect (orient_map_str_exp_adjust, "value-changed",
G_CALLBACK (strength_exponent_adjust_move_callback), NULL);
diff --git a/plug-ins/gimpressionist/paper.c b/plug-ins/gimpressionist/paper.c
index a777403..5f2e86e 100644
--- a/plug-ins/gimpressionist/paper.c
+++ b/plug-ins/gimpressionist/paper.c
@@ -189,25 +189,25 @@ create_paperpage (GtkNotebook *notebook)
gtk_widget_show (grid);
paper_scale_adjust =
- gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 0,
- _("Scale:"),
- 150, -1, pcvals.paper_scale,
- 3.0, 150.0, 1.0, 10.0, 1,
- TRUE, 0, 0,
- _("Specifies the scale of the texture (in percent of original file)"),
- NULL);
+ gimp_scale_entry_new (GTK_GRID (grid), 0, 0,
+ _("Scale:"),
+ 150, -1, pcvals.paper_scale,
+ 3.0, 150.0, 1.0, 10.0, 1,
+ TRUE, 0, 0,
+ _("Specifies the scale of the texture (in percent of original file)"),
+ NULL);
g_signal_connect (paper_scale_adjust, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&pcvals.paper_scale);
paper_relief_adjust =
- gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 1,
- _("Relief:"),
- 150, -1, pcvals.paper_relief,
- 0.0, 100.0, 1.0, 10.0, 1,
- TRUE, 0, 0,
- _("Specifies the amount of embossing to apply to the image (in percent)"),
- NULL);
+ gimp_scale_entry_new (GTK_GRID (grid), 0, 1,
+ _("Relief:"),
+ 150, -1, pcvals.paper_relief,
+ 0.0, 100.0, 1.0, 10.0, 1,
+ TRUE, 0, 0,
+ _("Specifies the amount of embossing to apply to the image (in percent)"),
+ NULL);
g_signal_connect (paper_relief_adjust, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&pcvals.paper_relief);
diff --git a/plug-ins/gimpressionist/placement.c b/plug-ins/gimpressionist/placement.c
index 5645e88..92a78dd 100644
--- a/plug-ins/gimpressionist/placement.c
+++ b/plug-ins/gimpressionist/placement.c
@@ -115,13 +115,13 @@ create_placementpage (GtkNotebook *notebook)
gtk_widget_show (grid);
brush_density_adjust =
- gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 0,
- _("Stroke _density:"),
- 100, -1, pcvals.brush_density,
- 1.0, 50.0, 1.0, 5.0, 0,
- TRUE, 0, 0,
- _("The relative density of the brush strokes"),
- NULL);
+ gimp_scale_entry_new (GTK_GRID (grid), 0, 0,
+ _("Stroke _density:"),
+ 100, -1, pcvals.brush_density,
+ 1.0, 50.0, 1.0, 5.0, 0,
+ TRUE, 0, 0,
+ _("The relative density of the brush strokes"),
+ NULL);
g_signal_connect (brush_density_adjust, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&pcvals.brush_density);
diff --git a/plug-ins/gimpressionist/size.c b/plug-ins/gimpressionist/size.c
index 0da12d8..0d57688 100644
--- a/plug-ins/gimpressionist/size.c
+++ b/plug-ins/gimpressionist/size.c
@@ -104,37 +104,37 @@ create_sizepage (GtkNotebook *notebook)
gtk_widget_show (grid);
sizenumadjust =
- gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 0,
- _("Size variants:"),
- 150, -1, pcvals.size_num,
- 1.0, 30.0, 1.0, 1.0, 0,
- TRUE, 0, 0,
- _("The number of sizes of brushes to use"),
- NULL);
+ gimp_scale_entry_new (GTK_GRID (grid), 0, 0,
+ _("Size variants:"),
+ 150, -1, pcvals.size_num,
+ 1.0, 30.0, 1.0, 1.0, 0,
+ TRUE, 0, 0,
+ _("The number of sizes of brushes to use"),
+ NULL);
g_signal_connect (sizenumadjust, "value-changed",
G_CALLBACK (gimp_int_adjustment_update),
&pcvals.size_num);
sizefirstadjust =
- gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 1,
- _("Minimum size:"),
- 150, -1, pcvals.size_first,
- 0.0, 360.0, 1.0, 10.0, 0,
- TRUE, 0, 0,
- _("The smallest brush to create"),
- NULL);
+ gimp_scale_entry_new (GTK_GRID (grid), 0, 1,
+ _("Minimum size:"),
+ 150, -1, pcvals.size_first,
+ 0.0, 360.0, 1.0, 10.0, 0,
+ TRUE, 0, 0,
+ _("The smallest brush to create"),
+ NULL);
g_signal_connect (sizefirstadjust, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&pcvals.size_first);
sizelastadjust =
- gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 2,
- _("Maximum size:"),
- 150, -1, pcvals.size_last,
- 0.0, 360.0, 1.0, 10.0, 0,
- TRUE, 0, 0,
- _("The largest brush to create"),
- NULL);
+ gimp_scale_entry_new (GTK_GRID (grid), 0, 2,
+ _("Maximum size:"),
+ 150, -1, pcvals.size_last,
+ 0.0, 360.0, 1.0, 10.0, 0,
+ TRUE, 0, 0,
+ _("The largest brush to create"),
+ NULL);
g_signal_connect (sizelastadjust, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&pcvals.size_last);
diff --git a/plug-ins/gimpressionist/sizemap.c b/plug-ins/gimpressionist/sizemap.c
index 18475a4..f5fea7e 100644
--- a/plug-ins/gimpressionist/sizemap.c
+++ b/plug-ins/gimpressionist/sizemap.c
@@ -505,35 +505,35 @@ create_sizemap_dialog (GtkWidget *parent)
gtk_widget_show (grid2);
sizadjust = (GtkAdjustment *)
- gimp_scale_entry_new_grid (GTK_GRID (grid2), 0, 0,
- _("_Size:"),
- 150, 6, 50.0,
- 0.0, 100.0, 1.0, 10.0, 1,
- TRUE, 0, 0,
- _("Change the angle of the selected smvector"),
- NULL);
+ gimp_scale_entry_new (GTK_GRID (grid2), 0, 0,
+ _("_Size:"),
+ 150, 6, 50.0,
+ 0.0, 100.0, 1.0, 10.0, 1,
+ TRUE, 0, 0,
+ _("Change the angle of the selected smvector"),
+ NULL);
g_signal_connect (sizadjust, "value-changed",
G_CALLBACK (angsmadjmove), NULL);
smstradjust = (GtkAdjustment *)
- gimp_scale_entry_new_grid (GTK_GRID (grid2), 0, 1,
- _("S_trength:"),
- 150, 6, 1.0,
- 0.1, 5.0, 0.1, 0.5, 1,
- TRUE, 0, 0,
- _("Change the strength of the selected smvector"),
- NULL);
+ gimp_scale_entry_new (GTK_GRID (grid2), 0, 1,
+ _("S_trength:"),
+ 150, 6, 1.0,
+ 0.1, 5.0, 0.1, 0.5, 1,
+ TRUE, 0, 0,
+ _("Change the strength of the selected smvector"),
+ NULL);
g_signal_connect (smstradjust, "value-changed",
G_CALLBACK (strsmadjmove), NULL);
smstrexpadjust = (GtkAdjustment *)
- gimp_scale_entry_new_grid (GTK_GRID (grid2), 0, 2,
- _("St_rength exp.:"),
- 150, 6, 1.0,
- 0.1, 10.9, 0.1, 0.5, 1,
- TRUE, 0, 0,
- _("Change the exponent of the strength"),
- NULL);
+ gimp_scale_entry_new (GTK_GRID (grid2), 0, 2,
+ _("St_rength exp.:"),
+ 150, 6, 1.0,
+ 0.1, 10.9, 0.1, 0.5, 1,
+ TRUE, 0, 0,
+ _("Change the exponent of the strength"),
+ NULL);
g_signal_connect (smstrexpadjust, "value-changed",
G_CALLBACK (smstrexpsmadjmove), NULL);
diff --git a/plug-ins/gradient-flare/gradient-flare.c b/plug-ins/gradient-flare/gradient-flare.c
index e991687..49b36d6 100644
--- a/plug-ins/gradient-flare/gradient-flare.c
+++ b/plug-ins/gradient-flare/gradient-flare.c
@@ -2753,12 +2753,12 @@ dlg_make_page_settings (GFlareDialog *dlg,
row = 0;
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, row++,
- _("_Radius:"), SCALE_WIDTH, 6,
- pvals.radius, 0.0, drawable->width / 2,
- 1.0, 10.0, 1,
- FALSE, 0.0, GIMP_MAX_IMAGE_SIZE,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, row++,
+ _("_Radius:"), SCALE_WIDTH, 6,
+ pvals.radius, 0.0, drawable->width / 2,
+ 1.0, 10.0, 1,
+ FALSE, 0.0, GIMP_MAX_IMAGE_SIZE,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&pvals.radius);
@@ -2766,11 +2766,11 @@ dlg_make_page_settings (GFlareDialog *dlg,
G_CALLBACK (dlg_preview_update),
NULL);
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, row++,
- _("Ro_tation:"), SCALE_WIDTH, 6,
- pvals.rotation, -180.0, 180.0, 1.0, 15.0, 1,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, row++,
+ _("Ro_tation:"), SCALE_WIDTH, 6,
+ pvals.rotation, -180.0, 180.0, 1.0, 15.0, 1,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&pvals.rotation);
@@ -2778,11 +2778,11 @@ dlg_make_page_settings (GFlareDialog *dlg,
G_CALLBACK (dlg_preview_update),
NULL);
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, row++,
- _("_Hue rotation:"), SCALE_WIDTH, 6,
- pvals.hue, -180.0, 180.0, 1.0, 15.0, 1,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, row++,
+ _("_Hue rotation:"), SCALE_WIDTH, 6,
+ pvals.hue, -180.0, 180.0, 1.0, 15.0, 1,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&pvals.hue);
@@ -2790,11 +2790,11 @@ dlg_make_page_settings (GFlareDialog *dlg,
G_CALLBACK (dlg_preview_update),
NULL);
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, row++,
- _("Vector _angle:"), SCALE_WIDTH, 6,
- pvals.vangle, 0.0, 359.0, 1.0, 15.0, 1,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, row++,
+ _("Vector _angle:"), SCALE_WIDTH, 6,
+ pvals.vangle, 0.0, 359.0, 1.0, 15.0, 1,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&pvals.vangle);
@@ -2802,11 +2802,11 @@ dlg_make_page_settings (GFlareDialog *dlg,
G_CALLBACK (dlg_preview_update),
NULL);
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, row++,
- _("Vector _length:"), SCALE_WIDTH, 6,
- pvals.vlength, 1, 1000, 1.0, 10.0, 1,
- FALSE, 1, GIMP_MAX_IMAGE_SIZE,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, row++,
+ _("Vector _length:"), SCALE_WIDTH, 6,
+ pvals.vlength, 1, 1000, 1.0, 10.0, 1,
+ FALSE, 1, GIMP_MAX_IMAGE_SIZE,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&pvals.vlength);
@@ -2844,22 +2844,22 @@ dlg_make_page_settings (GFlareDialog *dlg,
asup_grid, "sensitive",
G_BINDING_SYNC_CREATE);
- adj = gimp_scale_entry_new_grid (GTK_GRID (asup_grid), 0, 0,
- _("_Max depth:"), -1, 4,
- pvals.asupsample_max_depth,
- 1.0, 10.0, 1.0, 1.0, 0,
- TRUE, 0.0, 0.0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (asup_grid), 0, 0,
+ _("_Max depth:"), -1, 4,
+ pvals.asupsample_max_depth,
+ 1.0, 10.0, 1.0, 1.0, 0,
+ TRUE, 0.0, 0.0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_int_adjustment_update),
&pvals.asupsample_max_depth);
- adj = gimp_scale_entry_new_grid (GTK_GRID (asup_grid), 0, 1,
- _("_Threshold"), -1, 4,
- pvals.asupsample_threshold,
- 0.0, 4.0, 0.01, 0.01, 2,
- TRUE, 0.0, 0.0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (asup_grid), 0, 1,
+ _("_Threshold"), -1, 4,
+ pvals.asupsample_threshold,
+ 0.0, 4.0, 0.01, 0.01, 2,
+ TRUE, 0.0, 0.0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&pvals.asupsample_threshold);
@@ -3454,11 +3454,11 @@ ed_make_page_general (GFlareEditor *ed,
gtk_container_add (GTK_CONTAINER (frame), grid);
gtk_widget_show (grid);
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 0,
- _("Opacity:"), SCALE_WIDTH, 6,
- gflare->glow_opacity, 0.0, 100.0, 1.0, 10.0, 1,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, 0,
+ _("Opacity:"), SCALE_WIDTH, 6,
+ gflare->glow_opacity, 0.0, 100.0, 1.0, 10.0, 1,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&gflare->glow_opacity);
@@ -3482,11 +3482,11 @@ ed_make_page_general (GFlareEditor *ed,
gtk_container_add (GTK_CONTAINER (frame), grid);
gtk_widget_show (grid);
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 0,
- _("Opacity:"), SCALE_WIDTH, 6,
- gflare->rays_opacity, 0.0, 100.0, 1.0, 10.0, 1,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, 0,
+ _("Opacity:"), SCALE_WIDTH, 6,
+ gflare->rays_opacity, 0.0, 100.0, 1.0, 10.0, 1,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&gflare->rays_opacity);
@@ -3510,11 +3510,11 @@ ed_make_page_general (GFlareEditor *ed,
gtk_container_add (GTK_CONTAINER (frame), grid);
gtk_widget_show (grid);
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 0,
- _("Opacity:"), SCALE_WIDTH, 6,
- gflare->sflare_opacity, 0.0, 100.0, 1.0, 10.0, 1,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, 0,
+ _("Opacity:"), SCALE_WIDTH, 6,
+ gflare->sflare_opacity, 0.0, 100.0, 1.0, 10.0, 1,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&gflare->sflare_opacity);
@@ -3591,11 +3591,11 @@ ed_make_page_glow (GFlareEditor *ed,
row = 0;
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, row++,
- _("Size (%):"), SCALE_WIDTH, 6,
- gflare->glow_size, 0.0, 200.0, 1.0, 10.0, 1,
- FALSE, 0, G_MAXINT,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, row++,
+ _("Size (%):"), SCALE_WIDTH, 6,
+ gflare->glow_size, 0.0, 200.0, 1.0, 10.0, 1,
+ FALSE, 0, G_MAXINT,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&gflare->glow_size);
@@ -3603,11 +3603,11 @@ ed_make_page_glow (GFlareEditor *ed,
G_CALLBACK (ed_preview_update),
NULL);
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, row++,
- _("Rotation:"), SCALE_WIDTH, 6,
- gflare->glow_rotation, -180.0, 180.0, 1.0, 15.0, 1,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, row++,
+ _("Rotation:"), SCALE_WIDTH, 6,
+ gflare->glow_rotation, -180.0, 180.0, 1.0, 15.0, 1,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&gflare->glow_rotation);
@@ -3615,11 +3615,11 @@ ed_make_page_glow (GFlareEditor *ed,
G_CALLBACK (ed_preview_update),
NULL);
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, row++,
- _("Hue rotation:"), SCALE_WIDTH, 6,
- gflare->glow_hue, -180.0, 180.0, 1.0, 15.0, 1,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, row++,
+ _("Hue rotation:"), SCALE_WIDTH, 6,
+ gflare->glow_hue, -180.0, 180.0, 1.0, 15.0, 1,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&gflare->glow_hue);
@@ -3696,11 +3696,11 @@ ed_make_page_rays (GFlareEditor *ed,
row = 0;
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, row++,
- _("Size (%):"), SCALE_WIDTH, 6,
- gflare->rays_size, 0.0, 200.0, 1.0, 10.0, 1,
- FALSE, 0, G_MAXINT,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, row++,
+ _("Size (%):"), SCALE_WIDTH, 6,
+ gflare->rays_size, 0.0, 200.0, 1.0, 10.0, 1,
+ FALSE, 0, G_MAXINT,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&gflare->rays_size);
@@ -3708,12 +3708,12 @@ ed_make_page_rays (GFlareEditor *ed,
G_CALLBACK (ed_preview_update),
NULL);
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, row++,
- _("Rotation:"), SCALE_WIDTH, 6,
- gflare->rays_rotation,
- -180.0, 180.0, 1.0, 15.0, 1,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, row++,
+ _("Rotation:"), SCALE_WIDTH, 6,
+ gflare->rays_rotation,
+ -180.0, 180.0, 1.0, 15.0, 1,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&gflare->rays_rotation);
@@ -3721,11 +3721,11 @@ ed_make_page_rays (GFlareEditor *ed,
G_CALLBACK (ed_preview_update),
NULL);
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, row++,
- _("Hue rotation:"), SCALE_WIDTH, 6,
- gflare->rays_hue, -180.0, 180.0, 1.0, 15.0, 1,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, row++,
+ _("Hue rotation:"), SCALE_WIDTH, 6,
+ gflare->rays_hue, -180.0, 180.0, 1.0, 15.0, 1,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&gflare->rays_hue);
@@ -3733,11 +3733,11 @@ ed_make_page_rays (GFlareEditor *ed,
G_CALLBACK (ed_preview_update),
NULL);
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, row++,
- _("# of Spikes:"), SCALE_WIDTH, 6,
- gflare->rays_nspikes, 1, 300, 1.0, 10.0, 0,
- FALSE, 0, G_MAXINT,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, row++,
+ _("# of Spikes:"), SCALE_WIDTH, 6,
+ gflare->rays_nspikes, 1, 300, 1.0, 10.0, 0,
+ FALSE, 0, G_MAXINT,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_int_adjustment_update),
&gflare->rays_nspikes);
@@ -3745,11 +3745,11 @@ ed_make_page_rays (GFlareEditor *ed,
G_CALLBACK (ed_preview_update),
NULL);
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, row++,
- _("Spike thickness:"), SCALE_WIDTH, 6,
- gflare->rays_thickness, 1.0, 100.0, 1.0, 10.0, 1,
- FALSE, 0, GIMP_MAX_IMAGE_SIZE,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, row++,
+ _("Spike thickness:"), SCALE_WIDTH, 6,
+ gflare->rays_thickness, 1.0, 100.0, 1.0, 10.0, 1,
+ FALSE, 0, GIMP_MAX_IMAGE_SIZE,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&gflare->rays_thickness);
@@ -3833,11 +3833,11 @@ ed_make_page_sflare (GFlareEditor *ed,
row = 0;
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, row++,
- _("Size (%):"), SCALE_WIDTH, 6,
- gflare->sflare_size, 0.0, 200.0, 1.0, 10.0, 1,
- FALSE, 0, G_MAXINT,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, row++,
+ _("Size (%):"), SCALE_WIDTH, 6,
+ gflare->sflare_size, 0.0, 200.0, 1.0, 10.0, 1,
+ FALSE, 0, G_MAXINT,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&gflare->sflare_size);
@@ -3845,12 +3845,12 @@ ed_make_page_sflare (GFlareEditor *ed,
G_CALLBACK (ed_preview_update),
NULL);
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, row++,
- _("Rotation:"), SCALE_WIDTH, 6,
- gflare->sflare_rotation,
- -180.0, 180.0, 1.0, 15.0, 1,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, row++,
+ _("Rotation:"), SCALE_WIDTH, 6,
+ gflare->sflare_rotation,
+ -180.0, 180.0, 1.0, 15.0, 1,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&gflare->sflare_rotation);
@@ -3858,11 +3858,11 @@ ed_make_page_sflare (GFlareEditor *ed,
G_CALLBACK (ed_preview_update),
NULL);
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, row++,
- _("Hue rotation:"), SCALE_WIDTH, 6,
- gflare->sflare_hue, -180.0, 180.0, 1.0, 15.0, 1,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, row++,
+ _("Hue rotation:"), SCALE_WIDTH, 6,
+ gflare->sflare_hue, -180.0, 180.0, 1.0, 15.0, 1,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&gflare->sflare_hue);
diff --git a/plug-ins/lighting/lighting-ui.c b/plug-ins/lighting/lighting-ui.c
index a3f3943..77a3684 100644
--- a/plug-ins/lighting/lighting-ui.c
+++ b/plug-ins/lighting/lighting-ui.c
@@ -353,13 +353,13 @@ create_options_page (void)
gtk_widget_show (grid);
adj = (GtkAdjustment *)
- gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 0,
- _("Distance:"), 100, 6,
- mapvals.viewpoint.z,
- 0.0, 2.0, 0.01, 0.05,
- 3, TRUE, 0.0, 0.0,
- "Distance of observer from surface",
- "plug-in-lighting");
+ gimp_scale_entry_new (GTK_GRID (grid), 0, 0,
+ _("Distance:"), 100, 6,
+ mapvals.viewpoint.z,
+ 0.0, 2.0, 0.01, 0.05,
+ 3, TRUE, 0.0, 0.0,
+ "Distance of observer from surface",
+ "plug-in-lighting");
g_signal_connect (adj, "value-changed",
G_CALLBACK (distance_update),
NULL);
diff --git a/plug-ins/map-object/map-object-ui.c b/plug-ins/map-object/map-object-ui.c
index 38265e8..7ff765a 100644
--- a/plug-ins/map-object/map-object-ui.c
+++ b/plug-ins/map-object/map-object-ui.c
@@ -550,12 +550,12 @@ create_options_page (void)
G_BINDING_SYNC_CREATE);
adj = (GtkAdjustment *)
- gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 0,
- _("_Depth:"), 0, 0,
- mapvals.maxdepth, 1.0, 5.0, 0.1, 1.0,
- 1, TRUE, 0, 0,
- _("Antialiasing quality. Higher is better, "
- "but slower"), NULL);
+ gimp_scale_entry_new (GTK_GRID (grid), 0, 0,
+ _("_Depth:"), 0, 0,
+ mapvals.maxdepth, 1.0, 5.0, 0.1, 1.0,
+ 1, TRUE, 0, 0,
+ _("Antialiasing quality. Higher is better, "
+ "but slower"), NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&mapvals.maxdepth);
@@ -968,11 +968,11 @@ create_orientation_page (void)
gtk_widget_show (grid);
adj = (GtkAdjustment *)
- gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 0,
- _("X:"), 0, 0,
- mapvals.position.x, -1.0, 2.0, 0.01, 0.1, 5,
- TRUE, 0, 0,
- _("Object X position in XYZ space"), NULL);
+ gimp_scale_entry_new (GTK_GRID (grid), 0, 0,
+ _("X:"), 0, 0,
+ mapvals.position.x, -1.0, 2.0, 0.01, 0.1, 5,
+ TRUE, 0, 0,
+ _("Object X position in XYZ space"), NULL);
gtk_size_group_add_widget (group, GIMP_SCALE_ENTRY_SPINBUTTON (adj));
gtk_spin_button_configure (GIMP_SCALE_ENTRY_SPINBUTTON (adj),
GIMP_SCALE_ENTRY_SPINBUTTON_ADJ (adj), 0.01, 5);
@@ -982,11 +982,11 @@ create_orientation_page (void)
&mapvals.position.x);
adj = (GtkAdjustment *)
- gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 1,
- _("Y:"), 0, 0,
- mapvals.position.y, -1.0, 2.0, 0.01, 0.1, 5,
- TRUE, 0, 0,
- _("Object Y position in XYZ space"), NULL);
+ gimp_scale_entry_new (GTK_GRID (grid), 0, 1,
+ _("Y:"), 0, 0,
+ mapvals.position.y, -1.0, 2.0, 0.01, 0.1, 5,
+ TRUE, 0, 0,
+ _("Object Y position in XYZ space"), NULL);
gtk_size_group_add_widget (group, GIMP_SCALE_ENTRY_SPINBUTTON (adj));
gtk_spin_button_configure (GIMP_SCALE_ENTRY_SPINBUTTON (adj),
GIMP_SCALE_ENTRY_SPINBUTTON_ADJ (adj), 0.01, 5);
@@ -996,11 +996,11 @@ create_orientation_page (void)
&mapvals.position.y);
adj = (GtkAdjustment *)
- gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 2,
- _("Z:"), 0, 0,
- mapvals.position.z, -1.0, 2.0, 0.01, 0.1, 5,
- TRUE, 0, 0,
- _("Object Z position in XYZ space"), NULL);
+ gimp_scale_entry_new (GTK_GRID (grid), 0, 2,
+ _("Z:"), 0, 0,
+ mapvals.position.z, -1.0, 2.0, 0.01, 0.1, 5,
+ TRUE, 0, 0,
+ _("Object Z position in XYZ space"), NULL);
gtk_size_group_add_widget (group, GIMP_SCALE_ENTRY_SPINBUTTON (adj));
gtk_spin_button_configure (GIMP_SCALE_ENTRY_SPINBUTTON (adj),
GIMP_SCALE_ENTRY_SPINBUTTON_ADJ (adj), 0.01, 5);
@@ -1020,11 +1020,11 @@ create_orientation_page (void)
gtk_widget_show (grid);
adj = (GtkAdjustment *)
- gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 0,
- _("X:"), 0, 0,
- mapvals.alpha, -180.0, 180.0, 1.0, 15.0, 1,
- TRUE, 0, 0,
- _("Rotation angle about X axis"), NULL);
+ gimp_scale_entry_new (GTK_GRID (grid), 0, 0,
+ _("X:"), 0, 0,
+ mapvals.alpha, -180.0, 180.0, 1.0, 15.0, 1,
+ TRUE, 0, 0,
+ _("Rotation angle about X axis"), NULL);
gtk_size_group_add_widget (group, GIMP_SCALE_ENTRY_SPINBUTTON (adj));
g_signal_connect (adj, "value-changed",
@@ -1032,11 +1032,11 @@ create_orientation_page (void)
&mapvals.alpha);
adj = (GtkAdjustment *)
- gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 1,
- _("Y:"), 0, 0,
- mapvals.beta, -180.0, 180.0, 1.0, 15.0, 1,
- TRUE, 0, 0,
- _("Rotation angle about Y axis"), NULL);
+ gimp_scale_entry_new (GTK_GRID (grid), 0, 1,
+ _("Y:"), 0, 0,
+ mapvals.beta, -180.0, 180.0, 1.0, 15.0, 1,
+ TRUE, 0, 0,
+ _("Rotation angle about Y axis"), NULL);
gtk_size_group_add_widget (group, GIMP_SCALE_ENTRY_SPINBUTTON (adj));
g_signal_connect (adj, "value-changed",
@@ -1044,11 +1044,11 @@ create_orientation_page (void)
&mapvals.beta);
adj = (GtkAdjustment *)
- gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 2,
- _("Z:"), 0, 0,
- mapvals.gamma, -180.0, 180.0, 1.0, 15.0, 1,
- TRUE, 0, 0,
- _("Rotation angle about Z axis"), NULL);
+ gimp_scale_entry_new (GTK_GRID (grid), 0, 2,
+ _("Z:"), 0, 0,
+ mapvals.gamma, -180.0, 180.0, 1.0, 15.0, 1,
+ TRUE, 0, 0,
+ _("Rotation angle about Z axis"), NULL);
gtk_size_group_add_widget (group, GIMP_SCALE_ENTRY_SPINBUTTON (adj));
g_signal_connect (adj, "value-changed",
@@ -1120,11 +1120,11 @@ create_box_page (void)
gtk_widget_show (grid);
adj = (GtkAdjustment *)
- gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 0,
- _("Scale X:"), 0, 0,
- mapvals.scale.x, 0.0, 5.0, 0.01, 0.1, 2,
- TRUE, 0, 0,
- _("X scale (size)"), NULL);
+ gimp_scale_entry_new (GTK_GRID (grid), 0, 0,
+ _("Scale X:"), 0, 0,
+ mapvals.scale.x, 0.0, 5.0, 0.01, 0.1, 2,
+ TRUE, 0, 0,
+ _("X scale (size)"), NULL);
gtk_spin_button_configure (GIMP_SCALE_ENTRY_SPINBUTTON (adj),
GIMP_SCALE_ENTRY_SPINBUTTON_ADJ (adj), 0.1, 2);
@@ -1133,11 +1133,11 @@ create_box_page (void)
&mapvals.scale.x);
adj = (GtkAdjustment *)
- gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 1,
- _("Y:"), 0, 0,
- mapvals.scale.y, 0.0, 5.0, 0.01, 0.1, 2,
- TRUE, 0, 0,
- _("Y scale (size)"), NULL);
+ gimp_scale_entry_new (GTK_GRID (grid), 0, 1,
+ _("Y:"), 0, 0,
+ mapvals.scale.y, 0.0, 5.0, 0.01, 0.1, 2,
+ TRUE, 0, 0,
+ _("Y scale (size)"), NULL);
gtk_spin_button_configure (GIMP_SCALE_ENTRY_SPINBUTTON (adj),
GIMP_SCALE_ENTRY_SPINBUTTON_ADJ (adj), 0.1, 2);
@@ -1146,11 +1146,11 @@ create_box_page (void)
&mapvals.scale.y);
adj = (GtkAdjustment *)
- gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 2,
- _("Z:"), 0, 0,
- mapvals.scale.z, 0.0, 5.0, 0.01, 0.1, 2,
- TRUE, 0, 0,
- _("Z scale (size)"), NULL);
+ gimp_scale_entry_new (GTK_GRID (grid), 0, 2,
+ _("Z:"), 0, 0,
+ mapvals.scale.z, 0.0, 5.0, 0.01, 0.1, 2,
+ TRUE, 0, 0,
+ _("Z scale (size)"), NULL);
gtk_spin_button_configure (GIMP_SCALE_ENTRY_SPINBUTTON (adj),
GIMP_SCALE_ENTRY_SPINBUTTON_ADJ (adj), 0.1, 2);
@@ -1218,12 +1218,12 @@ create_cylinder_page (void)
gtk_widget_show (grid);
adj = (GtkAdjustment *)
- gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 0,
- _("R_adius:"), 0, 0,
- mapvals.cylinder_radius,
- 0.0, 2.0, 0.01, 0.1, 2,
- TRUE, 0, 0,
- _("Cylinder radius"), NULL);
+ gimp_scale_entry_new (GTK_GRID (grid), 0, 0,
+ _("R_adius:"), 0, 0,
+ mapvals.cylinder_radius,
+ 0.0, 2.0, 0.01, 0.1, 2,
+ TRUE, 0, 0,
+ _("Cylinder radius"), NULL);
gtk_size_group_add_widget (group, GIMP_SCALE_ENTRY_LABEL (adj));
gtk_spin_button_configure (GIMP_SCALE_ENTRY_SPINBUTTON (adj),
GIMP_SCALE_ENTRY_SPINBUTTON_ADJ (adj), 0.1, 2);
@@ -1233,12 +1233,12 @@ create_cylinder_page (void)
&mapvals.cylinder_radius);
adj = (GtkAdjustment *)
- gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 1,
- _("L_ength:"), 0, 0,
- mapvals.cylinder_length,
- 0.0, 2.0, 0.01, 0.1, 2,
- TRUE, 0, 0,
- _("Cylinder length"), NULL);
+ gimp_scale_entry_new (GTK_GRID (grid), 0, 1,
+ _("L_ength:"), 0, 0,
+ mapvals.cylinder_length,
+ 0.0, 2.0, 0.01, 0.1, 2,
+ TRUE, 0, 0,
+ _("Cylinder length"), NULL);
gtk_size_group_add_widget (group, GIMP_SCALE_ENTRY_LABEL (adj));
gtk_spin_button_configure (GIMP_SCALE_ENTRY_SPINBUTTON (adj),
GIMP_SCALE_ENTRY_SPINBUTTON_ADJ (adj), 0.1, 2);
diff --git a/plug-ins/pagecurl/pagecurl.c b/plug-ins/pagecurl/pagecurl.c
index 7680102..b33c5e4 100644
--- a/plug-ins/pagecurl/pagecurl.c
+++ b/plug-ins/pagecurl/pagecurl.c
@@ -601,12 +601,12 @@ dialog (void)
gtk_box_pack_start (GTK_BOX (vbox), grid, FALSE, FALSE, 0);
gtk_widget_show (grid);
- adjustment = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 0,
- _("_Opacity:"), 100, 0,
- curl.opacity * 100.0, 0.0, 100.0,
- 1.0, 1.0, 0.0,
- TRUE, 0, 0,
- NULL, NULL);
+ adjustment = gimp_scale_entry_new (GTK_GRID (grid), 0, 0,
+ _("_Opacity:"), 100, 0,
+ curl.opacity * 100.0, 0.0, 100.0,
+ 1.0, 1.0, 0.0,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adjustment, "value-changed",
G_CALLBACK (dialog_scale_update),
&curl.opacity);
diff --git a/plug-ins/script-fu/script-fu-interface.c b/plug-ins/script-fu/script-fu-interface.c
index 50088bb..f24fedb 100644
--- a/plug-ins/script-fu/script-fu-interface.c
+++ b/plug-ins/script-fu/script-fu-interface.c
@@ -411,17 +411,17 @@ script_fu_interface (SFScript *script,
{
case SF_SLIDER:
arg->value.sfa_adjustment.adj = (GtkAdjustment *)
- gimp_scale_entry_new_grid (GTK_GRID (sf_interface->grid),
- 0, row,
- label_text, SLIDER_WIDTH, -1,
- arg->value.sfa_adjustment.value,
- arg->default_value.sfa_adjustment.lower,
- arg->default_value.sfa_adjustment.upper,
- arg->default_value.sfa_adjustment.step,
- arg->default_value.sfa_adjustment.page,
- arg->default_value.sfa_adjustment.digits,
- TRUE, 0.0, 0.0,
- NULL, NULL);
+ gimp_scale_entry_new (GTK_GRID (sf_interface->grid),
+ 0, row,
+ label_text, SLIDER_WIDTH, -1,
+ arg->value.sfa_adjustment.value,
+ arg->default_value.sfa_adjustment.lower,
+ arg->default_value.sfa_adjustment.upper,
+ arg->default_value.sfa_adjustment.step,
+ arg->default_value.sfa_adjustment.page,
+ arg->default_value.sfa_adjustment.digits,
+ TRUE, 0.0, 0.0,
+ NULL, NULL);
gtk_entry_set_activates_default (GIMP_SCALE_ENTRY_SPINBUTTON (arg->value.sfa_adjustment.adj),
TRUE);
break;
diff --git a/plug-ins/selection-to-path/selection-to-path-dialog.c
b/plug-ins/selection-to-path/selection-to-path-dialog.c
index c3c380c..ee50fdf 100644
--- a/plug-ins/selection-to-path/selection-to-path-dialog.c
+++ b/plug-ins/selection-to-path/selection-to-path-dialog.c
@@ -94,55 +94,55 @@ dialog_create_selection_area (SELVALS *sels)
gtk_grid_set_column_spacing (GTK_GRID (grid), 6);
row = 0;
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, row++,
- _("Align Threshold:"), SCALE_WIDTH, SCALE_DIGITS,
- sels->align_threshold,
- 0.2, 2.0, 0.1, 0.1, 2,
- TRUE, 0, 0,
- _("If two endpoints are closer than this, "
- "they are made to be equal."), NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, row++,
+ _("Align Threshold:"), SCALE_WIDTH, SCALE_DIGITS,
+ sels->align_threshold,
+ 0.2, 2.0, 0.1, 0.1, 2,
+ TRUE, 0, 0,
+ _("If two endpoints are closer than this, "
+ "they are made to be equal."), NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&sels->align_threshold);
adjust_widgets = g_slist_append (adjust_widgets, adj);
g_object_set_data (G_OBJECT (adj), "default_value", def_val (0.5));
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, row++,
- _("Corner Always Threshold:"), SCALE_WIDTH, SCALE_DIGITS,
- sels->corner_always_threshold,
- 30, 180, 1, 1, 2,
- TRUE, 0, 0,
- _("If the angle defined by a point and its predecessors "
- "and successors is smaller than this, it's a corner, "
- "even if it's within `corner_surround' pixels of a "
- "point with a smaller angle."), NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, row++,
+ _("Corner Always Threshold:"), SCALE_WIDTH, SCALE_DIGITS,
+ sels->corner_always_threshold,
+ 30, 180, 1, 1, 2,
+ TRUE, 0, 0,
+ _("If the angle defined by a point and its predecessors "
+ "and successors is smaller than this, it's a corner, "
+ "even if it's within `corner_surround' pixels of a "
+ "point with a smaller angle."), NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&sels->corner_always_threshold);
adjust_widgets = g_slist_append (adjust_widgets, adj);
g_object_set_data (G_OBJECT (adj), "default_value", def_val (60.0));
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, row++,
- _("Corner Surround:"), SCALE_WIDTH, SCALE_DIGITS,
- sels->corner_surround,
- 3, 8, 1, 1, 0,
- TRUE, 0, 0,
- _("Number of points to consider when determining if a "
- "point is a corner or not."), NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, row++,
+ _("Corner Surround:"), SCALE_WIDTH, SCALE_DIGITS,
+ sels->corner_surround,
+ 3, 8, 1, 1, 0,
+ TRUE, 0, 0,
+ _("Number of points to consider when determining if a "
+ "point is a corner or not."), NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&sels->corner_surround);
adjust_widgets = g_slist_append (adjust_widgets, adj);
g_object_set_data (G_OBJECT (adj), "default_value", def_val (4.0));
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, row++,
- _("Corner Threshold:"), SCALE_WIDTH, SCALE_DIGITS,
- sels->corner_threshold,
- 0, 180, 1, 1, 2,
- TRUE, 0, 0,
- _("If a point, its predecessors, and its successors "
- "define an angle smaller than this, it's a corner."),
- NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, row++,
+ _("Corner Threshold:"), SCALE_WIDTH, SCALE_DIGITS,
+ sels->corner_threshold,
+ 0, 180, 1, 1, 2,
+ TRUE, 0, 0,
+ _("If a point, its predecessors, and its successors "
+ "define an angle smaller than this, it's a corner."),
+ NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&sels->corner_threshold);
@@ -150,28 +150,28 @@ dialog_create_selection_area (SELVALS *sels)
g_object_set_data (G_OBJECT (adj), "default_value", def_val (100.0));
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, row++,
- _("Error Threshold:"), SCALE_WIDTH, SCALE_DIGITS,
- sels->error_threshold,
- 0.2, 10, 0.1, 0.1, 2,
- TRUE, 0, 0,
- _("Amount of error at which a fitted spline is "
- "unacceptable. If any pixel is further away "
- "than this from the fitted curve, we try again."),
- NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, row++,
+ _("Error Threshold:"), SCALE_WIDTH, SCALE_DIGITS,
+ sels->error_threshold,
+ 0.2, 10, 0.1, 0.1, 2,
+ TRUE, 0, 0,
+ _("Amount of error at which a fitted spline is "
+ "unacceptable. If any pixel is further away "
+ "than this from the fitted curve, we try again."),
+ NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&sels->error_threshold);
adjust_widgets = g_slist_append (adjust_widgets, adj);
g_object_set_data (G_OBJECT (adj), "default_value", def_val (0.40));
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, row++,
- _("Filter Alternative Surround:"), SCALE_WIDTH, SCALE_DIGITS,
- sels->filter_alternative_surround,
- 1, 10, 1, 1, 0,
- TRUE, 0, 0,
- _("A second number of adjacent points to consider "
- "when filtering."), NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, row++,
+ _("Filter Alternative Surround:"), SCALE_WIDTH, SCALE_DIGITS,
+ sels->filter_alternative_surround,
+ 1, 10, 1, 1, 0,
+ TRUE, 0, 0,
+ _("A second number of adjacent points to consider "
+ "when filtering."), NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&sels->filter_alternative_surround);
@@ -179,71 +179,71 @@ dialog_create_selection_area (SELVALS *sels)
g_object_set_data (G_OBJECT (adj), "default_value", def_val (1.0));
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, row++,
- _("Filter Epsilon:"), SCALE_WIDTH, SCALE_DIGITS,
- sels->filter_epsilon,
- 5, 40, 1, 1, 2,
- TRUE, 0, 0,
- _("If the angles between the vectors produced by "
- "filter_surround and filter_alternative_surround "
- "points differ by more than this, use the one from "
- "filter_alternative_surround."), NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, row++,
+ _("Filter Epsilon:"), SCALE_WIDTH, SCALE_DIGITS,
+ sels->filter_epsilon,
+ 5, 40, 1, 1, 2,
+ TRUE, 0, 0,
+ _("If the angles between the vectors produced by "
+ "filter_surround and filter_alternative_surround "
+ "points differ by more than this, use the one from "
+ "filter_alternative_surround."), NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&sels->filter_epsilon);
adjust_widgets = g_slist_append (adjust_widgets, adj);
g_object_set_data (G_OBJECT (adj), "default_value", def_val (10.0));
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, row++,
- _("Filter Iteration Count:"), SCALE_WIDTH, SCALE_DIGITS,
- sels->filter_iteration_count,
- 4, 70, 1, 1, 0,
- TRUE, 0, 0,
- _("Number of times to smooth original data points. "
- "Increasing this number dramatically --- to 50 or "
- "so --- can produce vastly better results. But if "
- "any points that ``should'' be corners aren't found, "
- "the curve goes to hell around that point."), NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, row++,
+ _("Filter Iteration Count:"), SCALE_WIDTH, SCALE_DIGITS,
+ sels->filter_iteration_count,
+ 4, 70, 1, 1, 0,
+ TRUE, 0, 0,
+ _("Number of times to smooth original data points. "
+ "Increasing this number dramatically --- to 50 or "
+ "so --- can produce vastly better results. But if "
+ "any points that ``should'' be corners aren't found, "
+ "the curve goes to hell around that point."), NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&sels->filter_iteration_count);
adjust_widgets = g_slist_append (adjust_widgets, adj);
g_object_set_data (G_OBJECT (adj), "default_value", def_val (4.0));
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, row++,
- _("Filter Percent:"), SCALE_WIDTH, SCALE_DIGITS,
- sels->filter_percent,
- 0, 1, 0.05, 0.01, 2,
- TRUE, 0, 0,
- _("To produce the new point, use the old point plus "
- "this times the neighbors."), NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, row++,
+ _("Filter Percent:"), SCALE_WIDTH, SCALE_DIGITS,
+ sels->filter_percent,
+ 0, 1, 0.05, 0.01, 2,
+ TRUE, 0, 0,
+ _("To produce the new point, use the old point plus "
+ "this times the neighbors."), NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&sels->filter_percent);
adjust_widgets = g_slist_append (adjust_widgets, adj);
g_object_set_data (G_OBJECT (adj), "default_value", def_val (0.33));
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, row++,
- _("Filter Secondary Surround:"), SCALE_WIDTH, SCALE_DIGITS,
- sels->filter_secondary_surround,
- 3, 10, 1, 1, 0,
- TRUE, 0, 0,
- _("Number of adjacent points to consider if "
- "`filter_surround' points defines a straight line."),
- NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, row++,
+ _("Filter Secondary Surround:"), SCALE_WIDTH, SCALE_DIGITS,
+ sels->filter_secondary_surround,
+ 3, 10, 1, 1, 0,
+ TRUE, 0, 0,
+ _("Number of adjacent points to consider if "
+ "`filter_surround' points defines a straight line."),
+ NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&sels->filter_secondary_surround);
adjust_widgets = g_slist_append (adjust_widgets, adj);
g_object_set_data (G_OBJECT (adj), "default_value", def_val (3.0));
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, row++,
- _("Filter Surround:"), SCALE_WIDTH, SCALE_DIGITS,
- sels->filter_surround,
- 2, 10, 1, 1, 0,
- TRUE, 0, 0,
- _("Number of adjacent points to consider when filtering."),
- NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, row++,
+ _("Filter Surround:"), SCALE_WIDTH, SCALE_DIGITS,
+ sels->filter_surround,
+ 2, 10, 1, 1, 0,
+ TRUE, 0, 0,
+ _("Number of adjacent points to consider when filtering."),
+ NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&sels->filter_surround);
@@ -264,58 +264,58 @@ dialog_create_selection_area (SELVALS *sels)
g_object_set_data (G_OBJECT (check), "default_value", def_val ((gdouble)FALSE));
row++;
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, row++,
- _("Line Reversion Threshold:"), SCALE_WIDTH, SCALE_DIGITS,
- sels->line_reversion_threshold,
- 0.01, 0.2, 0.01, 0.01, 3,
- TRUE, 0, 0,
- _("If a spline is closer to a straight line than this, "
- "it remains a straight line, even if it would otherwise "
- "be changed back to a curve. This is weighted by the "
- "square of the curve length, to make shorter curves "
- "more likely to be reverted."), NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, row++,
+ _("Line Reversion Threshold:"), SCALE_WIDTH, SCALE_DIGITS,
+ sels->line_reversion_threshold,
+ 0.01, 0.2, 0.01, 0.01, 3,
+ TRUE, 0, 0,
+ _("If a spline is closer to a straight line than this, "
+ "it remains a straight line, even if it would otherwise "
+ "be changed back to a curve. This is weighted by the "
+ "square of the curve length, to make shorter curves "
+ "more likely to be reverted."), NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&sels->line_reversion_threshold);
adjust_widgets = g_slist_append (adjust_widgets, adj);
g_object_set_data (G_OBJECT (adj), "default_value", def_val (0.01));
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, row++,
- _("Line Threshold:"), SCALE_WIDTH, SCALE_DIGITS,
- sels->line_threshold,
- 0.2, 4, 0.1, 0.01, 2,
- TRUE, 0, 0,
- _("How many pixels (on the average) a spline can "
- "diverge from the line determined by its endpoints "
- "before it is changed to a straight line."), NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, row++,
+ _("Line Threshold:"), SCALE_WIDTH, SCALE_DIGITS,
+ sels->line_threshold,
+ 0.2, 4, 0.1, 0.01, 2,
+ TRUE, 0, 0,
+ _("How many pixels (on the average) a spline can "
+ "diverge from the line determined by its endpoints "
+ "before it is changed to a straight line."), NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&sels->line_threshold);
adjust_widgets = g_slist_append (adjust_widgets, adj);
g_object_set_data (G_OBJECT (adj), "default_value", def_val (0.5));
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, row++,
- _("Reparametrize Improvement:"), SCALE_WIDTH, SCALE_DIGITS,
- sels->reparameterize_improvement,
- 0, 1, 0.05, 0.01, 2,
- TRUE, 0, 0,
- _("If reparameterization doesn't improve the fit by this "
- "much percent, stop doing it. ""Amount of error at which "
- "it is pointless to reparameterize."), NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, row++,
+ _("Reparametrize Improvement:"), SCALE_WIDTH, SCALE_DIGITS,
+ sels->reparameterize_improvement,
+ 0, 1, 0.05, 0.01, 2,
+ TRUE, 0, 0,
+ _("If reparameterization doesn't improve the fit by this "
+ "much percent, stop doing it. ""Amount of error at which "
+ "it is pointless to reparameterize."), NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&sels->reparameterize_improvement);
adjust_widgets = g_slist_append (adjust_widgets, adj);
g_object_set_data (G_OBJECT (adj), "default_value", def_val (0.01));
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, row++,
- _("Reparametrize Threshold:"), SCALE_WIDTH, SCALE_DIGITS,
- sels->reparameterize_threshold,
- 1, 50, 0.5, 0.5, 2,
- TRUE, 0, 0,
- _("Amount of error at which it is pointless to reparameterize. "
- "This happens, for example, when we are trying to fit the "
- "outline of the outside of an `O' with a single spline. "
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, row++,
+ _("Reparametrize Threshold:"), SCALE_WIDTH, SCALE_DIGITS,
+ sels->reparameterize_threshold,
+ 1, 50, 0.5, 0.5, 2,
+ TRUE, 0, 0,
+ _("Amount of error at which it is pointless to reparameterize. "
+ "This happens, for example, when we are trying to fit the "
+ "outline of the outside of an `O' with a single spline. "
"The initial fit is not good enough for the Newton-Raphson "
"iteration to improve it. It may be that it would be better "
"to detect the cases where we didn't find any corners."), NULL);
@@ -325,55 +325,55 @@ dialog_create_selection_area (SELVALS *sels)
adjust_widgets = g_slist_append (adjust_widgets, adj);
g_object_set_data (G_OBJECT (adj), "default_value", def_val (1.0));
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, row++,
- _("Subdivide Search:"), SCALE_WIDTH, SCALE_DIGITS,
- sels->subdivide_search,
- 0.05, 1, 0.05, 0.01, 2,
- TRUE, 0, 0,
- _("Percentage of the curve away from the worst point "
- "to look for a better place to subdivide."), NULL);
- g_signal_connect (adj, "value-changed",
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, row++,
+ _("Subdivide Search:"), SCALE_WIDTH, SCALE_DIGITS,
+ sels->subdivide_search,
+ 0.05, 1, 0.05, 0.01, 2,
+ TRUE, 0, 0,
+ _("Percentage of the curve away from the worst point "
+ "to look for a better place to subdivide."), NULL);
+ g_signal_connect (adj, "vahanged",
G_CALLBACK (gimp_double_adjustment_update),
&sels->subdivide_search);
adjust_widgets = g_slist_append (adjust_widgets, adj);
g_object_set_data (G_OBJECT (adj), "default_value", def_val (0.1));
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, row++,
- _("Subdivide Surround:"), SCALE_WIDTH, SCALE_DIGITS,
- sels->subdivide_surround,
- 2, 10, 1, 1, 0,
- TRUE, 0, 0,
- _("Number of points to consider when deciding whether "
- "a given point is a better place to subdivide."),
- NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, row++,
+ _("Subdivide Surround:"), SCALE_WIDTH, SCALE_DIGITS,
+ sels->subdivide_surround,
+ 2, 10, 1, 1, 0,
+ TRUE, 0, 0,
+ _("Number of points to consider when deciding whether "
+ "a given point is a better place to subdivide."),
+ NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&sels->subdivide_surround);
adjust_widgets = g_slist_append (adjust_widgets, adj);
g_object_set_data (G_OBJECT (adj), "default_value", def_val (4.0));
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, row++,
- _("Subdivide Threshold:"), SCALE_WIDTH, SCALE_DIGITS,
- sels->subdivide_threshold,
- 0.01, 1, 0.01, 0.01, 2,
- TRUE, 0, 0,
- _("How many pixels a point can diverge from a straight "
- "line and still be considered a better place to "
- "subdivide."), NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, row++,
+ _("Subdivide Threshold:"), SCALE_WIDTH, SCALE_DIGITS,
+ sels->subdivide_threshold,
+ 0.01, 1, 0.01, 0.01, 2,
+ TRUE, 0, 0,
+ _("How many pixels a point can diverge from a straight "
+ "line and still be considered a better place to "
+ "subdivide."), NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&sels->subdivide_threshold);
adjust_widgets = g_slist_append (adjust_widgets, adj);
g_object_set_data (G_OBJECT (adj), "default_value", def_val (0.03));
- adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, row++,
- _("Tangent Surround:"), SCALE_WIDTH, SCALE_DIGITS,
- sels->tangent_surround,
- 2, 10, 1, 1, 0,
- TRUE, 0, 0,
- _("Number of points to look at on either side of a "
- "point when computing the approximation to the "
- "tangent at that point."), NULL);
+ adj = gimp_scale_entry_new (GTK_GRID (grid), 0, row++,
+ _("Tangent Surround:"), SCALE_WIDTH, SCALE_DIGITS,
+ sels->tangent_surround,
+ 2, 10, 1, 1, 0,
+ TRUE, 0, 0,
+ _("Number of points to look at on either side of a "
+ "point when computing the approximation to the "
+ "tangent at that point."), NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&sels->tangent_surround);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
