Bill Skaggs <weskaggs@primate.ucdavis.edu>

* libgimpwidgets/gimpwidgets.h: Include gimpscalecontrol.h
	
	* libgimpwidgets/gimppropwidgets.c (gimp_prop_scale_entry_new):
	Use scale control rather than scale entry.

	* app/tools/gimppaintoptions-gui.c
	* app/tools/gimpinkoptions-gui.c
	* app/tools/gimpforegroundselectoptions.c
	* app/tools/gimpcoloroptions.c: corresponding tweaks.

svn path=/branches/weskaggs/; revision=24917
This commit is contained in:
William Skaggs 2008-02-19 04:22:48 +00:00
parent fbe35bbbfc
commit b2de72d531
7 changed files with 42 additions and 32 deletions

View File

@ -1,3 +1,15 @@
2008-02-18 Bill Skaggs <weskaggs@primate.ucdavis.edu>
* libgimpwidgets/gimpwidgets.h: Include gimpscalecontrol.h
* libgimpwidgets/gimppropwidgets.c (gimp_prop_scale_entry_new):
Use scale control rather than scale entry.
* app/tools/gimppaintoptions-gui.c
* app/tools/gimpinkoptions-gui.c
* app/tools/gimpforegroundselectoptions.c
* app/tools/gimpcoloroptions.c: corresponding tweaks.
2008-02-18 Bill Skaggs <weskaggs@primate.ucdavis.edu>
* libgimpwidgets/gimpscalecontrol.h

View File

@ -171,7 +171,7 @@ gimp_color_options_gui (GimpToolOptions *tool_options)
_("Radius:"),
1.0, 10.0, 0,
FALSE, 0.0, 0.0);
gimp_scale_entry_set_logarithmic (adj, TRUE);
gimp_scale_control_set_logarithmic (adj, TRUE);
return vbox;
}

View File

@ -311,18 +311,15 @@ gimp_foreground_select_options_gui (GimpToolOptions *tool_options)
adj = gimp_prop_opacity_entry_new (config, "sensitivity-l",
GTK_TABLE (table), 0, row++, "L");
gtk_range_set_update_policy (GTK_RANGE (GIMP_SCALE_ENTRY_SCALE (adj)),
GTK_UPDATE_DELAYED);
gimp_scale_control_set_update_policy (adj, GTK_UPDATE_DELAYED);
adj = gimp_prop_opacity_entry_new (config, "sensitivity-a",
GTK_TABLE (table), 0, row++, "a");
gtk_range_set_update_policy (GTK_RANGE (GIMP_SCALE_ENTRY_SCALE (adj)),
GTK_UPDATE_DELAYED);
gimp_scale_control_set_update_policy (adj, GTK_UPDATE_DELAYED);
adj = gimp_prop_opacity_entry_new (config, "sensitivity-b",
GTK_TABLE (table), 0, row++, "b");
gtk_range_set_update_policy (GTK_RANGE (GIMP_SCALE_ENTRY_SCALE (adj)),
GTK_UPDATE_DELAYED);
gimp_scale_control_set_update_policy (adj, GTK_UPDATE_DELAYED);
return vbox;
}

View File

@ -68,7 +68,7 @@ gimp_ink_options_gui (GimpToolOptions *tool_options)
_("Size:"),
1.0, 2.0, 1,
FALSE, 0.0, 0.0);
gimp_scale_entry_set_logarithmic (adj, TRUE);
gimp_scale_control_set_logarithmic (adj, TRUE);
/* angle adjust slider */
gimp_prop_scale_entry_new (config, "tilt-angle",

View File

@ -129,7 +129,7 @@ gimp_paint_options_gui (GimpToolOptions *tool_options)
_("Scale:"),
0.01, 0.1, 2,
FALSE, 0.0, 0.0);
gimp_scale_entry_set_logarithmic (adj, TRUE);
gimp_scale_control_set_logarithmic (adj, TRUE);
}
/* the gradient */

View File

@ -1175,25 +1175,25 @@ gimp_prop_scale_entry_new (GObject *config,
if (! limit_scale)
{
adjustment = gimp_scale_entry_new (table, column, row,
label, -1, -1,
value, lower, upper,
step_increment, page_increment,
digits,
TRUE, 0.0, 0.0,
tooltip,
NULL);
adjustment = gimp_scale_control_new (table, column, row,
label, -1, -1,
value, lower, upper,
step_increment, page_increment,
digits,
TRUE, 0.0, 0.0,
tooltip,
NULL);
}
else
{
adjustment = gimp_scale_entry_new (table, column, row,
label, -1, -1,
value, lower_limit, upper_limit,
step_increment, page_increment,
digits,
FALSE, lower, upper,
tooltip,
NULL);
adjustment = gimp_scale_control_new (table, column, row,
label, -1, -1,
value, lower_limit, upper_limit,
step_increment, page_increment,
digits,
FALSE, lower, upper,
tooltip,
NULL);
}
set_param_spec (G_OBJECT (adjustment), NULL, param_spec);
@ -1260,13 +1260,13 @@ gimp_prop_opacity_entry_new (GObject *config,
lower = G_PARAM_SPEC_DOUBLE (param_spec)->minimum * 100.0;
upper = G_PARAM_SPEC_DOUBLE (param_spec)->maximum * 100.0;
adjustment = gimp_scale_entry_new (table, column, row,
label, -1, -1,
value, lower, upper,
1.0, 10.0, 1,
TRUE, 0.0, 0.0,
tooltip,
NULL);
adjustment = gimp_scale_control_new (table, column, row,
label, -1, -1,
value, lower, upper,
1.0, 10.0, 1,
TRUE, 0.0, 0.0,
tooltip,
NULL);
set_param_spec (G_OBJECT (adjustment), NULL, param_spec);
g_object_set_data (G_OBJECT (adjustment),

View File

@ -67,6 +67,7 @@
#include <libgimpwidgets/gimppreviewarea.h>
#include <libgimpwidgets/gimppropwidgets.h>
#include <libgimpwidgets/gimpquerybox.h>
#include <libgimpwidgets/gimpscalecontrol.h>
#include <libgimpwidgets/gimpscaleentry.h>
#include <libgimpwidgets/gimpscrolledpreview.h>
#include <libgimpwidgets/gimpsizeentry.h>