Commit 7d64cf62 authored by Simon Budig's avatar Simon Budig Committed by Michael Natterer

libgimpwidgets: rename the _grid()-Variants of gimp_scale_entry_*

Adjust all plugins to follow accordingly.

This concludes the GtkTable'ocide.
parent f01a9786
......@@ -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,
......
......@@ -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,
......
......@@ -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);
......
......@@ -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,
......
......@@ -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,
......
......@@ -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),
......
......@@ -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);
......
......@@ -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);
......
......@@ -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),
......
......@@ -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, &param->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, &param->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, &param->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, &param->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, &param->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, &param->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, &param->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, &param->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, &param->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, &param->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, &param->mutation_dist);
......
......@@ -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);
......
......@@ -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),
......
......@@ -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));
......
......@@ -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,