diff --git a/app/dialogs/palette-import-dialog.c b/app/dialogs/palette-import-dialog.c index 896378a2da..135bfcf32e 100644 --- a/app/dialogs/palette-import-dialog.c +++ b/app/dialogs/palette-import-dialog.c @@ -312,8 +312,8 @@ palette_import_dialog_new (GimpContext *context) private->entry, 2); /* The # of colors */ - private->num_colors = gimp_scale_entry_new2 (_("N_umber of colors:"), - 256, 2, 10000, 0); + private->num_colors = gimp_scale_entry_new (_("N_umber of colors:"), + 256, 2, 10000, 0); gimp_grid_attach_aligned (GTK_GRID (grid), -1, 1, NULL, 0.0, 0.5, private->num_colors, 3); @@ -325,7 +325,7 @@ palette_import_dialog_new (GimpContext *context) private); /* The columns */ - private->columns = gimp_scale_entry_new2 (_("C_olumns:"), 16, 0, 64, 0); + private->columns = gimp_scale_entry_new (_("C_olumns:"), 16, 0, 64, 0); gimp_grid_attach_aligned (GTK_GRID (grid), -1, 2, NULL, 0.0, 0.5, private->columns, 3); @@ -335,7 +335,7 @@ palette_import_dialog_new (GimpContext *context) private); /* The interval */ - private->threshold = gimp_scale_entry_new2 (_("I_nterval:"), 1, 1, 128, 0); + private->threshold = gimp_scale_entry_new (_("I_nterval:"), 1, 1, 128, 0); gimp_grid_attach_aligned (GTK_GRID (grid), -1, 3, NULL, 0.0, 0.5, private->threshold, 3); diff --git a/libgimpwidgets/gimppropwidgets.c b/libgimpwidgets/gimppropwidgets.c index 79e3f3d98d..cb65eec2ec 100644 --- a/libgimpwidgets/gimppropwidgets.c +++ b/libgimpwidgets/gimppropwidgets.c @@ -1513,8 +1513,7 @@ gimp_prop_scale_entry_new (GObject *config, if (! label) label = g_param_spec_get_nick (param_spec); - widget = gimp_scale_entry_new2 (label, value, lower, upper, - digits); + widget = gimp_scale_entry_new (label, value, lower, upper, digits); if (limit_scale) { gimp_scale_entry_set_range (GIMP_SCALE_ENTRY (widget), diff --git a/libgimpwidgets/gimpscaleentry.c b/libgimpwidgets/gimpscaleentry.c index e9af64e28f..5c337d12d1 100644 --- a/libgimpwidgets/gimpscaleentry.c +++ b/libgimpwidgets/gimpscaleentry.c @@ -552,7 +552,7 @@ gimp_scale_entry_log_to_linear (GBinding *binding, /* Public functions */ /** - * gimp_scale_entry_new2: + * gimp_scale_entry_new: * @text: The text for the #GtkLabel which will appear left of * the #GtkHScale. * @value: The initial value. @@ -566,7 +566,7 @@ gimp_scale_entry_log_to_linear (GBinding *binding, * Returns: (transfer full): The new #GimpScaleEntry. **/ GtkWidget * -gimp_scale_entry_new2 (const gchar *text, +gimp_scale_entry_new (const gchar *text, gdouble value, gdouble lower, gdouble upper, diff --git a/libgimpwidgets/gimpscaleentry.h b/libgimpwidgets/gimpscaleentry.h index 9e1e52bee7..c668bcd97b 100644 --- a/libgimpwidgets/gimpscaleentry.h +++ b/libgimpwidgets/gimpscaleentry.h @@ -54,7 +54,7 @@ struct _GimpScaleEntryClass void (* _gimp_reserved8) (void); }; -GtkWidget * gimp_scale_entry_new2 (const gchar *text, +GtkWidget * gimp_scale_entry_new (const gchar *text, gdouble value, gdouble lower, gdouble upper, diff --git a/libgimpwidgets/gimpwidgets.def b/libgimpwidgets/gimpwidgets.def index ef938d59f9..dbf52c8d73 100644 --- a/libgimpwidgets/gimpwidgets.def +++ b/libgimpwidgets/gimpwidgets.def @@ -370,7 +370,7 @@ EXPORTS gimp_scale_entry_get_spin_button gimp_scale_entry_get_type gimp_scale_entry_get_value - gimp_scale_entry_new2 + gimp_scale_entry_new gimp_scale_entry_set_increments gimp_scale_entry_set_logarithmic gimp_scale_entry_set_range diff --git a/modules/color-selector-cmyk.c b/modules/color-selector-cmyk.c index ddd391caff..c041313345 100644 --- a/modules/color-selector-cmyk.c +++ b/modules/color-selector-cmyk.c @@ -168,8 +168,8 @@ colorsel_cmyk_init (ColorselCmyk *module) for (i = 0; i < 4; i++) { - module->scales[i] = gimp_scale_entry_new2 (gettext (cmyk_labels[i]), - 0.0, 0.0, 100.0, 0); + module->scales[i] = gimp_scale_entry_new (gettext (cmyk_labels[i]), + 0.0, 0.0, 100.0, 0); gimp_help_set_help_data (module->scales[i], gettext (cmyk_tips[i]), NULL); g_signal_connect (module->scales[i], "value-changed", diff --git a/plug-ins/common/align-layers.c b/plug-ins/common/align-layers.c index 6391be66ba..c288bb2791 100644 --- a/plug-ins/common/align-layers.c +++ b/plug-ins/common/align-layers.c @@ -742,7 +742,7 @@ align_layers_dialog (void) _("Ver_tical base:"), 0.0, 0.5, combo, 2); - scale = gimp_scale_entry_new2 (_("_Grid size:"), VALS.grid_size, 1, 200, 0); + scale = gimp_scale_entry_new (_("_Grid size:"), VALS.grid_size, 1, 200, 0); g_signal_connect (scale, "value-changed", G_CALLBACK (align_layers_scale_entry_update_int), &VALS.grid_size); diff --git a/plug-ins/common/blinds.c b/plug-ins/common/blinds.c index a98ed502d0..5115b14080 100644 --- a/plug-ins/common/blinds.c +++ b/plug-ins/common/blinds.c @@ -355,7 +355,7 @@ blinds_dialog (GimpDrawable *drawable) gtk_box_pack_start (GTK_BOX (main_vbox), grid, FALSE, FALSE, 0); gtk_widget_show (grid); - scale = gimp_scale_entry_new2 (_("_Displacement:"), bvals.angledsp, 1, 90, 0); + scale = gimp_scale_entry_new (_("_Displacement:"), bvals.angledsp, 1, 90, 0); gimp_scale_entry_set_increments (GIMP_SCALE_ENTRY (scale), 1.0, 15.0); g_signal_connect (scale, "value-changed", G_CALLBACK (blinds_scale_entry_update_int), @@ -366,7 +366,7 @@ blinds_dialog (GimpDrawable *drawable) gtk_box_pack_start (GTK_BOX (main_vbox), scale, FALSE, FALSE, 2); gtk_widget_show (scale); - scale = gimp_scale_entry_new2 (_("_Number of segments:"), bvals.numsegs, 1, MAX_FANS, 0); + scale = gimp_scale_entry_new (_("_Number of segments:"), bvals.numsegs, 1, MAX_FANS, 0); g_signal_connect (scale, "value-changed", G_CALLBACK (blinds_scale_entry_update_int), &bvals.numsegs); diff --git a/plug-ins/common/cml-explorer.c b/plug-ins/common/cml-explorer.c index 563ab89524..39f60ddd92 100644 --- a/plug-ins/common/cml-explorer.c +++ b/plug-ins/common/cml-explorer.c @@ -1482,14 +1482,14 @@ CML_explorer_dialog (void) gtk_size_group_add_widget (group, label); g_object_unref (group); - scale = gimp_scale_entry_new2 (_("Zoom scale:"), VALS.scale, 1, 10, 0); + scale = gimp_scale_entry_new (_("Zoom scale:"), VALS.scale, 1, 10, 0); gtk_size_group_add_widget (group, gimp_scale_entry_get_label (GIMP_SCALE_ENTRY (scale))); CML_explorer_int_entry_init (&widget_pointers[3][1], scale, &VALS.scale); gtk_grid_attach (GTK_GRID (grid), scale, 0, 1, 3, 1); gtk_widget_show (scale); - scale = gimp_scale_entry_new2 (_("Start offset:"), VALS.start_offset, 0, 100, 0); + scale = gimp_scale_entry_new (_("Start offset:"), VALS.start_offset, 0, 100, 0); gtk_size_group_add_widget (group, gimp_scale_entry_get_label (GIMP_SCALE_ENTRY (scale))); CML_explorer_int_entry_init (&widget_pointers[3][2], scale, &VALS.start_offset); @@ -1507,7 +1507,7 @@ CML_explorer_dialog (void) gtk_container_add (GTK_CONTAINER (frame), grid); gtk_widget_show (grid); - scale = gimp_scale_entry_new2 (_("Seed:"), VALS.seed, 0, (guint32) -1, 0); + scale = gimp_scale_entry_new (_("Seed:"), VALS.seed, 0, (guint32) -1, 0); gtk_size_group_add_widget (group, gimp_scale_entry_get_label (GIMP_SCALE_ENTRY (scale))); CML_explorer_int_entry_init (&widget_pointers[3][3], scale, &VALS.seed); @@ -1743,35 +1743,35 @@ CML_dialog_channel_panel_new (CML_PARAM *param, gtk_widget_show (toggle); index++; - scale = gimp_scale_entry_new2 (_("Mod. rate:"), param->mod_rate, 0.0, 1.0, 2); + scale = gimp_scale_entry_new (_("Mod. rate:"), param->mod_rate, 0.0, 1.0, 2); CML_explorer_double_entry_init (&widget_pointers[channel_id][index], scale, ¶m->mod_rate); gtk_grid_attach (GTK_GRID (grid), scale, 0, index, 3, 1); gtk_widget_show (scale); index++; - scale = gimp_scale_entry_new2 (_("Env. sensitivity:"), param->env_sensitivity, 0.0, 1.0, 2); + scale = gimp_scale_entry_new (_("Env. sensitivity:"), param->env_sensitivity, 0.0, 1.0, 2); CML_explorer_double_entry_init (&widget_pointers[channel_id][index], scale, ¶m->env_sensitivity); gtk_grid_attach (GTK_GRID (grid), scale, 0, index, 3, 1); gtk_widget_show (scale); index++; - scale = gimp_scale_entry_new2 (_("Diffusion dist.:"), param->diffusion_dist, 2, 10, 0); + scale = gimp_scale_entry_new (_("Diffusion dist.:"), param->diffusion_dist, 2, 10, 0); CML_explorer_int_entry_init (&widget_pointers[channel_id][index], scale, ¶m->diffusion_dist); gtk_grid_attach (GTK_GRID (grid), scale, 0, index, 3, 1); gtk_widget_show (scale); index++; - scale = gimp_scale_entry_new2 (_("# of subranges:"), param->range_num, 1, 10, 0); + scale = gimp_scale_entry_new (_("# of subranges:"), param->range_num, 1, 10, 0); CML_explorer_int_entry_init (&widget_pointers[channel_id][index], scale, ¶m->range_num); gtk_grid_attach (GTK_GRID (grid), scale, 0, index, 3, 1); gtk_widget_show (scale); index++; - scale = gimp_scale_entry_new2 (_("P(ower factor):"), param->power, 0.0, 10.0, 2); + scale = gimp_scale_entry_new (_("P(ower factor):"), param->power, 0.0, 10.0, 2); gimp_scale_entry_set_increments (GIMP_SCALE_ENTRY (scale), 0.1, 1.0); CML_explorer_double_entry_init (&widget_pointers[channel_id][index], scale, ¶m->power); @@ -1779,7 +1779,7 @@ CML_dialog_channel_panel_new (CML_PARAM *param, gtk_widget_show (scale); index++; - scale = gimp_scale_entry_new2 (_("Parameter k:"), param->parameter_k, 0.0, 10.0, 2); + scale = gimp_scale_entry_new (_("Parameter k:"), param->parameter_k, 0.0, 10.0, 2); gimp_scale_entry_set_increments (GIMP_SCALE_ENTRY (scale), 0.1, 1.0); CML_explorer_double_entry_init (&widget_pointers[channel_id][index], scale, ¶m->parameter_k); @@ -1787,14 +1787,14 @@ CML_dialog_channel_panel_new (CML_PARAM *param, gtk_widget_show (scale); index++; - scale = gimp_scale_entry_new2 (_("Range low:"), param->range_l, 0.0, 1.0, 2); + scale = gimp_scale_entry_new (_("Range low:"), param->range_l, 0.0, 1.0, 2); CML_explorer_double_entry_init (&widget_pointers[channel_id][index], scale, ¶m->range_l); gtk_grid_attach (GTK_GRID (grid), scale, 0, index, 3, 1); gtk_widget_show (scale); index++; - scale = gimp_scale_entry_new2 (_("Range high:"), param->range_h, 0.0, 1.0, 2); + scale = gimp_scale_entry_new (_("Range high:"), param->range_h, 0.0, 1.0, 2); CML_explorer_double_entry_init (&widget_pointers[channel_id][index], scale, ¶m->range_h); gtk_grid_attach (GTK_GRID (grid), scale, 0, index, 3, 1); @@ -1847,7 +1847,7 @@ CML_dialog_advanced_panel_new (void) index = 0; - scale = gimp_scale_entry_new2 (_("Ch. sensitivity:"), param->ch_sensitivity, 0.0, 1.0, 2); + scale = gimp_scale_entry_new (_("Ch. sensitivity:"), param->ch_sensitivity, 0.0, 1.0, 2); CML_explorer_double_entry_init (&widget_pointers[channel_id][index + widget_offset], scale, ¶m->ch_sensitivity); @@ -1855,7 +1855,7 @@ CML_dialog_advanced_panel_new (void) gtk_widget_show (scale); index++; - scale = gimp_scale_entry_new2 (_("Mutation rate:"), param->mutation_rate, 0.0, 1.0, 2); + scale = gimp_scale_entry_new (_("Mutation rate:"), param->mutation_rate, 0.0, 1.0, 2); CML_explorer_double_entry_init (&widget_pointers[channel_id][index + widget_offset], scale, ¶m->mutation_rate); @@ -1863,7 +1863,7 @@ CML_dialog_advanced_panel_new (void) gtk_widget_show (scale); index++; - scale = gimp_scale_entry_new2 (_("Mutation dist.:"), param->mutation_dist, 0.0, 1.0, 2); + scale = gimp_scale_entry_new (_("Mutation dist.:"), param->mutation_dist, 0.0, 1.0, 2); CML_explorer_double_entry_init (&widget_pointers[channel_id][index + widget_offset], scale, ¶m->mutation_dist); diff --git a/plug-ins/common/contrast-retinex.c b/plug-ins/common/contrast-retinex.c index e395816fea..6c9820a5e8 100644 --- a/plug-ins/common/contrast-retinex.c +++ b/plug-ins/common/contrast-retinex.c @@ -374,7 +374,7 @@ retinex_dialog (GimpDrawable *drawable) combo, 2); gtk_widget_show (combo); - scale = gimp_scale_entry_new2 (_("_Scale:"), rvals.scale, MIN_GAUSSIAN_SCALE, MAX_GAUSSIAN_SCALE, 0); + scale = gimp_scale_entry_new (_("_Scale:"), rvals.scale, MIN_GAUSSIAN_SCALE, MAX_GAUSSIAN_SCALE, 0); g_signal_connect (scale, "value-changed", G_CALLBACK (contrast_retinex_scale_entry_update_int), @@ -385,7 +385,7 @@ retinex_dialog (GimpDrawable *drawable) gtk_grid_attach (GTK_GRID (grid), scale, 0, 1, 3, 1); gtk_widget_show (scale); - scale = gimp_scale_entry_new2 (_("Scale _division:"), rvals.nscales, 0, MAX_RETINEX_SCALES, 0); + scale = gimp_scale_entry_new (_("Scale _division:"), rvals.nscales, 0, MAX_RETINEX_SCALES, 0); g_signal_connect (scale, "value-changed", G_CALLBACK (contrast_retinex_scale_entry_update_int), @@ -396,7 +396,7 @@ retinex_dialog (GimpDrawable *drawable) gtk_grid_attach (GTK_GRID (grid), scale, 0, 2, 3, 1); gtk_widget_show (scale); - scale = gimp_scale_entry_new2 (_("Dy_namic:"), rvals.cvar, 0, 4, 1); + scale = gimp_scale_entry_new (_("Dy_namic:"), rvals.cvar, 0, 4, 1); g_signal_connect (scale, "value-changed", G_CALLBACK (contrast_retinex_scale_entry_update_float), diff --git a/plug-ins/common/depth-merge.c b/plug-ins/common/depth-merge.c index b2b2a3430d..ac66af7545 100644 --- a/plug-ins/common/depth-merge.c +++ b/plug-ins/common/depth-merge.c @@ -810,7 +810,7 @@ DepthMerge_dialog (DepthMerge *dm) gtk_widget_show (combo); /* Numeric parameters */ - scale = gimp_scale_entry_new2 (_("O_verlap:"), dm->params.overlap, 0, 2, 3); + scale = gimp_scale_entry_new (_("O_verlap:"), dm->params.overlap, 0, 2, 3); gimp_scale_entry_set_increments (GIMP_SCALE_ENTRY (scale), 0.001, 0.01); g_signal_connect (scale, "value-changed", G_CALLBACK (dialogValueScaleUpdateCallback), @@ -819,7 +819,7 @@ DepthMerge_dialog (DepthMerge *dm) gtk_grid_attach (GTK_GRID (grid), scale, 0, 4, 3, 1); gtk_widget_show (scale); - scale = gimp_scale_entry_new2 (_("O_ffset:"), dm->params.offset, -1, 1, 3); + scale = gimp_scale_entry_new (_("O_ffset:"), dm->params.offset, -1, 1, 3); gimp_scale_entry_set_increments (GIMP_SCALE_ENTRY (scale), 0.001, 0.01); g_signal_connect (scale, "value-changed", G_CALLBACK (dialogValueScaleUpdateCallback), @@ -828,7 +828,7 @@ DepthMerge_dialog (DepthMerge *dm) gtk_grid_attach (GTK_GRID (grid), scale, 0, 5, 3, 1); gtk_widget_show (scale); - scale = gimp_scale_entry_new2 (_("Sc_ale 1:"), dm->params.scale1, -1, 1, 3); + scale = gimp_scale_entry_new (_("Sc_ale 1:"), dm->params.scale1, -1, 1, 3); gimp_scale_entry_set_increments (GIMP_SCALE_ENTRY (scale), 0.001, 0.01); g_signal_connect (scale, "value-changed", G_CALLBACK (dialogValueScaleUpdateCallback), @@ -837,7 +837,7 @@ DepthMerge_dialog (DepthMerge *dm) gtk_grid_attach (GTK_GRID (grid), scale, 0, 6, 3, 1); gtk_widget_show (scale); - scale = gimp_scale_entry_new2 (_("Sca_le 2:"), dm->params.scale2, -1, 1, 3); + scale = gimp_scale_entry_new (_("Sca_le 2:"), dm->params.scale2, -1, 1, 3); gimp_scale_entry_set_increments (GIMP_SCALE_ENTRY (scale), 0.001, 0.01); g_signal_connect (scale, "value-changed", G_CALLBACK (dialogValueScaleUpdateCallback), diff --git a/plug-ins/common/destripe.c b/plug-ins/common/destripe.c index f002571cba..11a97fb8c9 100644 --- a/plug-ins/common/destripe.c +++ b/plug-ins/common/destripe.c @@ -483,7 +483,7 @@ destripe_dialog (GimpDrawable *drawable) G_CALLBACK (destripe_preview), drawable); - scale = gimp_scale_entry_new2 (_("_Width:"), vals.avg_width, 2, MAX_AVG, 0); + scale = gimp_scale_entry_new (_("_Width:"), vals.avg_width, 2, MAX_AVG, 0); g_signal_connect (scale, "value-changed", G_CALLBACK (destripe_scale_entry_update_int), &vals.avg_width); diff --git a/plug-ins/common/file-raw-data.c b/plug-ins/common/file-raw-data.c index 54e374e272..d9c60b7446 100644 --- a/plug-ins/common/file-raw-data.c +++ b/plug-ins/common/file-raw-data.c @@ -1910,7 +1910,7 @@ load_dialog (GFile *file, G_CALLBACK (preview_update), preview); - scale = gimp_scale_entry_new2 (_("O_ffset:"), runtime->file_offset, 0, file_size, 0); + scale = gimp_scale_entry_new (_("O_ffset:"), runtime->file_offset, 0, file_size, 0); gimp_scale_entry_set_increments (GIMP_SCALE_ENTRY (scale), 1, 1000); g_signal_connect (scale, "value-changed", @@ -1924,7 +1924,7 @@ load_dialog (GFile *file, if (! is_hgt) { - scale = gimp_scale_entry_new2 (_("_Width:"), runtime->image_width, 1, file_size, 0); + scale = gimp_scale_entry_new (_("_Width:"), runtime->image_width, 1, file_size, 0); g_signal_connect (scale, "value-changed", G_CALLBACK (file_raw_scale_entry_update_int), @@ -1938,7 +1938,7 @@ load_dialog (GFile *file, gtk_grid_attach (GTK_GRID (grid), scale, 0, 2, 3, 1); gtk_widget_show (scale); - scale = gimp_scale_entry_new2 (_("_Height:"), runtime->image_height, 1, file_size, 0); + scale = gimp_scale_entry_new (_("_Height:"), runtime->image_height, 1, file_size, 0); g_signal_connect (scale, "value-changed", G_CALLBACK (file_raw_scale_entry_update_int), @@ -1980,7 +1980,7 @@ load_dialog (GFile *file, G_CALLBACK (palette_update), preview); - scale = gimp_scale_entry_new2 (_("Off_set:"), runtime->palette_offset, 0, 1 << 24, 0); + scale = gimp_scale_entry_new (_("Off_set:"), runtime->palette_offset, 0, 1 << 24, 0); gimp_scale_entry_set_increments (GIMP_SCALE_ENTRY (scale), 1, 768); g_signal_connect (scale, "value-changed", diff --git a/plug-ins/common/film.c b/plug-ins/common/film.c index f9be1167a3..6eb5458145 100644 --- a/plug-ins/common/film.c +++ b/plug-ins/common/film.c @@ -1210,7 +1210,7 @@ create_advanced_tab (GtkWidget *notebook) row = 0; filmint.scales[0] = scale = - gimp_scale_entry_new2 (_("Image _height:"), filmvals.picture_height, 0.0, 1.0, 3); + gimp_scale_entry_new (_("Image _height:"), filmvals.picture_height, 0.0, 1.0, 3); gimp_scale_entry_set_increments (GIMP_SCALE_ENTRY (scale), 0.001, 0.01); g_signal_connect (scale, "value-changed", G_CALLBACK (film_scale_entry_update_double), @@ -1219,7 +1219,7 @@ create_advanced_tab (GtkWidget *notebook) gtk_widget_show (scale); filmint.scales[1] = scale = - gimp_scale_entry_new2 (_("Image spac_ing:"), filmvals.picture_space, 0.0, 1.0, 3); + gimp_scale_entry_new (_("Image spac_ing:"), filmvals.picture_space, 0.0, 1.0, 3); gimp_scale_entry_set_increments (GIMP_SCALE_ENTRY (scale), 0.001, 0.01); g_signal_connect (scale, "value-changed", G_CALLBACK (film_scale_entry_update_double), @@ -1231,7 +1231,7 @@ create_advanced_tab (GtkWidget *notebook) gtk_widget_show (scale); filmint.scales[2] = scale = - gimp_scale_entry_new2 (_("_Hole offset:"), filmvals.hole_offset, 0.0, 1.0, 3); + gimp_scale_entry_new (_("_Hole offset:"), filmvals.hole_offset, 0.0, 1.0, 3); gimp_scale_entry_set_increments (GIMP_SCALE_ENTRY (scale), 0.001, 0.01); g_signal_connect (scale, "value-changed", G_CALLBACK (film_scale_entry_update_double), @@ -1240,7 +1240,7 @@ create_advanced_tab (GtkWidget *notebook) gtk_widget_show (scale); filmint.scales[3] = scale = - gimp_scale_entry_new2 (_("Ho_le width:"), filmvals.hole_width, 0.0, 1.0, 3); + gimp_scale_entry_new (_("Ho_le width:"), filmvals.hole_width, 0.0, 1.0, 3); gimp_scale_entry_set_increments (GIMP_SCALE_ENTRY (scale), 0.001, 0.01); g_signal_connect (scale, "value-changed", G_CALLBACK (film_scale_entry_update_double), @@ -1249,7 +1249,7 @@ create_advanced_tab (GtkWidget *notebook) gtk_widget_show (scale); filmint.scales[4] = scale = - gimp_scale_entry_new2 (_("Hol_e height:"), filmvals.hole_height, 0.0, 1.0, 3); + gimp_scale_entry_new (_("Hol_e height:"), filmvals.hole_height, 0.0, 1.0, 3); gimp_scale_entry_set_increments (GIMP_SCALE_ENTRY (scale), 0.001, 0.01); g_signal_connect (scale, "value-changed", G_CALLBACK (film_scale_entry_update_double), @@ -1258,7 +1258,7 @@ create_advanced_tab (GtkWidget *notebook) gtk_widget_show (scale); filmint.scales[5] = scale = - gimp_scale_entry_new2 (_("Hole sp_acing:"), filmvals.hole_space, 0.0, 1.0, 3); + gimp_scale_entry_new (_("Hole sp_acing:"), filmvals.hole_space, 0.0, 1.0, 3); gimp_scale_entry_set_increments (GIMP_SCALE_ENTRY (scale), 0.001, 0.01); g_signal_connect (scale, "value-changed", G_CALLBACK (film_scale_entry_update_double), @@ -1270,7 +1270,7 @@ create_advanced_tab (GtkWidget *notebook) gtk_widget_show (scale); filmint.scales[6] = scale = - gimp_scale_entry_new2 (_("_Number height:"), filmvals.number_height, 0.0, 1.0, 3); + gimp_scale_entry_new (_("_Number height:"), filmvals.number_height, 0.0, 1.0, 3); gimp_scale_entry_set_increments (GIMP_SCALE_ENTRY (scale), 0.001, 0.01); g_signal_connect (scale, "value-changed", G_CALLBACK (film_scale_entry_update_double), diff --git a/plug-ins/common/jigsaw.c b/plug-ins/common/jigsaw.c index e3e239d7cb..3d19a9f3db 100644 --- a/plug-ins/common/jigsaw.c +++ b/plug-ins/common/jigsaw.c @@ -2508,7 +2508,7 @@ jigsaw_dialog (GimpDrawable *drawable) group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); /* xtiles */ - scale = gimp_scale_entry_new2 (_("_Horizontal:"), config.x, MIN_XTILES, MAX_XTILES, 0); + scale = gimp_scale_entry_new (_("_Horizontal:"), config.x, MIN_XTILES, MAX_XTILES, 0); gimp_help_set_help_data (scale, _("Number of pieces going across"), NULL); gtk_grid_attach (GTK_GRID (grid), scale, 0, 0, 3, 1); gtk_widget_show (scale); @@ -2524,7 +2524,7 @@ jigsaw_dialog (GimpDrawable *drawable) preview); /* ytiles */ - scale = gimp_scale_entry_new2 (_("_Vertical:"), config.y, MIN_YTILES, MAX_YTILES, 0); + scale = gimp_scale_entry_new (_("_Vertical:"), config.y, MIN_YTILES, MAX_YTILES, 0); gimp_help_set_help_data (scale, _("Number of pieces going down"), NULL); gtk_grid_attach (GTK_GRID (grid), scale, 0, 1, 3, 1); gtk_widget_show (scale); @@ -2550,7 +2550,7 @@ jigsaw_dialog (GimpDrawable *drawable) gtk_container_add (GTK_CONTAINER (frame), grid); /* number of blending lines */ - scale = gimp_scale_entry_new2 (_("_Bevel width:"), config.blend_lines, MIN_BLEND_LINES, MAX_BLEND_LINES, 0); + scale = gimp_scale_entry_new (_("_Bevel width:"), config.blend_lines, MIN_BLEND_LINES, MAX_BLEND_LINES, 0); gimp_help_set_help_data (scale, _("Degree of slope of each piece's edge"), NULL); gtk_grid_attach (GTK_GRID (grid), scale, 0, 0, 3, 1); gtk_widget_show (scale); @@ -2565,7 +2565,7 @@ jigsaw_dialog (GimpDrawable *drawable) preview); /* blending amount */ - scale = gimp_scale_entry_new2 (_("H_ighlight:"), config.blend_amount, MIN_BLEND_AMOUNT, MAX_BLEND_AMOUNT, 2); + scale = gimp_scale_entry_new (_("H_ighlight:"), config.blend_amount, MIN_BLEND_AMOUNT, MAX_BLEND_AMOUNT, 2); gimp_help_set_help_data (scale, _("The amount of highlighting on the edges of each piece"), NULL); gtk_grid_attach (GTK_GRID (grid), scale, 0, 1, 3, 1); gtk_widget_show (scale); diff --git a/plug-ins/common/nl-filter.c b/plug-ins/common/nl-filter.c index a4c04842bd..3b9252d000 100644 --- a/plug-ins/common/nl-filter.c +++ b/plug-ins/common/nl-filter.c @@ -1157,7 +1157,7 @@ nlfilter_dialog (GimpDrawable *drawable) gtk_box_pack_start (GTK_BOX (main_vbox), grid, FALSE, FALSE, 0); gtk_widget_show (grid); - scale = gimp_scale_entry_new2 (_("A_lpha:"), nlfvals.alpha, 0.0, 1.0, 2); + scale = gimp_scale_entry_new (_("A_lpha:"), nlfvals.alpha, 0.0, 1.0, 2); g_signal_connect (scale, "value-changed", G_CALLBACK (nlfilter_scale_entry_update_double), &nlfvals.alpha); @@ -1167,7 +1167,7 @@ nlfilter_dialog (GimpDrawable *drawable) gtk_grid_attach (GTK_GRID (grid), scale, 0, 0, 3, 1); gtk_widget_show (scale); - scale = gimp_scale_entry_new2 (_("_Radius:"), nlfvals.radius, 1.0 / 3.0, 1.0, 2); + scale = gimp_scale_entry_new (_("_Radius:"), nlfvals.radius, 1.0 / 3.0, 1.0, 2); g_signal_connect (scale, "value-changed", G_CALLBACK (nlfilter_scale_entry_update_double), &nlfvals.radius); diff --git a/plug-ins/common/sparkle.c b/plug-ins/common/sparkle.c index 1f4cc012c7..083311d414 100644 --- a/plug-ins/common/sparkle.c +++ b/plug-ins/common/sparkle.c @@ -431,7 +431,7 @@ sparkle_dialog (GimpDrawable *drawable) gtk_box_pack_start (GTK_BOX (main_vbox), grid, FALSE, FALSE, 0); gtk_widget_show (grid); - scale = gimp_scale_entry_new2 (_("Luminosity _threshold:"), svals.lum_threshold, 0.0, 0.1, 3); + scale = gimp_scale_entry_new (_("Luminosity _threshold:"), svals.lum_threshold, 0.0, 0.1, 3); gimp_help_set_help_data (scale, _("Adjust the luminosity threshold"), NULL); g_signal_connect (scale, "value-changed", G_CALLBACK (sparkle_scale_entry_update_double), @@ -442,7 +442,7 @@ sparkle_dialog (GimpDrawable *drawable) gtk_grid_attach (GTK_GRID (grid), scale, 0, 0, 3, 1); gtk_widget_show (scale); - scale = gimp_scale_entry_new2 (_("F_lare intensity:"), svals.flare_inten, 0.0, 1.0, 2); + scale = gimp_scale_entry_new (_("F_lare intensity:"), svals.flare_inten, 0.0, 1.0, 2); gimp_help_set_help_data (scale, _("Adjust the flare intensity"), NULL); g_signal_connect (scale, "value-changed", G_CALLBACK (sparkle_scale_entry_update_double), @@ -453,7 +453,7 @@ sparkle_dialog (GimpDrawable *drawable) gtk_grid_attach (GTK_GRID (grid), scale, 0, 1, 3, 1); gtk_widget_show (scale); - scale = gimp_scale_entry_new2 (_("_Spike length:"), svals.spike_len, 1, 100, 0); + scale = gimp_scale_entry_new (_("_Spike length:"), svals.spike_len, 1, 100, 0); gimp_help_set_help_data (scale, _("Adjust the spike length"), NULL); g_signal_connect (scale, "value-changed", G_CALLBACK (sparkle_scale_entry_update_double), @@ -464,7 +464,7 @@ sparkle_dialog (GimpDrawable *drawable) gtk_grid_attach (GTK_GRID (grid), scale, 0, 2, 3, 1); gtk_widget_show (scale); - scale = gimp_scale_entry_new2 (_("Sp_ike points:"), svals.spike_pts, 0, 16, 0); + scale = gimp_scale_entry_new (_("Sp_ike points:"), svals.spike_pts, 0, 16, 0); gimp_help_set_help_data (scale, _("Adjust the number of spikes"), NULL); g_signal_connect (scale, "value-changed", G_CALLBACK (sparkle_scale_entry_update_double), @@ -475,7 +475,7 @@ sparkle_dialog (GimpDrawable *drawable) gtk_grid_attach (GTK_GRID (grid), scale, 0, 3, 3, 1); gtk_widget_show (scale); - scale = gimp_scale_entry_new2 (_("Spi_ke angle (-1: random):"), svals.spike_angle, -1, 360, 0); + scale = gimp_scale_entry_new (_("Spi_ke angle (-1: random):"), svals.spike_angle, -1, 360, 0); gimp_help_set_help_data (scale, _("Adjust the spike angle " "(-1 causes a random angle to be chosen)"), NULL); gimp_scale_entry_set_increments (GIMP_SCALE_ENTRY (scale), 1.0, 15.0); @@ -488,7 +488,7 @@ sparkle_dialog (GimpDrawable *drawable) gtk_grid_attach (GTK_GRID (grid), scale, 0, 4, 3, 1); gtk_widget_show (scale); - scale = gimp_scale_entry_new2 (_("Spik_e density:"), svals.density, 0.0, 1.0, 2); + scale = gimp_scale_entry_new (_("Spik_e density:"), svals.density, 0.0, 1.0, 2); gimp_help_set_help_data (scale, _("Adjust the spike density"), NULL); g_signal_connect (scale, "value-changed", G_CALLBACK (sparkle_scale_entry_update_double), @@ -499,7 +499,7 @@ sparkle_dialog (GimpDrawable *drawable) gtk_grid_attach (GTK_GRID (grid), scale, 0, 5, 3, 1); gtk_widget_show (scale); - scale = gimp_scale_entry_new2 (_("Tr_ansparency:"), svals.transparency, 0.0, 1.0, 2); + scale = gimp_scale_entry_new (_("Tr_ansparency:"), svals.transparency, 0.0, 1.0, 2); gimp_help_set_help_data (scale, _("Adjust the opacity of the spikes"), NULL); g_signal_connect (scale, "value-changed", G_CALLBACK (sparkle_scale_entry_update_double), @@ -510,7 +510,7 @@ sparkle_dialog (GimpDrawable *drawable) gtk_grid_attach (GTK_GRID (grid), scale, 0, 6, 3, 1); gtk_widget_show (scale); - scale = gimp_scale_entry_new2 (_("_Random hue:"), svals.random_hue, 0.0, 1.0, 2); + scale = gimp_scale_entry_new (_("_Random hue:"), svals.random_hue, 0.0, 1.0, 2); gimp_help_set_help_data (scale, _("Adjust how much the hue should be changed randomly"), NULL); g_signal_connect (scale, "value-changed", G_CALLBACK (sparkle_scale_entry_update_double), @@ -521,7 +521,7 @@ sparkle_dialog (GimpDrawable *drawable) gtk_grid_attach (GTK_GRID (grid), scale, 0, 7, 3, 1); gtk_widget_show (scale); - scale = gimp_scale_entry_new2 (_("Rando_m saturation:"), svals.random_saturation, 0.0, 1.0, 2); + scale = gimp_scale_entry_new (_("Rando_m saturation:"), svals.random_saturation, 0.0, 1.0, 2); gimp_help_set_help_data (scale, _("Adjust how much the saturation should be changed randomly"), NULL); g_signal_connect (scale, "value-changed", G_CALLBACK (sparkle_scale_entry_update_double), diff --git a/plug-ins/common/sphere-designer.c b/plug-ins/common/sphere-designer.c index 80ca00bcb9..a2b715b267 100644 --- a/plug-ins/common/sphere-designer.c +++ b/plug-ins/common/sphere-designer.c @@ -2825,7 +2825,7 @@ makewindow (void) G_CALLBACK (color2_changed), NULL); - scalescale = gimp_scale_entry_new2 (_("Scale:"), 1.0, 0.0, 10.0, 1); + scalescale = gimp_scale_entry_new (_("Scale:"), 1.0, 0.0, 10.0, 1); gimp_scale_entry_set_increments (GIMP_SCALE_ENTRY (scalescale), 0.1, 1.0); g_signal_connect (scalescale, "value-changed", G_CALLBACK (getscales), @@ -2833,7 +2833,7 @@ makewindow (void) gtk_grid_attach (GTK_GRID (grid), scalescale, 0, 3, 3, 1); gtk_widget_show (scalescale); - turbulencescale = gimp_scale_entry_new2 (_("Turbulence:"), 1.0, 0.0, 10.0, 1); + turbulencescale = gimp_scale_entry_new (_("Turbulence:"), 1.0, 0.0, 10.0, 1); gimp_scale_entry_set_increments (GIMP_SCALE_ENTRY (turbulencescale), 0.1, 1.0); g_signal_connect (turbulencescale, "value-changed", G_CALLBACK (getscales), @@ -2841,14 +2841,14 @@ makewindow (void) gtk_grid_attach (GTK_GRID (grid), turbulencescale, 0, 4, 3, 1); gtk_widget_show (turbulencescale); - amountscale = gimp_scale_entry_new2 (_("Amount:"), 1.0, 0.0, 1.0, 2); + amountscale = gimp_scale_entry_new (_("Amount:"), 1.0, 0.0, 1.0, 2); g_signal_connect (amountscale, "value-changed", G_CALLBACK (getscales), NULL); gtk_grid_attach (GTK_GRID (grid), amountscale, 0, 5, 3, 1); gtk_widget_show (amountscale); - expscale = gimp_scale_entry_new2 (_("Exp.:"), 1.0, 0.0, 1.0, 2); + expscale = gimp_scale_entry_new (_("Exp.:"), 1.0, 0.0, 1.0, 2); g_signal_connect (expscale, "value-changed", G_CALLBACK (getscales), NULL); @@ -2869,7 +2869,7 @@ makewindow (void) gtk_box_pack_start (GTK_BOX (vbox), grid, FALSE, FALSE, 0); gtk_widget_show (grid); - scalexscale = gimp_scale_entry_new2 (_("Scale X:"), 1.0, 0.0, 10.0, 2); + scalexscale = gimp_scale_entry_new (_("Scale X:"), 1.0, 0.0, 10.0, 2); gimp_scale_entry_set_increments (GIMP_SCALE_ENTRY (scalexscale), 0.1, 1.0); g_signal_connect (scalexscale, "value-changed", G_CALLBACK (getscales), @@ -2877,7 +2877,7 @@ makewindow (void) gtk_grid_attach (GTK_GRID (grid), scalexscale, 0, 0, 3, 1); gtk_widget_show (scalexscale); - scaleyscale = gimp_scale_entry_new2 (_("Scale Y:"), 1.0, 0.0, 10.0, 2); + scaleyscale = gimp_scale_entry_new (_("Scale Y:"), 1.0, 0.0, 10.0, 2); gimp_scale_entry_set_increments (GIMP_SCALE_ENTRY (scaleyscale), 0.1, 1.0); g_signal_connect (scaleyscale, "value-changed", G_CALLBACK (getscales), @@ -2885,7 +2885,7 @@ makewindow (void) gtk_grid_attach (GTK_GRID (grid), scaleyscale, 0, 1, 3, 1); gtk_widget_show (scaleyscale); - scalezscale = gimp_scale_entry_new2 (_("Scale Z:"), 1.0, 0.0, 10.0, 2); + scalezscale = gimp_scale_entry_new (_("Scale Z:"), 1.0, 0.0, 10.0, 2); gimp_scale_entry_set_increments (GIMP_SCALE_ENTRY (scalezscale), 0.1, 1.0); gtk_widget_set_margin_bottom (gimp_scale_entry_get_label (GIMP_SCALE_ENTRY (scalezscale)), 6); gtk_widget_set_margin_bottom (gimp_scale_entry_get_range (GIMP_SCALE_ENTRY (scalezscale)), 6); @@ -2896,21 +2896,21 @@ makewindow (void) gtk_grid_attach (GTK_GRID (grid), scalezscale, 0, 2, 3, 1); gtk_widget_show (scalezscale); - rotxscale = gimp_scale_entry_new2 (_("Rotate X:"), 0.0, 0.0, 360.0, 1); + rotxscale = gimp_scale_entry_new (_("Rotate X:"), 0.0, 0.0, 360.0, 1); g_signal_connect (rotxscale, "value-changed", G_CALLBACK (getscales), NULL); gtk_grid_attach (GTK_GRID (grid), rotxscale, 0, 3, 3, 1); gtk_widget_show (rotxscale); - rotyscale = gimp_scale_entry_new2 (_("Rotate Y:"), 0.0, 0.0, 360.0, 1); + rotyscale = gimp_scale_entry_new (_("Rotate Y:"), 0.0, 0.0, 360.0, 1); g_signal_connect (rotyscale, "value-changed", G_CALLBACK (getscales), NULL); gtk_grid_attach (GTK_GRID (grid), rotyscale, 0, 4, 3, 1); gtk_widget_show (rotyscale); - rotzscale = gimp_scale_entry_new2 (_("Rotate Z:"), 0.0, 0.0, 360.0, 1); + rotzscale = gimp_scale_entry_new (_("Rotate Z:"), 0.0, 0.0, 360.0, 1); gtk_widget_set_margin_bottom (gimp_scale_entry_get_label (GIMP_SCALE_ENTRY (rotzscale)), 6); gtk_widget_set_margin_bottom (gimp_scale_entry_get_range (GIMP_SCALE_ENTRY (rotzscale)), 6); gtk_widget_set_margin_bottom (gimp_scale_entry_get_spin_button (GIMP_SCALE_ENTRY (rotzscale)), 6); @@ -2920,7 +2920,7 @@ makewindow (void) gtk_grid_attach (GTK_GRID (grid), rotzscale, 0, 5, 3, 1); gtk_widget_show (rotzscale); - posxscale = gimp_scale_entry_new2 (_("Position X:"), 0.0, -20.0, 20.0, 1); + posxscale = gimp_scale_entry_new (_("Position X:"), 0.0, -20.0, 20.0, 1); gimp_scale_entry_set_increments (GIMP_SCALE_ENTRY (posxscale), 0.1, 1.0); g_signal_connect (posxscale, "value-changed", G_CALLBACK (getscales), @@ -2928,7 +2928,7 @@ makewindow (void) gtk_grid_attach (GTK_GRID (grid), posxscale, 0, 6, 3, 1); gtk_widget_show (posxscale); - posyscale = gimp_scale_entry_new2 (_("Position Y:"), 0.0, -20.0, 20.0, 1); + posyscale = gimp_scale_entry_new (_("Position Y:"), 0.0, -20.0, 20.0, 1); gimp_scale_entry_set_increments (GIMP_SCALE_ENTRY (posyscale), 0.1, 1.0); g_signal_connect (posyscale, "value-changed", G_CALLBACK (getscales), @@ -2936,7 +2936,7 @@ makewindow (void) gtk_grid_attach (GTK_GRID (grid), posyscale, 0, 7, 3, 1); gtk_widget_show (posyscale); - poszscale = gimp_scale_entry_new2 (_("Position Z:"), 0.0, -20.0, 20.0, 1); + poszscale = gimp_scale_entry_new (_("Position Z:"), 0.0, -20.0, 20.0, 1); gimp_scale_entry_set_increments (GIMP_SCALE_ENTRY (poszscale), 0.1, 1.0); g_signal_connect (poszscale, "value-changed", G_CALLBACK (getscales), diff --git a/plug-ins/common/tile-small.c b/plug-ins/common/tile-small.c index 287f1cb397..df0dc44794 100644 --- a/plug-ins/common/tile-small.c +++ b/plug-ins/common/tile-small.c @@ -619,7 +619,7 @@ tileit_dialog (GimpDrawable *drawable) /* Widget for selecting the Opacity */ - scale = gimp_scale_entry_new2 (_("O_pacity:"), opacity, 0, 100, 0); + scale = gimp_scale_entry_new (_("O_pacity:"), opacity, 0, 100, 0); g_signal_connect (scale, "value-changed", G_CALLBACK (tileit_scale_update), &opacity); @@ -633,7 +633,7 @@ tileit_dialog (GimpDrawable *drawable) gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0); gtk_widget_show (frame); - scale = gimp_scale_entry_new2 ("_n²", itvals.numtiles, 2, MAX_SEGS, 0); + scale = gimp_scale_entry_new ("_n²", itvals.numtiles, 2, MAX_SEGS, 0); g_signal_connect (scale, "value-changed", G_CALLBACK (tileit_scale_update), &itvals.numtiles); diff --git a/plug-ins/common/van-gogh-lic.c b/plug-ins/common/van-gogh-lic.c index c483273b1a..ae2184f758 100644 --- a/plug-ins/common/van-gogh-lic.c +++ b/plug-ins/common/van-gogh-lic.c @@ -785,7 +785,7 @@ create_main_dialog (void) row = 0; - scale = gimp_scale_entry_new2 (_("_Filter length:"), licvals.filtlen, 0.1, 64, 1); + scale = gimp_scale_entry_new (_("_Filter length:"), licvals.filtlen, 0.1, 64, 1); gimp_scale_entry_set_increments (GIMP_SCALE_ENTRY (scale), 1.0, 8.0); g_signal_connect (scale, "value-changed", G_CALLBACK (lic_scale_entry_update), @@ -793,7 +793,7 @@ create_main_dialog (void) gtk_grid_attach (GTK_GRID (grid), scale, 0, row++, 3, 1); gtk_widget_show (scale); - scale = gimp_scale_entry_new2 (_("_Noise magnitude:"), licvals.noisemag, 1, 5, 1); + scale = gimp_scale_entry_new (_("_Noise magnitude:"), licvals.noisemag, 1, 5, 1); gimp_scale_entry_set_increments (GIMP_SCALE_ENTRY (scale), 0.1, 1.0); g_signal_connect (scale, "value-changed", G_CALLBACK (lic_scale_entry_update), @@ -801,21 +801,21 @@ create_main_dialog (void) gtk_grid_attach (GTK_GRID (grid), scale, 0, row++, 3, 1); gtk_widget_show (scale); - scale = gimp_scale_entry_new2 (_("In_tegration steps:"), licvals.intsteps, 1, 40, 1); + scale = gimp_scale_entry_new (_("In_tegration steps:"), licvals.intsteps, 1, 40, 1); g_signal_connect (scale, "value-changed", G_CALLBACK (lic_scale_entry_update), &licvals.intsteps); gtk_grid_attach (GTK_GRID (grid), scale, 0, row++, 3, 1); gtk_widget_show (scale); - scale = gimp_scale_entry_new2 (_("_Minimum value:"), licvals.minv, -100, 0, 1); + scale = gimp_scale_entry_new (_("_Minimum value:"), licvals.minv, -100, 0, 1); g_signal_connect (scale, "value-changed", G_CALLBACK (lic_scale_entry_update), &licvals.minv); gtk_grid_attach (GTK_GRID (grid), scale, 0, row++, 3, 1); gtk_widget_show (scale); - scale = gimp_scale_entry_new2 (_("M_aximum value:"), + scale = gimp_scale_entry_new (_("M_aximum value:"), licvals.maxv, 0, 100, 1); g_signal_connect (scale, "value-changed", G_CALLBACK (lic_scale_entry_update), diff --git a/plug-ins/common/wavelet-decompose.c b/plug-ins/common/wavelet-decompose.c index 88d5e6fd11..463d836e81 100644 --- a/plug-ins/common/wavelet-decompose.c +++ b/plug-ins/common/wavelet-decompose.c @@ -403,7 +403,7 @@ wavelet_decompose_dialog (void) /* scales */ - scale = gimp_scale_entry_new2 (_("Scales:"), wavelet_params.scales, 1.0, 7.0, 0); + scale = gimp_scale_entry_new (_("Scales:"), wavelet_params.scales, 1.0, 7.0, 0); gtk_box_pack_start (GTK_BOX (main_vbox), scale, FALSE, FALSE, 6); gtk_widget_show (scale); diff --git a/plug-ins/file-jpeg/jpeg-save.c b/plug-ins/file-jpeg/jpeg-save.c index 52c840055f..88db95a575 100644 --- a/plug-ins/file-jpeg/jpeg-save.c +++ b/plug-ins/file-jpeg/jpeg-save.c @@ -851,7 +851,7 @@ save_dialog (GimpDrawable *drawable) gtk_box_pack_start (GTK_BOX (vbox), vbox2, FALSE, FALSE, 0); gtk_widget_show (vbox2); - pg.quality = gimp_scale_entry_new2 (_("_Quality:"), jsvals.quality, 0.0, 100.0, 0); + pg.quality = gimp_scale_entry_new (_("_Quality:"), jsvals.quality, 0.0, 100.0, 0); gimp_help_set_help_data (pg.quality, _("JPEG quality parameter"), "file-jpeg-save-quality"); g_signal_connect (pg.quality, "value-changed", @@ -1050,7 +1050,7 @@ save_dialog (GimpDrawable *drawable) gtk_container_add (GTK_CONTAINER (frame), grid); gtk_widget_show (grid); - pg.smoothing = gimp_scale_entry_new2 (_("S_moothing:"), jsvals.smoothing, 0.0, 1.0, 2); + pg.smoothing = gimp_scale_entry_new (_("S_moothing:"), jsvals.smoothing, 0.0, 1.0, 2); gimp_help_set_help_data (pg.smoothing, NULL, "file-jpeg-save-smoothing"); g_signal_connect (pg.smoothing, "value-changed", G_CALLBACK (scale_entry_update), diff --git a/plug-ins/flame/flame.c b/plug-ins/flame/flame.c index df85a3b71e..80de79885f 100644 --- a/plug-ins/flame/flame.c +++ b/plug-ins/flame/flame.c @@ -753,7 +753,7 @@ edit_callback (GtkWidget *widget, gtk_container_add (GTK_CONTAINER (frame), vbox); gtk_widget_show (vbox); - scale = gimp_scale_entry_new2 (_("_Speed:"), pick_speed, 0.05, 0.5, 2); + scale = gimp_scale_entry_new (_("_Speed:"), pick_speed, 0.05, 0.5, 2); gimp_scale_entry_set_increments (GIMP_SCALE_ENTRY (scale), 0.01, 0.1); g_signal_connect (scale, "value-changed", @@ -1110,7 +1110,7 @@ flame_dialog (void) gtk_box_pack_start (GTK_BOX (box), grid, FALSE, FALSE, 0); gtk_widget_show (grid); - scale = gimp_scale_entry_new2 (_("_Brightness:"), config.cp.brightness, 0, 5, 2); + scale = gimp_scale_entry_new (_("_Brightness:"), config.cp.brightness, 0, 5, 2); gimp_scale_entry_set_increments (GIMP_SCALE_ENTRY (scale), 0.1, 1.0); g_signal_connect (scale, "value-changed", @@ -1122,7 +1122,7 @@ flame_dialog (void) gtk_grid_attach (GTK_GRID (grid), scale, 0, 0, 3, 1); gtk_widget_show (scale); - scale = gimp_scale_entry_new2 (_("Co_ntrast:"), config.cp.contrast, 0, 5, 2); + scale = gimp_scale_entry_new (_("Co_ntrast:"), config.cp.contrast, 0, 5, 2); gimp_scale_entry_set_increments (GIMP_SCALE_ENTRY (scale), 0.1, 1.0); g_signal_connect (scale, "value-changed", @@ -1134,7 +1134,7 @@ flame_dialog (void) gtk_grid_attach (GTK_GRID (grid), scale, 0, 1, 3, 1); gtk_widget_show (scale); - scale = gimp_scale_entry_new2 (_("_Gamma:"), config.cp.gamma, 1, 5, 2); + scale = gimp_scale_entry_new (_("_Gamma:"), config.cp.gamma, 1, 5, 2); gimp_scale_entry_set_increments (GIMP_SCALE_ENTRY (scale), 0.1, 1.0); gtk_widget_set_margin_bottom (gimp_scale_entry_get_label (GIMP_SCALE_ENTRY (scale)), 6); gtk_widget_set_margin_bottom (gimp_scale_entry_get_label (GIMP_SCALE_ENTRY (scale)), 6); @@ -1149,7 +1149,7 @@ flame_dialog (void) gtk_grid_attach (GTK_GRID (grid), scale, 0, 2, 3, 1); gtk_widget_show (scale); - scale = gimp_scale_entry_new2 (_("Sample _density:"), config.cp.sample_density, 0.1, 20, 2); + scale = gimp_scale_entry_new (_("Sample _density:"), config.cp.sample_density, 0.1, 20, 2); gimp_scale_entry_set_increments (GIMP_SCALE_ENTRY (scale), 0.1, 5.0); g_signal_connect (scale, "value-changed", @@ -1158,7 +1158,7 @@ flame_dialog (void) gtk_grid_attach (GTK_GRID (grid), scale, 0, 3, 3, 1); gtk_widget_show (scale); - scale = gimp_scale_entry_new2 (_("Spa_tial oversample:"), config.cp.spatial_oversample, 1, 4, 0); + scale = gimp_scale_entry_new (_("Spa_tial oversample:"), config.cp.spatial_oversample, 1, 4, 0); gimp_scale_entry_set_increments (GIMP_SCALE_ENTRY (scale), 0.01, 0.1); g_signal_connect (scale, "value-changed", @@ -1167,7 +1167,7 @@ flame_dialog (void) gtk_grid_attach (GTK_GRID (grid), scale, 0, 4, 3, 1); gtk_widget_show (scale); - scale = gimp_scale_entry_new2 (_("Spatial _filter radius:"), config.cp.spatial_filter_radius, 0, 4, 2); + scale = gimp_scale_entry_new (_("Spatial _filter radius:"), config.cp.spatial_filter_radius, 0, 4, 2); gimp_scale_entry_set_increments (GIMP_SCALE_ENTRY (scale), 0.2, 1.0); g_signal_connect (scale, "value-changed", @@ -1257,7 +1257,7 @@ flame_dialog (void) gtk_notebook_append_page (GTK_NOTEBOOK (notebook), grid, label); gtk_widget_show (grid); - scale = gimp_scale_entry_new2 (_("_Zoom:"), config.cp.zoom, -4, 4, 2); + scale = gimp_scale_entry_new (_("_Zoom:"), config.cp.zoom, -4, 4, 2); gimp_scale_entry_set_increments (GIMP_SCALE_ENTRY (scale), 0.5, 1.0); g_signal_connect (scale, "value-changed", @@ -1269,7 +1269,7 @@ flame_dialog (void) gtk_grid_attach (GTK_GRID (grid), scale, 0, 0, 3, 1); gtk_widget_show (scale); - scale = gimp_scale_entry_new2 (_("_X:"), config.cp.center[0], -2, 2, 2); + scale = gimp_scale_entry_new (_("_X:"), config.cp.center[0], -2, 2, 2); gimp_scale_entry_set_increments (GIMP_SCALE_ENTRY (scale), 0.5, 1.0); g_signal_connect (scale, "value-changed", @@ -1281,7 +1281,7 @@ flame_dialog (void) gtk_grid_attach (GTK_GRID (grid), scale, 0, 1, 3, 1); gtk_widget_show (scale); - scale = gimp_scale_entry_new2 (_("_Y:"), config.cp.center[1], -2, 2, 2); + scale = gimp_scale_entry_new (_("_Y:"), config.cp.center[1], -2, 2, 2); gimp_scale_entry_set_increments (GIMP_SCALE_ENTRY (scale), 0.5, 1.0); g_signal_connect (scale, "value-changed", diff --git a/plug-ins/fractal-explorer/fractal-explorer-dialogs.c b/plug-ins/fractal-explorer/fractal-explorer-dialogs.c index e92a48830c..290f586256 100644 --- a/plug-ins/fractal-explorer/fractal-explorer-dialogs.c +++ b/plug-ins/fractal-explorer/fractal-explorer-dialogs.c @@ -728,7 +728,7 @@ explorer_dialog (void) gtk_widget_show (vbox2); elements->xmin = - gimp_scale_entry_new2 (_("Left:"), wvals.xmin, -3, 3, 5); + gimp_scale_entry_new (_("Left:"), wvals.xmin, -3, 3, 5); gimp_scale_entry_set_increments (GIMP_SCALE_ENTRY (elements->xmin), 0.001, 0.01); g_signal_connect (elements->xmin, "value-changed", G_CALLBACK (explorer_double_adjustment_update), @@ -737,7 +737,7 @@ explorer_dialog (void) gtk_widget_show (elements->xmin); elements->xmax = - gimp_scale_entry_new2 (_("Right:"), wvals.xmax, -3, 3, 5); + gimp_scale_entry_new (_("Right:"), wvals.xmax, -3, 3, 5); gimp_scale_entry_set_increments (GIMP_SCALE_ENTRY (elements->xmax), 0.001, 0.01); g_signal_connect (elements->xmax, "value-changed", G_CALLBACK (explorer_double_adjustment_update), @@ -746,7 +746,7 @@ explorer_dialog (void) gtk_widget_show (elements->xmax); elements->ymin = - gimp_scale_entry_new2 (_("Top:"), wvals.ymin, -3, 3, 5); + gimp_scale_entry_new (_("Top:"), wvals.ymin, -3, 3, 5); gimp_scale_entry_set_increments (GIMP_SCALE_ENTRY (elements->ymin), 0.001, 0.01); g_signal_connect (elements->ymin, "value-changed", G_CALLBACK (explorer_double_adjustment_update), @@ -755,7 +755,7 @@ explorer_dialog (void) gtk_widget_show (elements->ymin); elements->ymax = - gimp_scale_entry_new2 (_("Bottom:"), wvals.ymax, -3, 3, 5); + gimp_scale_entry_new (_("Bottom:"), wvals.ymax, -3, 3, 5); gimp_scale_entry_set_increments (GIMP_SCALE_ENTRY (elements->ymax), 0.001, 0.01); g_signal_connect (elements->ymax, "value-changed", G_CALLBACK (explorer_double_adjustment_update), @@ -764,7 +764,7 @@ explorer_dialog (void) gtk_widget_show (elements->ymax); elements->iter = - gimp_scale_entry_new2 (_("Iterations:"), wvals.iter, 1, 1000, 0); + gimp_scale_entry_new (_("Iterations:"), wvals.iter, 1, 1000, 0); gimp_help_set_help_data (elements->iter, _("The higher the number of iterations, " "the more details will be calculated"), @@ -776,7 +776,7 @@ explorer_dialog (void) gtk_widget_show (elements->iter); elements->cx = - gimp_scale_entry_new2 (_("CX:"), wvals.cx, -2.5, 2.5, 5); + gimp_scale_entry_new (_("CX:"), wvals.cx, -2.5, 2.5, 5); gimp_scale_entry_set_increments (GIMP_SCALE_ENTRY (elements->cx), 0.001, 0.01); gimp_help_set_help_data (elements->cx, _("Changes aspect of fractal"), NULL); @@ -787,7 +787,7 @@ explorer_dialog (void) gtk_widget_show (elements->cx); elements->cy = - gimp_scale_entry_new2 (_("CY:"), wvals.cy, -2.5, 2.5, 5); + gimp_scale_entry_new (_("CY:"), wvals.cy, -2.5, 2.5, 5); gimp_scale_entry_set_increments (GIMP_SCALE_ENTRY (elements->cy), 0.001, 0.01); gimp_help_set_help_data (elements->cy, _("Changes aspect of fractal"), NULL); @@ -917,7 +917,7 @@ explorer_dialog (void) gtk_widget_show (grid); elements->ncol = - gimp_scale_entry_new2 (_("Number of colors:"), wvals.ncolors, 2, MAXNCOLORS, 0); + gimp_scale_entry_new (_("Number of colors:"), wvals.ncolors, 2, MAXNCOLORS, 0); gimp_help_set_help_data (elements->ncol, _("Change the number of colors in the mapping"), NULL); @@ -948,7 +948,7 @@ explorer_dialog (void) gtk_widget_show (grid); elements->red = - gimp_scale_entry_new2 (_("Red:"), wvals.redstretch, 0, 1, 2); + gimp_scale_entry_new (_("Red:"), wvals.redstretch, 0, 1, 2); gimp_help_set_help_data (elements->red, _("Change the intensity of the red channel"), NULL); g_signal_connect (elements->red, "value-changed", @@ -958,7 +958,7 @@ explorer_dialog (void) gtk_widget_show (elements->red); elements->green = - gimp_scale_entry_new2 (_("Green:"), wvals.greenstretch, 0, 1, 2); + gimp_scale_entry_new (_("Green:"), wvals.greenstretch, 0, 1, 2); gimp_help_set_help_data (elements->green, _("Change the intensity of the green channel"), NULL); g_signal_connect (elements->green, "value-changed", @@ -968,7 +968,7 @@ explorer_dialog (void) gtk_widget_show (elements->green); elements->blue = - gimp_scale_entry_new2 (_("Blue:"), wvals.bluestretch, 0, 1, 2); + gimp_scale_entry_new (_("Blue:"), wvals.bluestretch, 0, 1, 2); gimp_help_set_help_data (elements->blue, _("Change the intensity of the blue channel"), NULL); g_signal_connect (elements->blue, "value-changed", diff --git a/plug-ins/gfig/gfig-dialog.c b/plug-ins/gfig/gfig-dialog.c index 35dd22a8b4..4f965b709a 100644 --- a/plug-ins/gfig/gfig-dialog.c +++ b/plug-ins/gfig/gfig-dialog.c @@ -1314,7 +1314,7 @@ gfig_prefs_action_callback (GtkAction *widget, gtk_box_pack_start (GTK_BOX (main_vbox), grid, FALSE, FALSE, 6); gtk_widget_show (grid); - undo_scale = gimp_scale_entry_new2 (_("Max undo:"), selvals.maxundo, MIN_UNDO, MAX_UNDO, 0); + undo_scale = gimp_scale_entry_new (_("Max undo:"), selvals.maxundo, MIN_UNDO, MAX_UNDO, 0); g_signal_connect (undo_scale, "value-changed", G_CALLBACK (gfig_scale_entry_update_int), &selvals.maxundo); @@ -1422,9 +1422,9 @@ gfig_grid_action_callback (GtkAction *action, gtk_box_pack_start (GTK_BOX (main_vbox), grid, FALSE, FALSE, 0); gtk_widget_show (grid); - grid_scale = gimp_scale_entry_new2 (_("Grid spacing:"), - selvals.opts.gridspacing, - MIN_GRID, MAX_GRID, 0); + grid_scale = gimp_scale_entry_new (_("Grid spacing:"), + selvals.opts.gridspacing, + MIN_GRID, MAX_GRID, 0); g_signal_connect (grid_scale, "value-changed", G_CALLBACK (gfig_scale_entry_update_int), &selvals.opts.gridspacing); @@ -1438,9 +1438,9 @@ gfig_grid_action_callback (GtkAction *action, g_object_add_weak_pointer (G_OBJECT (gfig_opt_widget.gridspacing), (gpointer) &gfig_opt_widget.gridspacing); - sectors_scale = gimp_scale_entry_new2 (_("Polar grid sectors desired:"), - selvals.opts.grid_sectors_desired, - 5, 360, 0); + sectors_scale = gimp_scale_entry_new (_("Polar grid sectors desired:"), + selvals.opts.grid_sectors_desired, + 5, 360, 0); g_signal_connect (sectors_scale, "value-changed", G_CALLBACK (gfig_scale_entry_update_int), &selvals.opts.grid_sectors_desired); @@ -1455,9 +1455,9 @@ gfig_grid_action_callback (GtkAction *action, g_object_add_weak_pointer (G_OBJECT (gfig_opt_widget.grid_sectors_desired), (gpointer) &gfig_opt_widget.grid_sectors_desired); - radius_scale = gimp_scale_entry_new2 (_("Polar grid radius interval:"), - selvals.opts.grid_radius_interval, - 5, 50, 0); + radius_scale = gimp_scale_entry_new (_("Polar grid radius interval:"), + selvals.opts.grid_radius_interval, + 5, 50, 0); g_signal_connect (radius_scale, "value-changed", G_CALLBACK (gfig_scale_entry_update_double), &selvals.opts.grid_radius_interval); @@ -1723,7 +1723,7 @@ num_sides_widget (const gchar *d_title, gtk_container_set_border_width (GTK_CONTAINER (grid), 12); gtk_widget_show (grid); - scale = gimp_scale_entry_new2 (_("Sides:"), *num_sides, adj_min, adj_max, 0); + scale = gimp_scale_entry_new (_("Sides:"), *num_sides, adj_min, adj_max, 0); g_signal_connect (scale, "value-changed", G_CALLBACK (gfig_scale_entry_update_int), num_sides); diff --git a/plug-ins/gimpressionist/brush.c b/plug-ins/gimpressionist/brush.c index bc3325a5f2..eba567f2ac 100644 --- a/plug-ins/gimpressionist/brush.c +++ b/plug-ins/gimpressionist/brush.c @@ -610,7 +610,7 @@ create_brushpage (GtkNotebook *notebook) gtk_widget_show (grid); brush_aspect_scale = - gimp_scale_entry_new2 (_("Aspect ratio:"), pcvals.brush_aspect, -1.0, 1.0, 2); + gimp_scale_entry_new (_("Aspect ratio:"), pcvals.brush_aspect, -1.0, 1.0, 2); gimp_help_set_help_data (brush_aspect_scale, _("Specifies the aspect ratio of the brush"), NULL); @@ -623,7 +623,7 @@ create_brushpage (GtkNotebook *notebook) gtk_widget_show (brush_aspect_scale); brush_relief_scale = - gimp_scale_entry_new2 (_("Relief:"), pcvals.brush_relief, 0.0, 100.0, 1); + gimp_scale_entry_new (_("Relief:"), pcvals.brush_relief, 0.0, 100.0, 1); gimp_help_set_help_data (brush_relief_scale, _("Specifies the amount of embossing to apply to the image (in percent)"), NULL); diff --git a/plug-ins/gimpressionist/color.c b/plug-ins/gimpressionist/color.c index d489e9f1fa..b3fec30313 100644 --- a/plug-ins/gimpressionist/color.c +++ b/plug-ins/gimpressionist/color.c @@ -84,7 +84,7 @@ create_colorpage (GtkNotebook *notebook) gtk_widget_show (frame); colornoiseadjust = - gimp_scale_entry_new2 (_("Color _noise:"), pcvals.color_noise, 0.0, 100.0, 0); + gimp_scale_entry_new (_("Color _noise:"), pcvals.color_noise, 0.0, 100.0, 0); gimp_help_set_help_data (colornoiseadjust, _("Adds random noise to the color"), NULL); diff --git a/plug-ins/gimpressionist/general.c b/plug-ins/gimpressionist/general.c index f55cc3eb23..6ef3fdd85f 100644 --- a/plug-ins/gimpressionist/general.c +++ b/plug-ins/gimpressionist/general.c @@ -235,7 +235,7 @@ create_generalpage (GtkNotebook *notebook) gtk_widget_show (grid); general_dark_edge_scale = - gimp_scale_entry_new2 (_("Edge darken:"), pcvals.general_dark_edge, 0.0, 1.0, 2); + gimp_scale_entry_new (_("Edge darken:"), pcvals.general_dark_edge, 0.0, 1.0, 2); gimp_help_set_help_data (general_dark_edge_scale, _("How much to \"darken\" the edges of each brush stroke"), NULL); @@ -243,7 +243,7 @@ create_generalpage (GtkNotebook *notebook) gtk_widget_show (general_dark_edge_scale); general_shadow_scale = - gimp_scale_entry_new2 (_("Shadow darken:"), pcvals.general_shadow_darkness, 0.0, 99.0, 2); + gimp_scale_entry_new (_("Shadow darken:"), pcvals.general_shadow_darkness, 0.0, 99.0, 2); gimp_scale_entry_set_increments (GIMP_SCALE_ENTRY (general_shadow_scale), 0.1, 1.0); gimp_help_set_help_data (general_shadow_scale, _("How much to \"darken\" the drop shadow"), @@ -252,7 +252,7 @@ create_generalpage (GtkNotebook *notebook) gtk_widget_show (general_shadow_scale); general_shadow_depth = - gimp_scale_entry_new2 (_("Shadow depth:"), pcvals.general_shadow_depth, 0, 99, 0); + gimp_scale_entry_new (_("Shadow depth:"), pcvals.general_shadow_depth, 0, 99, 0); gimp_help_set_help_data (general_shadow_depth, _("The depth of the drop shadow, i.e. how far apart from the object it should be"), NULL); @@ -260,7 +260,7 @@ create_generalpage (GtkNotebook *notebook) gtk_widget_show (general_shadow_depth); general_shadow_blur = - gimp_scale_entry_new2 (_("Shadow blur:"), pcvals.general_shadow_blur, 0, 99, 0); + gimp_scale_entry_new (_("Shadow blur:"), pcvals.general_shadow_blur, 0, 99, 0); gimp_help_set_help_data (general_shadow_blur, _("How much to blur the drop shadow"), NULL); @@ -268,7 +268,7 @@ create_generalpage (GtkNotebook *notebook) gtk_widget_show (general_shadow_blur); dev_thresh_scale = - gimp_scale_entry_new2 (_("Deviation threshold:"), pcvals.devthresh, 0.0, 1.0, 2); + gimp_scale_entry_new (_("Deviation threshold:"), pcvals.devthresh, 0.0, 1.0, 2); gimp_help_set_help_data (dev_thresh_scale, _("A bailout-value for adaptive selections"), NULL); diff --git a/plug-ins/gimpressionist/orientation.c b/plug-ins/gimpressionist/orientation.c index 19eeb886de..885cffa388 100644 --- a/plug-ins/gimpressionist/orientation.c +++ b/plug-ins/gimpressionist/orientation.c @@ -97,7 +97,7 @@ create_orientationpage (GtkNotebook *notebook) gtk_widget_show (grid); orient_num_adjust = - gimp_scale_entry_new2 (_("Directions:"), pcvals.orient_num, 1.0, 30.0, 0); + gimp_scale_entry_new (_("Directions:"), pcvals.orient_num, 1.0, 30.0, 0); gimp_help_set_help_data (orient_num_adjust, _("The number of directions (i.e. brushes) to use"), NULL); @@ -108,7 +108,7 @@ create_orientationpage (GtkNotebook *notebook) gtk_widget_show (orient_num_adjust); orient_first_adjust = - gimp_scale_entry_new2 (_("Start angle:"), pcvals.orient_first, 0.0, 360.0, 0); + gimp_scale_entry_new (_("Start angle:"), pcvals.orient_first, 0.0, 360.0, 0); gimp_help_set_help_data (orient_first_adjust, _("The starting angle of the first brush to create"), NULL); @@ -119,7 +119,7 @@ create_orientationpage (GtkNotebook *notebook) gtk_widget_show (orient_first_adjust); orient_last_adjust = - gimp_scale_entry_new2 (_("Angle span:"), pcvals.orient_last, 0.0, 360.0, 0); + gimp_scale_entry_new (_("Angle span:"), pcvals.orient_last, 0.0, 360.0, 0); gimp_help_set_help_data (orient_last_adjust, _("The angle span of the first brush to create"), NULL); diff --git a/plug-ins/gimpressionist/orientmap.c b/plug-ins/gimpressionist/orientmap.c index 2e8b30d6e8..9f7dc00632 100644 --- a/plug-ins/gimpressionist/orientmap.c +++ b/plug-ins/gimpressionist/orientmap.c @@ -665,7 +665,7 @@ create_orientmap_dialog (GtkWidget *parent) gtk_widget_show (grid2); angle_adjust = - gimp_scale_entry_new2 (_("A_ngle:"), 0.0, 0.0, 360.0, 1); + gimp_scale_entry_new (_("A_ngle:"), 0.0, 0.0, 360.0, 1); gimp_help_set_help_data (angle_adjust, _("Change the angle of the selected vector"), NULL); @@ -675,7 +675,7 @@ create_orientmap_dialog (GtkWidget *parent) gtk_widget_show (angle_adjust); angle_offset_adjust = - gimp_scale_entry_new2 (_("Ang_le offset:"), 0.0, 0.0, 360.0, 1); + gimp_scale_entry_new (_("Ang_le offset:"), 0.0, 0.0, 360.0, 1); gimp_help_set_help_data (angle_offset_adjust, _("Offset all vectors with a given angle"), NULL); @@ -685,7 +685,7 @@ create_orientmap_dialog (GtkWidget *parent) gtk_widget_show (angle_offset_adjust); strength_adjust = - gimp_scale_entry_new2 (_("_Strength:"), 1.0, 0.1, 5.0, 1); + gimp_scale_entry_new (_("_Strength:"), 1.0, 0.1, 5.0, 1); gimp_scale_entry_set_increments (GIMP_SCALE_ENTRY (strength_adjust), 0.1, 1.0); gimp_help_set_help_data (strength_adjust, _("Change the strength of the selected vector"), @@ -696,7 +696,7 @@ create_orientmap_dialog (GtkWidget *parent) gtk_widget_show (strength_adjust); orient_map_str_exp_adjust = - gimp_scale_entry_new2 (_("S_trength exp.:"), 1.0, 0.1, 10.9, 1); + gimp_scale_entry_new (_("S_trength exp.:"), 1.0, 0.1, 10.9, 1); gimp_scale_entry_set_increments (GIMP_SCALE_ENTRY (orient_map_str_exp_adjust), 0.1, 1.0); gimp_help_set_help_data (orient_map_str_exp_adjust, _("Change the exponent of the strength"), diff --git a/plug-ins/gimpressionist/paper.c b/plug-ins/gimpressionist/paper.c index 4cf6fad143..79b7cd2b7e 100644 --- a/plug-ins/gimpressionist/paper.c +++ b/plug-ins/gimpressionist/paper.c @@ -188,7 +188,7 @@ create_paperpage (GtkNotebook *notebook) gtk_widget_show (grid); paper_scale_adjust = - gimp_scale_entry_new2 (_("Scale:"), pcvals.paper_scale, 3.0, 150.0, 1); + gimp_scale_entry_new (_("Scale:"), pcvals.paper_scale, 3.0, 150.0, 1); gimp_help_set_help_data (paper_scale_adjust, _("Specifies the scale of the texture (in percent of original file)"), NULL); @@ -199,7 +199,7 @@ create_paperpage (GtkNotebook *notebook) gtk_widget_show (paper_scale_adjust); paper_relief_adjust = - gimp_scale_entry_new2 (_("Relief:"), pcvals.paper_relief, 0.0, 100.0, 1); + gimp_scale_entry_new (_("Relief:"), pcvals.paper_relief, 0.0, 100.0, 1); gimp_help_set_help_data (paper_relief_adjust, _("Specifies the amount of embossing to apply to the image (in percent)"), NULL); diff --git a/plug-ins/gimpressionist/placement.c b/plug-ins/gimpressionist/placement.c index 6333f385dd..98de7de642 100644 --- a/plug-ins/gimpressionist/placement.c +++ b/plug-ins/gimpressionist/placement.c @@ -110,7 +110,7 @@ create_placementpage (GtkNotebook *notebook) pcvals.placement_center); brush_density_adjust = - gimp_scale_entry_new2 (_("Stroke _density:"), pcvals.brush_density, 1.0, 50.0, 0); + gimp_scale_entry_new (_("Stroke _density:"), pcvals.brush_density, 1.0, 50.0, 0); gimp_help_set_help_data (brush_density_adjust, _("The relative density of the brush strokes"), NULL); diff --git a/plug-ins/gimpressionist/size.c b/plug-ins/gimpressionist/size.c index dc6fae40d0..700b1993e3 100644 --- a/plug-ins/gimpressionist/size.c +++ b/plug-ins/gimpressionist/size.c @@ -104,7 +104,7 @@ create_sizepage (GtkNotebook *notebook) gtk_widget_show (grid); sizenumadjust = - gimp_scale_entry_new2 (_("Size variants:"), pcvals.size_num, 1.0, 30.0, 0); + gimp_scale_entry_new (_("Size variants:"), pcvals.size_num, 1.0, 30.0, 0); gimp_help_set_help_data (sizenumadjust, _("The number of sizes of brushes to use"), NULL); @@ -115,7 +115,7 @@ create_sizepage (GtkNotebook *notebook) gtk_widget_show (sizenumadjust); sizefirstadjust = - gimp_scale_entry_new2 (_("Minimum size:"), pcvals.size_first, 0.0, 360.0, 0); + gimp_scale_entry_new (_("Minimum size:"), pcvals.size_first, 0.0, 360.0, 0); gimp_help_set_help_data (sizefirstadjust, _("The smallest brush to create"), NULL); @@ -126,7 +126,7 @@ create_sizepage (GtkNotebook *notebook) gtk_widget_show (sizefirstadjust); sizelastadjust = - gimp_scale_entry_new2 (_("Maximum size:"), pcvals.size_last, 0.0, 360.0, 0); + gimp_scale_entry_new (_("Maximum size:"), pcvals.size_last, 0.0, 360.0, 0); gimp_help_set_help_data (sizelastadjust, _("The largest brush to create"), NULL); diff --git a/plug-ins/gimpressionist/sizemap.c b/plug-ins/gimpressionist/sizemap.c index 4a742092e9..dd6f8e9ad6 100644 --- a/plug-ins/gimpressionist/sizemap.c +++ b/plug-ins/gimpressionist/sizemap.c @@ -505,7 +505,7 @@ create_sizemap_dialog (GtkWidget *parent) gtk_widget_show (grid2); sizadjust = - gimp_scale_entry_new2 (_("_Size:"), 50.0, 0.0, 100.0, 1); + gimp_scale_entry_new (_("_Size:"), 50.0, 0.0, 100.0, 1); gimp_help_set_help_data (sizadjust, _("Change the angle of the selected smvector"), NULL); @@ -515,7 +515,7 @@ create_sizemap_dialog (GtkWidget *parent) gtk_widget_show (sizadjust); smstradjust = - gimp_scale_entry_new2 (_("S_trength:"), 1.0, 0.1, 5.0, 1); + gimp_scale_entry_new (_("S_trength:"), 1.0, 0.1, 5.0, 1); gimp_scale_entry_set_increments (GIMP_SCALE_ENTRY (smstradjust), 0.1, 0.5); gimp_help_set_help_data (smstradjust, _("Change the strength of the selected smvector"), @@ -526,7 +526,7 @@ create_sizemap_dialog (GtkWidget *parent) gtk_widget_show (smstradjust); smstrexpadjust = - gimp_scale_entry_new2 (_("St_rength exp.:"), 1.0, 0.1, 10.9, 1); + gimp_scale_entry_new (_("St_rength exp.:"), 1.0, 0.1, 10.9, 1); gimp_scale_entry_set_increments (GIMP_SCALE_ENTRY (smstradjust), 0.1, 0.5); gimp_help_set_help_data (smstrexpadjust, _("Change the exponent of the strength"), diff --git a/plug-ins/gradient-flare/gradient-flare.c b/plug-ins/gradient-flare/gradient-flare.c index ecfce0563d..0046d9e087 100644 --- a/plug-ins/gradient-flare/gradient-flare.c +++ b/plug-ins/gradient-flare/gradient-flare.c @@ -2898,7 +2898,7 @@ dlg_make_page_settings (GFlareDialog *dlg, row = 0; - scale = gimp_scale_entry_new2 (_("_Radius:"), pvals.radius, 0.0, GIMP_MAX_IMAGE_SIZE, 1); + scale = gimp_scale_entry_new (_("_Radius:"), pvals.radius, 0.0, GIMP_MAX_IMAGE_SIZE, 1); gimp_scale_entry_set_range (GIMP_SCALE_ENTRY (scale), 0.0, gimp_drawable_width (drawable) / 2, TRUE); g_signal_connect (scale, "value-changed", G_CALLBACK (gradient_scale_entry_update_double), @@ -2909,7 +2909,7 @@ dlg_make_page_settings (GFlareDialog *dlg, gtk_grid_attach (GTK_GRID (grid), scale, 0, row++, 3, 1); gtk_widget_show (scale); - scale = gimp_scale_entry_new2 (_("Ro_tation:"), pvals.rotation, -180.0, 180.0, 1); + scale = gimp_scale_entry_new (_("Ro_tation:"), pvals.rotation, -180.0, 180.0, 1); gimp_scale_entry_set_increments (GIMP_SCALE_ENTRY (scale), 1.0, 15.0); g_signal_connect (scale, "value-changed", G_CALLBACK (gradient_scale_entry_update_double), @@ -2920,7 +2920,7 @@ dlg_make_page_settings (GFlareDialog *dlg, gtk_grid_attach (GTK_GRID (grid), scale, 0, row++, 3, 1); gtk_widget_show (scale); - scale = gimp_scale_entry_new2 (_("_Hue rotation:"), pvals.hue, -180.0, 180.0, 1); + scale = gimp_scale_entry_new (_("_Hue rotation:"), pvals.hue, -180.0, 180.0, 1); gimp_scale_entry_set_increments (GIMP_SCALE_ENTRY (scale), 1.0, 15.0); g_signal_connect (scale, "value-changed", G_CALLBACK (gradient_scale_entry_update_double), @@ -2931,7 +2931,7 @@ dlg_make_page_settings (GFlareDialog *dlg, gtk_grid_attach (GTK_GRID (grid), scale, 0, row++, 3, 1); gtk_widget_show (scale); - scale = gimp_scale_entry_new2 (_("Vector _angle:"), pvals.vangle, 0.0, 359.0, 1); + scale = gimp_scale_entry_new (_("Vector _angle:"), pvals.vangle, 0.0, 359.0, 1); gimp_scale_entry_set_increments (GIMP_SCALE_ENTRY (scale), 1.0, 15.0); g_signal_connect (scale, "value-changed", G_CALLBACK (gradient_scale_entry_update_double), @@ -2942,7 +2942,7 @@ dlg_make_page_settings (GFlareDialog *dlg, gtk_grid_attach (GTK_GRID (grid), scale, 0, row++, 3, 1); gtk_widget_show (scale); - scale = gimp_scale_entry_new2 (_("Vector _length:"), pvals.vlength, 1, GIMP_MAX_IMAGE_SIZE, 1); + scale = gimp_scale_entry_new (_("Vector _length:"), pvals.vlength, 1, GIMP_MAX_IMAGE_SIZE, 1); gimp_scale_entry_set_range (GIMP_SCALE_ENTRY (scale), 1, 1000, TRUE); g_signal_connect (scale, "value-changed", G_CALLBACK (gradient_scale_entry_update_double), @@ -2983,14 +2983,14 @@ dlg_make_page_settings (GFlareDialog *dlg, asup_grid, "sensitive", G_BINDING_SYNC_CREATE); - scale = gimp_scale_entry_new2 (_("_Max depth:"), pvals.asupsample_max_depth, 1.0, 10.0, 0); + scale = gimp_scale_entry_new (_("_Max depth:"), pvals.asupsample_max_depth, 1.0, 10.0, 0); g_signal_connect (scale, "value-changed", G_CALLBACK (gradient_scale_entry_update_int), &pvals.asupsample_max_depth); gtk_grid_attach (GTK_GRID (asup_grid), scale, 0, 0, 3, 1); gtk_widget_show (scale); - scale = gimp_scale_entry_new2 (_("_Threshold"), pvals.asupsample_threshold, 0.0, 4.0, 2); + scale = gimp_scale_entry_new (_("_Threshold"), pvals.asupsample_threshold, 0.0, 4.0, 2); gimp_scale_entry_set_increments (GIMP_SCALE_ENTRY (scale), 0.01, 0.1); g_signal_connect (scale, "value-changed", G_CALLBACK (gradient_scale_entry_update_double), @@ -3586,7 +3586,7 @@ ed_make_page_general (GFlareEditor *ed, gtk_container_add (GTK_CONTAINER (frame), grid); gtk_widget_show (grid); - scale = gimp_scale_entry_new2 (_("Opacity:"), gflare->glow_opacity, 0.0, 100.0, 1); + scale = gimp_scale_entry_new (_("Opacity:"), gflare->glow_opacity, 0.0, 100.0, 1); g_signal_connect (scale, "value-changed", G_CALLBACK (gradient_scale_entry_update_double), &gflare->glow_opacity); @@ -3612,7 +3612,7 @@ ed_make_page_general (GFlareEditor *ed, gtk_container_add (GTK_CONTAINER (frame), grid); gtk_widget_show (grid); - scale = gimp_scale_entry_new2 (_("Opacity:"), gflare->rays_opacity, 0.0, 100.0, 1); + scale = gimp_scale_entry_new (_("Opacity:"), gflare->rays_opacity, 0.0, 100.0, 1); g_signal_connect (scale, "value-changed", G_CALLBACK (gradient_scale_entry_update_double), &gflare->rays_opacity); @@ -3638,7 +3638,7 @@ ed_make_page_general (GFlareEditor *ed, gtk_container_add (GTK_CONTAINER (frame), grid); gtk_widget_show (grid); - scale = gimp_scale_entry_new2 (_("Opacity:"), gflare->sflare_opacity, 0.0, 100.0, 1); + scale = gimp_scale_entry_new (_("Opacity:"), gflare->sflare_opacity, 0.0, 100.0, 1); g_signal_connect (scale, "value-changed", G_CALLBACK (gradient_scale_entry_update_double), &gflare->sflare_opacity); @@ -3717,7 +3717,7 @@ ed_make_page_glow (GFlareEditor *ed, row = 0; - scale = gimp_scale_entry_new2 (_("Size (%):"), gflare->glow_size, 0.0, G_MAXINT, 1); + scale = gimp_scale_entry_new (_("Size (%):"), gflare->glow_size, 0.0, G_MAXINT, 1); gimp_scale_entry_set_range (GIMP_SCALE_ENTRY (scale), 0.0, 200.0, TRUE); g_signal_connect (scale, "value-changed", G_CALLBACK (gradient_scale_entry_update_double), @@ -3728,7 +3728,7 @@ ed_make_page_glow (GFlareEditor *ed, gtk_grid_attach (GTK_GRID (grid), scale, 0, row++, 3, 1); gtk_widget_show (scale); - scale = gimp_scale_entry_new2 (_("Rotation:"), gflare->glow_rotation, -180.0, 180.0, 1); + scale = gimp_scale_entry_new (_("Rotation:"), gflare->glow_rotation, -180.0, 180.0, 1); gimp_scale_entry_set_increments (GIMP_SCALE_ENTRY (scale), 1.0, 15.0); g_signal_connect (scale, "value-changed", G_CALLBACK (gradient_scale_entry_update_double), @@ -3739,7 +3739,7 @@ ed_make_page_glow (GFlareEditor *ed, gtk_grid_attach (GTK_GRID (grid), scale, 0, row++, 3, 1); gtk_widget_show (scale); - scale = gimp_scale_entry_new2 (_("Hue rotation:"), gflare->glow_hue, -180.0, 180.0, 1); + scale = gimp_scale_entry_new (_("Hue rotation:"), gflare->glow_hue, -180.0, 180.0, 1); gimp_scale_entry_set_increments (GIMP_SCALE_ENTRY (scale), 1.0, 15.0); g_signal_connect (scale, "value-changed", G_CALLBACK (gradient_scale_entry_update_double), @@ -3819,7 +3819,7 @@ ed_make_page_rays (GFlareEditor *ed, row = 0; - scale = gimp_scale_entry_new2 (_("Size (%):"), gflare->rays_size, 0.0, G_MAXINT, 1); + scale = gimp_scale_entry_new (_("Size (%):"), gflare->rays_size, 0.0, G_MAXINT, 1); gimp_scale_entry_set_range (GIMP_SCALE_ENTRY (scale), 0.0, 200.0, TRUE); g_signal_connect (scale, "value-changed", G_CALLBACK (gradient_scale_entry_update_double), @@ -3830,7 +3830,7 @@ ed_make_page_rays (GFlareEditor *ed, gtk_grid_attach (GTK_GRID (grid), scale, 0, row++, 3, 1); gtk_widget_show (scale); - scale = gimp_scale_entry_new2 (_("Rotation:"), gflare->rays_rotation, -180.0, 180.0, 1); + scale = gimp_scale_entry_new (_("Rotation:"), gflare->rays_rotation, -180.0, 180.0, 1); gimp_scale_entry_set_increments (GIMP_SCALE_ENTRY (scale), 1.0, 15.0); g_signal_connect (scale, "value-changed", G_CALLBACK (gradient_scale_entry_update_double), @@ -3841,7 +3841,7 @@ ed_make_page_rays (GFlareEditor *ed, gtk_grid_attach (GTK_GRID (grid), scale, 0, row++, 3, 1); gtk_widget_show (scale); - scale = gimp_scale_entry_new2 (_("Hue rotation:"), gflare->rays_hue, -180.0, 180.0, 1); + scale = gimp_scale_entry_new (_("Hue rotation:"), gflare->rays_hue, -180.0, 180.0, 1); gimp_scale_entry_set_increments (GIMP_SCALE_ENTRY (scale), 1.0, 15.0); g_signal_connect (scale, "value-changed", G_CALLBACK (gradient_scale_entry_update_double), @@ -3852,7 +3852,7 @@ ed_make_page_rays (GFlareEditor *ed, gtk_grid_attach (GTK_GRID (grid), scale, 0, row++, 3, 1); gtk_widget_show (scale); - scale = gimp_scale_entry_new2 (_("# of Spikes:"), gflare->rays_nspikes, 1, G_MAXINT, 0); + scale = gimp_scale_entry_new (_("# of Spikes:"), gflare->rays_nspikes, 1, G_MAXINT, 0); gimp_scale_entry_set_range (GIMP_SCALE_ENTRY (scale), 1.0, 300.0, TRUE); g_signal_connect (scale, "value-changed", G_CALLBACK (gradient_scale_entry_update_int), @@ -3863,7 +3863,7 @@ ed_make_page_rays (GFlareEditor *ed, gtk_grid_attach (GTK_GRID (grid), scale, 0, row++, 3, 1); gtk_widget_show (scale); - scale = gimp_scale_entry_new2 (_("Spike thickness:"), gflare->rays_thickness, 1.0, GIMP_MAX_IMAGE_SIZE, 1); + scale = gimp_scale_entry_new (_("Spike thickness:"), gflare->rays_thickness, 1.0, GIMP_MAX_IMAGE_SIZE, 1); gimp_scale_entry_set_range (GIMP_SCALE_ENTRY (scale), 1.0, 100.0, TRUE); g_signal_connect (scale, "value-changed", G_CALLBACK (gradient_scale_entry_update_double), @@ -3950,7 +3950,7 @@ ed_make_page_sflare (GFlareEditor *ed, row = 0; - scale = gimp_scale_entry_new2 (_("Size (%):"), gflare->sflare_size, 0.0, G_MAXINT, 1); + scale = gimp_scale_entry_new (_("Size (%):"), gflare->sflare_size, 0.0, G_MAXINT, 1); gimp_scale_entry_set_range (GIMP_SCALE_ENTRY (scale), 1.0, 200.0, TRUE); g_signal_connect (scale, "value-changed", G_CALLBACK (gradient_scale_entry_update_double), @@ -3961,7 +3961,7 @@ ed_make_page_sflare (GFlareEditor *ed, gtk_grid_attach (GTK_GRID (grid), scale, 0, row++, 3, 1); gtk_widget_show (scale); - scale = gimp_scale_entry_new2 (_("Rotation:"), gflare->sflare_rotation, -180.0, 180.0, 1); + scale = gimp_scale_entry_new (_("Rotation:"), gflare->sflare_rotation, -180.0, 180.0, 1); gimp_scale_entry_set_increments (GIMP_SCALE_ENTRY (scale), 1.0, 15.0); g_signal_connect (scale, "value-changed", G_CALLBACK (gradient_scale_entry_update_double), @@ -3972,7 +3972,7 @@ ed_make_page_sflare (GFlareEditor *ed, gtk_grid_attach (GTK_GRID (grid), scale, 0, row++, 3, 1); gtk_widget_show (scale); - scale = gimp_scale_entry_new2 (_("Hue rotation:"), gflare->sflare_hue, -180.0, 180.0, 1); + scale = gimp_scale_entry_new (_("Hue rotation:"), gflare->sflare_hue, -180.0, 180.0, 1); gimp_scale_entry_set_increments (GIMP_SCALE_ENTRY (scale), 1.0, 15.0); g_signal_connect (scale, "value-changed", G_CALLBACK (gradient_scale_entry_update_double), diff --git a/plug-ins/lighting/lighting-ui.c b/plug-ins/lighting/lighting-ui.c index f4be962d74..be566d0077 100644 --- a/plug-ins/lighting/lighting-ui.c +++ b/plug-ins/lighting/lighting-ui.c @@ -353,7 +353,7 @@ create_options_page (void) gimp_help_set_help_data (toggle, _("Enable/disable high quality preview"), NULL); - scale = gimp_scale_entry_new2 (_("Distance:"), mapvals.viewpoint.z, 0.0, 2.0, 3); + scale = gimp_scale_entry_new (_("Distance:"), mapvals.viewpoint.z, 0.0, 2.0, 3); gimp_help_set_help_data (scale, "Distance of observer from surface", "plug-in-lighting"); diff --git a/plug-ins/map-object/map-object-ui.c b/plug-ins/map-object/map-object-ui.c index 7ecb101791..2b24438196 100644 --- a/plug-ins/map-object/map-object-ui.c +++ b/plug-ins/map-object/map-object-ui.c @@ -557,7 +557,7 @@ create_options_page (void) grid, "sensitive", G_BINDING_SYNC_CREATE); - scale = gimp_scale_entry_new2 (_("_Depth:"), mapvals.maxdepth, 1.0, 5.0, 1); + scale = gimp_scale_entry_new (_("_Depth:"), mapvals.maxdepth, 1.0, 5.0, 1); gimp_help_set_help_data (scale, _("Antialiasing quality. Higher is better, " "but slower"), NULL); g_signal_connect (scale, "value-changed", @@ -974,7 +974,7 @@ create_orientation_page (void) gtk_container_add (GTK_CONTAINER (frame), grid); gtk_widget_show (grid); - scale = gimp_scale_entry_new2 (_("X:"), mapvals.position.x, -1.0, 2.0, 5); + scale = gimp_scale_entry_new (_("X:"), mapvals.position.x, -1.0, 2.0, 5); gimp_help_set_help_data (scale, _("Object X position in XYZ space"), NULL); spinbutton = gimp_scale_entry_get_spin_button (GIMP_SCALE_ENTRY (scale)); gtk_size_group_add_widget (group, spinbutton); @@ -986,7 +986,7 @@ create_orientation_page (void) gtk_grid_attach (GTK_GRID (grid), scale, 0, 0, 3, 1); gtk_widget_show (scale); - scale = gimp_scale_entry_new2 (_("Y:"), mapvals.position.y, -1.0, 2.0, 5); + scale = gimp_scale_entry_new (_("Y:"), mapvals.position.y, -1.0, 2.0, 5); gimp_help_set_help_data (scale, _("Object Y position in XYZ space"), NULL); spinbutton = gimp_scale_entry_get_spin_button (GIMP_SCALE_ENTRY (scale)); gtk_size_group_add_widget (group, spinbutton); @@ -998,7 +998,7 @@ create_orientation_page (void) gtk_grid_attach (GTK_GRID (grid), scale, 0, 1, 3, 1); gtk_widget_show (scale); - scale = gimp_scale_entry_new2 (_("Z:"), mapvals.position.z, -1.0, 2.0, 5); + scale = gimp_scale_entry_new (_("Z:"), mapvals.position.z, -1.0, 2.0, 5); gimp_help_set_help_data (scale, _("Object Z position in XYZ space"), NULL); spinbutton = gimp_scale_entry_get_spin_button (GIMP_SCALE_ENTRY (scale)); gtk_size_group_add_widget (group, spinbutton); @@ -1020,7 +1020,7 @@ create_orientation_page (void) gtk_container_add (GTK_CONTAINER (frame), grid); gtk_widget_show (grid); - scale = gimp_scale_entry_new2 (_("X:"), mapvals.alpha, -180.0, 180.0, 1); + scale = gimp_scale_entry_new (_("X:"), mapvals.alpha, -180.0, 180.0, 1); gimp_scale_entry_set_increments (GIMP_SCALE_ENTRY (scale), 1.0, 15.0); gimp_help_set_help_data (scale, _("Rotation angle about X axis"), NULL); gtk_size_group_add_widget (group, gimp_scale_entry_get_spin_button (GIMP_SCALE_ENTRY (scale))); @@ -1031,7 +1031,7 @@ create_orientation_page (void) gtk_grid_attach (GTK_GRID (grid), scale, 0, 0, 3, 1); gtk_widget_show (scale); - scale = gimp_scale_entry_new2 (_("Y:"), mapvals.beta, -180.0, 180.0, 1); + scale = gimp_scale_entry_new (_("Y:"), mapvals.beta, -180.0, 180.0, 1); gimp_scale_entry_set_increments (GIMP_SCALE_ENTRY (scale), 1.0, 15.0); gimp_help_set_help_data (scale, _("Rotation angle about Y axis"), NULL); gtk_size_group_add_widget (group, gimp_scale_entry_get_spin_button (GIMP_SCALE_ENTRY (scale))); @@ -1042,7 +1042,7 @@ create_orientation_page (void) gtk_grid_attach (GTK_GRID (grid), scale, 0, 1, 3, 1); gtk_widget_show (scale); - scale = gimp_scale_entry_new2 (_("Z:"), mapvals.gamma, -180.0, 180.0, 1); + scale = gimp_scale_entry_new (_("Z:"), mapvals.gamma, -180.0, 180.0, 1); gimp_scale_entry_set_increments (GIMP_SCALE_ENTRY (scale), 1.0, 15.0); gimp_help_set_help_data (scale, _("Rotation angle about Z axis"), NULL); gtk_size_group_add_widget (group, gimp_scale_entry_get_spin_button (GIMP_SCALE_ENTRY (scale))); @@ -1118,7 +1118,7 @@ create_box_page (void) gtk_box_pack_start (GTK_BOX (vbox), grid, FALSE, FALSE, 0); gtk_widget_show (grid); - scale = gimp_scale_entry_new2 (_("Scale X:"), mapvals.scale.x, 0.0, 5.0, 2); + scale = gimp_scale_entry_new (_("Scale X:"), mapvals.scale.x, 0.0, 5.0, 2); gimp_scale_entry_set_increments (GIMP_SCALE_ENTRY (scale), 0.01, 0.1); gimp_help_set_help_data (scale, _("X scale (size)"), NULL); spinbutton = gimp_scale_entry_get_spin_button (GIMP_SCALE_ENTRY (scale)); @@ -1130,7 +1130,7 @@ create_box_page (void) gtk_grid_attach (GTK_GRID (grid), scale, 0, 0, 3, 1); gtk_widget_show (scale); - scale = gimp_scale_entry_new2 (_("Y:"), mapvals.scale.y, 0.0, 5.0, 2); + scale = gimp_scale_entry_new (_("Y:"), mapvals.scale.y, 0.0, 5.0, 2); gimp_scale_entry_set_increments (GIMP_SCALE_ENTRY (scale), 0.01, 0.1); gimp_help_set_help_data (scale, _("Y scale (size)"), NULL); spinbutton = gimp_scale_entry_get_spin_button (GIMP_SCALE_ENTRY (scale)); @@ -1142,7 +1142,7 @@ create_box_page (void) gtk_grid_attach (GTK_GRID (grid), scale, 0, 1, 3, 1); gtk_widget_show (scale); - scale = gimp_scale_entry_new2 (_("Z:"), mapvals.scale.z, 0.0, 5.0, 2); + scale = gimp_scale_entry_new (_("Z:"), mapvals.scale.z, 0.0, 5.0, 2); gimp_scale_entry_set_increments (GIMP_SCALE_ENTRY (scale), 0.01, 0.1); gimp_help_set_help_data (scale, _("Z scale (size)"), NULL); spinbutton = gimp_scale_entry_get_spin_button (GIMP_SCALE_ENTRY (scale)); @@ -1214,7 +1214,7 @@ create_cylinder_page (void) gtk_container_add (GTK_CONTAINER (frame), grid); gtk_widget_show (grid); - scale = gimp_scale_entry_new2 (_("R_adius:"), mapvals.cylinder_radius, 0.0, 2.0, 2); + scale = gimp_scale_entry_new (_("R_adius:"), mapvals.cylinder_radius, 0.0, 2.0, 2); gimp_help_set_help_data (scale, _("Cylinder radius"), NULL); gtk_size_group_add_widget (group, gimp_scale_entry_get_label (GIMP_SCALE_ENTRY (scale))); spinbutton = gimp_scale_entry_get_spin_button (GIMP_SCALE_ENTRY (scale)); @@ -1226,7 +1226,7 @@ create_cylinder_page (void) gtk_grid_attach (GTK_GRID (grid), scale, 0, 0, 3, 1); gtk_widget_show (scale); - scale = gimp_scale_entry_new2 (_("L_ength:"), mapvals.cylinder_length, 0.0, 2.0, 2); + scale = gimp_scale_entry_new (_("L_ength:"), mapvals.cylinder_length, 0.0, 2.0, 2); gimp_help_set_help_data (scale, _("Cylinder length"), NULL); gtk_size_group_add_widget (group, gimp_scale_entry_get_label (GIMP_SCALE_ENTRY (scale))); spinbutton = gimp_scale_entry_get_spin_button (GIMP_SCALE_ENTRY (scale)); diff --git a/plug-ins/pagecurl/pagecurl.c b/plug-ins/pagecurl/pagecurl.c index 742e8445ec..5559452daf 100644 --- a/plug-ins/pagecurl/pagecurl.c +++ b/plug-ins/pagecurl/pagecurl.c @@ -662,7 +662,7 @@ dialog (void) G_CALLBACK (gimp_int_combo_box_get_active), &curl.colors, NULL); - scale = gimp_scale_entry_new2 (_("_Opacity:"), curl.opacity * 100.0, 0.0, 100.0, 0.0); + scale = gimp_scale_entry_new (_("_Opacity:"), curl.opacity * 100.0, 0.0, 100.0, 0.0); g_signal_connect (scale, "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 72b9ab72e9..f5cfc97f65 100644 --- a/plug-ins/script-fu/script-fu-interface.c +++ b/plug-ins/script-fu/script-fu-interface.c @@ -412,11 +412,11 @@ script_fu_interface (SFScript *script, { GtkWidget *spinbutton; - widget = gimp_scale_entry_new2 (label_text, - arg->value.sfa_adjustment.value, - arg->default_value.sfa_adjustment.lower, - arg->default_value.sfa_adjustment.upper, - arg->default_value.sfa_adjustment.digits); + widget = gimp_scale_entry_new (label_text, + arg->value.sfa_adjustment.value, + arg->default_value.sfa_adjustment.lower, + arg->default_value.sfa_adjustment.upper, + arg->default_value.sfa_adjustment.digits); gimp_scale_entry_set_increments (GIMP_SCALE_ENTRY (widget), arg->default_value.sfa_adjustment.step, arg->default_value.sfa_adjustment.page); 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 f6363a87da..4783b72719 100644 --- a/plug-ins/selection-to-path/selection-to-path-dialog.c +++ b/plug-ins/selection-to-path/selection-to-path-dialog.c @@ -111,7 +111,7 @@ dialog_create_selection_area (SELVALS *sels) gtk_widget_show (grid); row = 0; - scale = gimp_scale_entry_new2 (_("Align Threshold:"), sels->align_threshold, 0.2, 2.0, 2); + scale = gimp_scale_entry_new (_("Align Threshold:"), sels->align_threshold, 0.2, 2.0, 2); gimp_help_set_help_data (scale, _("If two endpoints are closer than this, " "they are made to be equal."), NULL); @@ -123,12 +123,12 @@ dialog_create_selection_area (SELVALS *sels) gtk_grid_attach (GTK_GRID (grid), scale, 0, row++, 3, 1); gtk_widget_show (scale); - scale = gimp_scale_entry_new2 (_("Corner Always Threshold:"), sels->corner_always_threshold, 30, 180, 2); + scale = gimp_scale_entry_new (_("Corner Always Threshold:"), sels->corner_always_threshold, 30, 180, 2); gimp_help_set_help_data (scale, - _("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); + _("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 (scale, "value-changed", G_CALLBACK (scale_entry_update_double), &sels->corner_always_threshold); @@ -137,10 +137,10 @@ dialog_create_selection_area (SELVALS *sels) gtk_grid_attach (GTK_GRID (grid), scale, 0, row++, 3, 1); gtk_widget_show (scale); - scale = gimp_scale_entry_new2 (_("Corner Surround:"), sels->corner_surround, 3, 8, 0); + scale = gimp_scale_entry_new (_("Corner Surround:"), sels->corner_surround, 3, 8, 0); gimp_help_set_help_data (scale, - _("Number of points to consider when determining if a " - "point is a corner or not."), NULL); + _("Number of points to consider when determining if a " + "point is a corner or not."), NULL); g_signal_connect (scale, "value-changed", G_CALLBACK (scale_entry_update_double), &sels->corner_surround); @@ -149,11 +149,11 @@ dialog_create_selection_area (SELVALS *sels) gtk_grid_attach (GTK_GRID (grid), scale, 0, row++, 3, 1); gtk_widget_show (scale); - scale = gimp_scale_entry_new2 (_("Corner Threshold:"), sels->corner_threshold, 0, 180, 2); + scale = gimp_scale_entry_new (_("Corner Threshold:"), sels->corner_threshold, 0, 180, 2); gimp_help_set_help_data (scale, - _("If a point, its predecessors, and its successors " - "define an angle smaller than this, it's a corner."), - NULL); + _("If a point, its predecessors, and its successors " + "define an angle smaller than this, it's a corner."), + NULL); g_signal_connect (scale, "value-changed", G_CALLBACK (scale_entry_update_double), &sels->corner_threshold); @@ -162,12 +162,12 @@ dialog_create_selection_area (SELVALS *sels) gtk_grid_attach (GTK_GRID (grid), scale, 0, row++, 3, 1); gtk_widget_show (scale); - scale = gimp_scale_entry_new2 (_("Error Threshold:"), sels->error_threshold, 0.2, 10, 2); + scale = gimp_scale_entry_new (_("Error Threshold:"), sels->error_threshold, 0.2, 10, 2); gimp_help_set_help_data (scale, - _("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); + _("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 (scale, "value-changed", G_CALLBACK (scale_entry_update_double), &sels->error_threshold); @@ -176,10 +176,10 @@ dialog_create_selection_area (SELVALS *sels) gtk_grid_attach (GTK_GRID (grid), scale, 0, row++, 3, 1); gtk_widget_show (scale); - scale = gimp_scale_entry_new2 (_("Filter Alternative Surround:"), sels->filter_alternative_surround, 1, 10, 0); + scale = gimp_scale_entry_new (_("Filter Alternative Surround:"), sels->filter_alternative_surround, 1, 10, 0); gimp_help_set_help_data (scale, - _("A second number of adjacent points to consider " - "when filtering."), NULL); + _("A second number of adjacent points to consider " + "when filtering."), NULL); g_signal_connect (scale, "value-changed", G_CALLBACK (scale_entry_update_double), &sels->filter_alternative_surround); @@ -188,12 +188,12 @@ dialog_create_selection_area (SELVALS *sels) gtk_grid_attach (GTK_GRID (grid), scale, 0, row++, 3, 1); gtk_widget_show (scale); - scale = gimp_scale_entry_new2 (_("Filter Epsilon:"), sels->filter_epsilon, 5, 40, 2); + scale = gimp_scale_entry_new (_("Filter Epsilon:"), sels->filter_epsilon, 5, 40, 2); gimp_help_set_help_data (scale, - _("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); + _("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 (scale, "value-changed", G_CALLBACK (scale_entry_update_double), &sels->filter_epsilon); @@ -202,13 +202,13 @@ dialog_create_selection_area (SELVALS *sels) gtk_grid_attach (GTK_GRID (grid), scale, 0, row++, 3, 1); gtk_widget_show (scale); - scale = gimp_scale_entry_new2 (_("Filter Iteration Count:"), sels->filter_iteration_count, 4, 70, 0); + scale = gimp_scale_entry_new (_("Filter Iteration Count:"), sels->filter_iteration_count, 4, 70, 0); gimp_help_set_help_data (scale, - _("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); + _("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 (scale, "value-changed", G_CALLBACK (scale_entry_update_double), &sels->filter_iteration_count); @@ -217,10 +217,10 @@ dialog_create_selection_area (SELVALS *sels) gtk_grid_attach (GTK_GRID (grid), scale, 0, row++, 3, 1); gtk_widget_show (scale); - scale = gimp_scale_entry_new2 (_("Filter Percent:"), sels->filter_percent, 0, 1, 2); + scale = gimp_scale_entry_new (_("Filter Percent:"), sels->filter_percent, 0, 1, 2); gimp_help_set_help_data (scale, - _("To produce the new point, use the old point plus " - "this times the neighbors."), NULL); + _("To produce the new point, use the old point plus " + "this times the neighbors."), NULL); g_signal_connect (scale, "value-changed", G_CALLBACK (scale_entry_update_double), &sels->filter_percent); @@ -229,11 +229,11 @@ dialog_create_selection_area (SELVALS *sels) gtk_grid_attach (GTK_GRID (grid), scale, 0, row++, 3, 1); gtk_widget_show (scale); - scale = gimp_scale_entry_new2 (_("Filter Secondary Surround:"), sels->filter_secondary_surround, 3, 10, 0); + scale = gimp_scale_entry_new (_("Filter Secondary Surround:"), sels->filter_secondary_surround, 3, 10, 0); gimp_help_set_help_data (scale, - _("Number of adjacent points to consider if " - "'filter_surround' points defines a straight line."), - NULL); + _("Number of adjacent points to consider if " + "'filter_surround' points defines a straight line."), + NULL); g_signal_connect (scale, "value-changed", G_CALLBACK (scale_entry_update_double), &sels->filter_secondary_surround); @@ -242,10 +242,10 @@ dialog_create_selection_area (SELVALS *sels) gtk_grid_attach (GTK_GRID (grid), scale, 0, row++, 3, 1); gtk_widget_show (scale); - scale = gimp_scale_entry_new2 (_("Filter Surround:"), sels->filter_surround, 2, 10, 0); + scale = gimp_scale_entry_new (_("Filter Surround:"), sels->filter_surround, 2, 10, 0); gimp_help_set_help_data (scale, - _("Number of adjacent points to consider when filtering."), - NULL); + _("Number of adjacent points to consider when filtering."), + NULL); g_signal_connect (scale, "value-changed", G_CALLBACK (scale_entry_update_double), &sels->filter_surround); @@ -268,13 +268,13 @@ dialog_create_selection_area (SELVALS *sels) g_object_set_data (G_OBJECT (check), "default_value", def_val ((gdouble)FALSE)); row++; - scale = gimp_scale_entry_new2 (_("Line Reversion Threshold:"), sels->line_reversion_threshold, 0.01, 0.2, 3); + scale = gimp_scale_entry_new (_("Line Reversion Threshold:"), sels->line_reversion_threshold, 0.01, 0.2, 3); gimp_help_set_help_data (scale, - _("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); + _("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 (scale, "value-changed", G_CALLBACK (scale_entry_update_double), &sels->line_reversion_threshold); @@ -283,11 +283,11 @@ dialog_create_selection_area (SELVALS *sels) gtk_grid_attach (GTK_GRID (grid), scale, 0, row++, 3, 1); gtk_widget_show (scale); - scale = gimp_scale_entry_new2 (_("Line Threshold:"), sels->line_threshold, 0.2, 4, 2); + scale = gimp_scale_entry_new (_("Line Threshold:"), sels->line_threshold, 0.2, 4, 2); gimp_help_set_help_data (scale, - _("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); + _("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 (scale, "value-changed", G_CALLBACK (scale_entry_update_double), &sels->line_threshold); @@ -296,11 +296,11 @@ dialog_create_selection_area (SELVALS *sels) gtk_grid_attach (GTK_GRID (grid), scale, 0, row++, 3, 1); gtk_widget_show (scale); - scale = gimp_scale_entry_new2 (_("Reparametrize Improvement:"), sels->reparameterize_improvement, 0, 1, 2); + scale = gimp_scale_entry_new (_("Reparametrize Improvement:"), sels->reparameterize_improvement, 0, 1, 2); gimp_help_set_help_data (scale, - _("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); + _("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 (scale, "value-changed", G_CALLBACK (scale_entry_update_double), &sels->reparameterize_improvement); @@ -309,14 +309,14 @@ dialog_create_selection_area (SELVALS *sels) gtk_grid_attach (GTK_GRID (grid), scale, 0, row++, 3, 1); gtk_widget_show (scale); - scale = gimp_scale_entry_new2 (_("Reparametrize Threshold:"), sels->reparameterize_threshold, 1, 50, 2); + scale = gimp_scale_entry_new (_("Reparametrize Threshold:"), sels->reparameterize_threshold, 1, 50, 2); gimp_help_set_help_data (scale, - _("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); + _("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); g_signal_connect (scale, "value-changed", G_CALLBACK (scale_entry_update_double), &sels->reparameterize_threshold); @@ -325,10 +325,10 @@ dialog_create_selection_area (SELVALS *sels) gtk_grid_attach (GTK_GRID (grid), scale, 0, row++, 3, 1); gtk_widget_show (scale); - scale = gimp_scale_entry_new2 (_("Subdivide Search:"), sels->subdivide_search, 0.05, 1, 2); + scale = gimp_scale_entry_new (_("Subdivide Search:"), sels->subdivide_search, 0.05, 1, 2); gimp_help_set_help_data (scale, - _("Percentage of the curve away from the worst point " - "to look for a better place to subdivide."), NULL); + _("Percentage of the curve away from the worst point " + "to look for a better place to subdivide."), NULL); g_signal_connect (scale, "value-changed", G_CALLBACK (scale_entry_update_double), &sels->subdivide_search); @@ -337,11 +337,11 @@ dialog_create_selection_area (SELVALS *sels) gtk_grid_attach (GTK_GRID (grid), scale, 0, row++, 3, 1); gtk_widget_show (scale); - scale = gimp_scale_entry_new2 (_("Subdivide Surround:"), sels->subdivide_surround, 2, 10, 0); + scale = gimp_scale_entry_new (_("Subdivide Surround:"), sels->subdivide_surround, 2, 10, 0); gimp_help_set_help_data (scale, - _("Number of points to consider when deciding whether " - "a given point is a better place to subdivide."), - NULL); + _("Number of points to consider when deciding whether " + "a given point is a better place to subdivide."), + NULL); g_signal_connect (scale, "value-changed", G_CALLBACK (scale_entry_update_double), &sels->subdivide_surround); @@ -350,11 +350,11 @@ dialog_create_selection_area (SELVALS *sels) gtk_grid_attach (GTK_GRID (grid), scale, 0, row++, 3, 1); gtk_widget_show (scale); - scale = gimp_scale_entry_new2 (_("Subdivide Threshold:"), sels->subdivide_threshold, 0.01, 1, 2); + scale = gimp_scale_entry_new (_("Subdivide Threshold:"), sels->subdivide_threshold, 0.01, 1, 2); gimp_help_set_help_data (scale, - _("How many pixels a point can diverge from a straight " - "line and still be considered a better place to " - "subdivide."), NULL); + _("How many pixels a point can diverge from a straight " + "line and still be considered a better place to " + "subdivide."), NULL); g_signal_connect (scale, "value-changed", G_CALLBACK (scale_entry_update_double), &sels->subdivide_threshold); @@ -363,11 +363,11 @@ dialog_create_selection_area (SELVALS *sels) gtk_grid_attach (GTK_GRID (grid), scale, 0, row++, 3, 1); gtk_widget_show (scale); - scale = gimp_scale_entry_new2 (_("Tangent Surround:"), sels->tangent_surround, 2, 10, 0); + scale = gimp_scale_entry_new (_("Tangent Surround:"), sels->tangent_surround, 2, 10, 0); gimp_help_set_help_data (scale, - _("Number of points to look at on either side of a " - "point when computing the approximation to the " - "tangent at that point."), NULL); + _("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 (scale, "value-changed", G_CALLBACK (scale_entry_update_double), &sels->tangent_surround);