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

Merged from trunk: 

2008-06-04  Sven Neumann  <sven@gimp.org>

	Merged from trunk:

	* app/tools/gimpcropoptions.c
	* app/tools/gimprectangleoptions.c
	* app/tools/gimprectangleselectoptions.c: fixed handling of the
	"highlight" property that needs different default values for the
	Crop and Rectangle Select tools (bug #536582).

svn path=/branches/gimp-2-4/; revision=25891
This commit is contained in:
Sven Neumann 2008-06-04 13:58:02 +00:00 committed by Sven Neumann
parent 579e2a81ea
commit 0b1beafe95
4 changed files with 36 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2008-06-04 Sven Neumann <sven@gimp.org>
Merged from trunk:
* app/tools/gimpcropoptions.c
* app/tools/gimprectangleoptions.c
* app/tools/gimprectangleselectoptions.c: fixed handling of the
"highlight" property that needs different default values for the
Crop and Rectangle Select tools (bug #536582).
2008-06-01 Martin Nordholts <martinn@svn.gnome.org>
Merged from trunk:

21
app/tools/gimpcropoptions.c
View File

@ -68,6 +68,15 @@ gimp_crop_options_class_init (GimpCropOptionsClass *klass)
object_class->set_property = gimp_crop_options_set_property;
object_class->get_property = gimp_crop_options_get_property;
/* The 'highlight' property is defined here because we want different
* default values for the Crop and the Rectangle Select tools.
*/
GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class,
GIMP_RECTANGLE_OPTIONS_PROP_HIGHLIGHT,
"highlight", NULL,
TRUE,
GIMP_PARAM_STATIC_STRINGS);
GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_LAYER_ONLY,
"layer-only", NULL,
FALSE,
@ -97,14 +106,16 @@ gimp_crop_options_set_property (GObject *object,
const GValue *value,
GParamSpec *pspec)
{
GimpCropOptions *options = GIMP_CROP_OPTIONS (object);
switch (property_id)
{
case PROP_LAYER_ONLY:
GIMP_CROP_OPTIONS (object)->layer_only = g_value_get_boolean (value);
options->layer_only = g_value_get_boolean (value);
break;
case PROP_ALLOW_GROWING:
GIMP_CROP_OPTIONS (object)->allow_growing = g_value_get_boolean (value);
options->allow_growing = g_value_get_boolean (value);
break;
default:
@ -119,14 +130,16 @@ gimp_crop_options_get_property (GObject *object,
GValue *value,
GParamSpec *pspec)
{
GimpCropOptions *options = GIMP_CROP_OPTIONS (object);
switch (property_id)
{
case PROP_LAYER_ONLY:
g_value_set_boolean (value, GIMP_CROP_OPTIONS (object)->layer_only);
g_value_set_boolean (value, options->layer_only);
break;
case PROP_ALLOW_GROWING:
g_value_set_boolean (value, GIMP_CROP_OPTIONS (object)->allow_growing);
g_value_set_boolean (value, options->allow_growing);
break;
default:

10
app/tools/gimprectangleoptions.c
View File

@ -115,13 +115,6 @@ gimp_rectangle_options_iface_base_init (GimpRectangleOptionsInterface *iface)
GIMP_CONFIG_PARAM_FLAGS |
GIMP_PARAM_STATIC_STRINGS));
g_object_interface_install_property (iface,
g_param_spec_boolean ("highlight",
NULL, NULL,
TRUE,
GIMP_CONFIG_PARAM_FLAGS |
GIMP_PARAM_STATIC_STRINGS));
g_object_interface_install_property (iface,
g_param_spec_enum ("guide",
NULL, NULL,
@ -397,9 +390,6 @@ gimp_rectangle_options_install_properties (GObjectClass *klass)
g_object_class_override_property (klass,
GIMP_RECTANGLE_OPTIONS_PROP_SHRINK_MERGED,
"shrink-merged");
g_object_class_override_property (klass,
GIMP_RECTANGLE_OPTIONS_PROP_HIGHLIGHT,
"highlight");
g_object_class_override_property (klass,
GIMP_RECTANGLE_OPTIONS_PROP_GUIDE,
"guide");

13
app/tools/gimprectangleselectoptions.c
View File

@ -68,6 +68,15 @@ gimp_rect_select_options_class_init (GimpRectSelectOptionsClass *klass)
object_class->set_property = gimp_rect_select_options_set_property;
object_class->get_property = gimp_rect_select_options_get_property;
/* The 'highlight' property is defined here because we want different
* default values for the Crop and the Rectangle Select tools.
*/
GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class,
GIMP_RECTANGLE_OPTIONS_PROP_HIGHLIGHT,
"highlight", NULL,
FALSE,
GIMP_PARAM_STATIC_STRINGS);
GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_ROUND_CORNERS,
"round-corners", NULL,
FALSE,
@ -175,10 +184,6 @@ gimp_rect_select_options_gui (GimpToolOptions *tool_options)
vbox_rectangle = gimp_rectangle_options_gui (tool_options);
gtk_box_pack_start (GTK_BOX (vbox), vbox_rectangle, FALSE, FALSE, 0);
gtk_widget_show (vbox_rectangle);
g_object_set (GIMP_RECTANGLE_OPTIONS (tool_options),
"highlight", FALSE,
NULL);
}
return vbox;