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

renamed properties x0 and y0 to x and y. Also reordered all property code 

2007-10-14  Michael Natterer  <mitch@gimp.org>

	* app/tools/gimprectangleoptions.[ch]: renamed properties x0 and
	y0 to x and y. Also reordered all property code to be in the same
	order and added some empty lines to group the properties.

	* app/tools/gimprectangletool.c: changed accordingly.


svn path=/trunk/; revision=23822
This commit is contained in:
Michael Natterer 2007-10-14 19:48:56 +00:00 committed by Michael Natterer
parent 0a824ddba0
commit 1e71a30ce3
4 changed files with 193 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2007-10-14 Michael Natterer <mitch@gimp.org>
* app/tools/gimprectangleoptions.[ch]: renamed properties x0 and
y0 to x and y. Also reordered all property code to be in the same
order and added some empty lines to group the properties.
* app/tools/gimprectangletool.c: changed accordingly.
2007-10-14 Michael Natterer <mitch@gimp.org> 2007-10-14 Michael Natterer <mitch@gimp.org>
* libgimpwidgets/gimppropwidgets.[ch] (gimp_prop_size_entry_new): * libgimpwidgets/gimppropwidgets.[ch] (gimp_prop_size_entry_new):

287
app/tools/gimprectangleoptions.c
View File

@ -131,7 +131,7 @@ gimp_rectangle_options_iface_base_init (GimpRectangleOptionsInterface *iface)
GIMP_PARAM_STATIC_STRINGS)); GIMP_PARAM_STATIC_STRINGS));
g_object_interface_install_property (iface, g_object_interface_install_property (iface,
g_param_spec_double ("x0", g_param_spec_double ("x",
NULL, NULL, NULL, NULL,
-GIMP_MAX_IMAGE_SIZE, -GIMP_MAX_IMAGE_SIZE,
GIMP_MAX_IMAGE_SIZE, GIMP_MAX_IMAGE_SIZE,
@ -140,7 +140,7 @@ gimp_rectangle_options_iface_base_init (GimpRectangleOptionsInterface *iface)
G_PARAM_CONSTRUCT)); G_PARAM_CONSTRUCT));
g_object_interface_install_property (iface, g_object_interface_install_property (iface,
g_param_spec_double ("y0", g_param_spec_double ("y",
NULL, NULL, NULL, NULL,
-GIMP_MAX_IMAGE_SIZE, -GIMP_MAX_IMAGE_SIZE,
GIMP_MAX_IMAGE_SIZE, GIMP_MAX_IMAGE_SIZE,
@ -164,52 +164,14 @@ gimp_rectangle_options_iface_base_init (GimpRectangleOptionsInterface *iface)
GIMP_PARAM_READWRITE | GIMP_PARAM_READWRITE |
G_PARAM_CONSTRUCT)); G_PARAM_CONSTRUCT));
g_object_interface_install_property (iface, g_object_interface_install_property (iface,
g_param_spec_double ("aspect-numerator", gimp_param_spec_unit ("unit",
NULL, NULL, NULL, NULL,
0.0, GIMP_MAX_IMAGE_SIZE, TRUE, TRUE,
1.0, GIMP_UNIT_PIXEL,
GIMP_CONFIG_PARAM_FLAGS |
GIMP_PARAM_STATIC_STRINGS));
g_object_interface_install_property (iface,
g_param_spec_double ("aspect-denominator",
NULL, NULL,
0.0, GIMP_MAX_IMAGE_SIZE,
1.0,
GIMP_CONFIG_PARAM_FLAGS |
GIMP_PARAM_STATIC_STRINGS));
g_object_interface_install_property (iface,
g_param_spec_double ("default-aspect-numerator",
NULL, NULL,
0.001, GIMP_MAX_IMAGE_SIZE,
1.0,
GIMP_PARAM_READWRITE | GIMP_PARAM_READWRITE |
G_PARAM_CONSTRUCT)); G_PARAM_CONSTRUCT));
g_object_interface_install_property (iface,
g_param_spec_double ("default-aspect-denominator",
NULL, NULL,
0.001, GIMP_MAX_IMAGE_SIZE,
1.0,
GIMP_PARAM_READWRITE |
G_PARAM_CONSTRUCT));
g_object_interface_install_property (iface,
g_param_spec_boolean ("overridden-fixed-aspect",
NULL, NULL,
FALSE,
GIMP_CONFIG_PARAM_FLAGS |
GIMP_PARAM_STATIC_STRINGS));
g_object_interface_install_property (iface,
g_param_spec_boolean ("fixed-center",
NULL, NULL,
FALSE,
GIMP_CONFIG_PARAM_FLAGS |
GIMP_PARAM_STATIC_STRINGS));
g_object_interface_install_property (iface, g_object_interface_install_property (iface,
g_param_spec_boolean ("fixed-rule-active", g_param_spec_boolean ("fixed-rule-active",
NULL, NULL, NULL, NULL,
@ -280,6 +242,52 @@ gimp_rectangle_options_iface_base_init (GimpRectangleOptionsInterface *iface)
GIMP_CONFIG_PARAM_FLAGS | GIMP_CONFIG_PARAM_FLAGS |
GIMP_PARAM_STATIC_STRINGS)); GIMP_PARAM_STATIC_STRINGS));
g_object_interface_install_property (iface,
g_param_spec_double ("aspect-numerator",
NULL, NULL,
0.0, GIMP_MAX_IMAGE_SIZE,
1.0,
GIMP_CONFIG_PARAM_FLAGS |
GIMP_PARAM_STATIC_STRINGS));
g_object_interface_install_property (iface,
g_param_spec_double ("aspect-denominator",
NULL, NULL,
0.0, GIMP_MAX_IMAGE_SIZE,
1.0,
GIMP_CONFIG_PARAM_FLAGS |
GIMP_PARAM_STATIC_STRINGS));
g_object_interface_install_property (iface,
g_param_spec_double ("default-aspect-numerator",
NULL, NULL,
0.001, GIMP_MAX_IMAGE_SIZE,
1.0,
GIMP_PARAM_READWRITE |
G_PARAM_CONSTRUCT));
g_object_interface_install_property (iface,
g_param_spec_double ("default-aspect-denominator",
NULL, NULL,
0.001, GIMP_MAX_IMAGE_SIZE,
1.0,
GIMP_PARAM_READWRITE |
G_PARAM_CONSTRUCT));
g_object_interface_install_property (iface,
g_param_spec_boolean ("overridden-fixed-aspect",
NULL, NULL,
FALSE,
GIMP_CONFIG_PARAM_FLAGS |
GIMP_PARAM_STATIC_STRINGS));
g_object_interface_install_property (iface,
g_param_spec_boolean ("use-string-current",
NULL, NULL,
FALSE,
GIMP_PARAM_READWRITE |
GIMP_PARAM_STATIC_STRINGS));
g_object_interface_install_property (iface, g_object_interface_install_property (iface,
gimp_param_spec_unit ("fixed-unit", gimp_param_spec_unit ("fixed-unit",
NULL, NULL, NULL, NULL,
@ -288,6 +296,13 @@ gimp_rectangle_options_iface_base_init (GimpRectangleOptionsInterface *iface)
GIMP_PARAM_READWRITE | GIMP_PARAM_READWRITE |
G_PARAM_CONSTRUCT)); G_PARAM_CONSTRUCT));
g_object_interface_install_property (iface,
g_param_spec_boolean ("fixed-center",
NULL, NULL,
FALSE,
GIMP_CONFIG_PARAM_FLAGS |
GIMP_PARAM_STATIC_STRINGS));
g_object_interface_install_property (iface, g_object_interface_install_property (iface,
g_param_spec_double ("center-x", g_param_spec_double ("center-x",
NULL, NULL, NULL, NULL,
@ -306,21 +321,6 @@ gimp_rectangle_options_iface_base_init (GimpRectangleOptionsInterface *iface)
GIMP_PARAM_READWRITE | GIMP_PARAM_READWRITE |
G_PARAM_CONSTRUCT)); G_PARAM_CONSTRUCT));
g_object_interface_install_property (iface,
g_param_spec_boolean ("use-string-current",
NULL, NULL,
FALSE,
GIMP_PARAM_READWRITE |
GIMP_PARAM_STATIC_STRINGS));
g_object_interface_install_property (iface,
gimp_param_spec_unit ("unit",
NULL, NULL,
TRUE, TRUE,
GIMP_UNIT_PIXEL,
GIMP_PARAM_READWRITE |
G_PARAM_CONSTRUCT));
initialized = TRUE; initialized = TRUE;
} }
} }
@ -395,12 +395,13 @@ gimp_rectangle_options_install_properties (GObjectClass *klass)
g_object_class_override_property (klass, g_object_class_override_property (klass,
GIMP_RECTANGLE_OPTIONS_PROP_GUIDE, GIMP_RECTANGLE_OPTIONS_PROP_GUIDE,
"guide"); "guide");
g_object_class_override_property (klass, g_object_class_override_property (klass,
GIMP_RECTANGLE_OPTIONS_PROP_X0, GIMP_RECTANGLE_OPTIONS_PROP_X,
"x0"); "x");
g_object_class_override_property (klass, g_object_class_override_property (klass,
GIMP_RECTANGLE_OPTIONS_PROP_Y0, GIMP_RECTANGLE_OPTIONS_PROP_Y,
"y0"); "y");
g_object_class_override_property (klass, g_object_class_override_property (klass,
GIMP_RECTANGLE_OPTIONS_PROP_WIDTH, GIMP_RECTANGLE_OPTIONS_PROP_WIDTH,
"width"); "width");
@ -408,20 +409,9 @@ gimp_rectangle_options_install_properties (GObjectClass *klass)
GIMP_RECTANGLE_OPTIONS_PROP_HEIGHT, GIMP_RECTANGLE_OPTIONS_PROP_HEIGHT,
"height"); "height");
g_object_class_override_property (klass, g_object_class_override_property (klass,
GIMP_RECTANGLE_OPTIONS_PROP_ASPECT_NUMERATOR, GIMP_RECTANGLE_OPTIONS_PROP_UNIT,
"aspect-numerator"); "unit");
g_object_class_override_property (klass,
GIMP_RECTANGLE_OPTIONS_PROP_ASPECT_DENOMINATOR,
"aspect-denominator");
g_object_class_override_property (klass,
GIMP_RECTANGLE_OPTIONS_PROP_DEFAULT_ASPECT_NUMERATOR,
"default-aspect-numerator");
g_object_class_override_property (klass,
GIMP_RECTANGLE_OPTIONS_PROP_DEFAULT_ASPECT_DENOMINATOR,
"default-aspect-denominator");
g_object_class_override_property (klass,
GIMP_RECTANGLE_OPTIONS_PROP_OVERRIDDEN_FIXED_ASPECT,
"overridden-fixed-aspect");
g_object_class_override_property (klass, g_object_class_override_property (klass,
GIMP_RECTANGLE_OPTIONS_PROP_FIXED_RULE_ACTIVE, GIMP_RECTANGLE_OPTIONS_PROP_FIXED_RULE_ACTIVE,
"fixed-rule-active"); "fixed-rule-active");
@ -449,9 +439,28 @@ gimp_rectangle_options_install_properties (GObjectClass *klass)
g_object_class_override_property (klass, g_object_class_override_property (klass,
GIMP_RECTANGLE_OPTIONS_PROP_OVERRIDDEN_FIXED_SIZE, GIMP_RECTANGLE_OPTIONS_PROP_OVERRIDDEN_FIXED_SIZE,
"overridden-fixed-size"); "overridden-fixed-size");
g_object_class_override_property (klass,
GIMP_RECTANGLE_OPTIONS_PROP_ASPECT_NUMERATOR,
"aspect-numerator");
g_object_class_override_property (klass,
GIMP_RECTANGLE_OPTIONS_PROP_ASPECT_DENOMINATOR,
"aspect-denominator");
g_object_class_override_property (klass,
GIMP_RECTANGLE_OPTIONS_PROP_DEFAULT_ASPECT_NUMERATOR,
"default-aspect-numerator");
g_object_class_override_property (klass,
GIMP_RECTANGLE_OPTIONS_PROP_DEFAULT_ASPECT_DENOMINATOR,
"default-aspect-denominator");
g_object_class_override_property (klass,
GIMP_RECTANGLE_OPTIONS_PROP_OVERRIDDEN_FIXED_ASPECT,
"overridden-fixed-aspect");
g_object_class_override_property (klass,
GIMP_RECTANGLE_OPTIONS_PROP_USE_STRING_CURRENT,
"use-string-current");
g_object_class_override_property (klass, g_object_class_override_property (klass,
GIMP_RECTANGLE_OPTIONS_PROP_FIXED_UNIT, GIMP_RECTANGLE_OPTIONS_PROP_FIXED_UNIT,
"fixed-unit"); "fixed-unit");
g_object_class_override_property (klass, g_object_class_override_property (klass,
GIMP_RECTANGLE_OPTIONS_PROP_FIXED_CENTER, GIMP_RECTANGLE_OPTIONS_PROP_FIXED_CENTER,
"fixed-center"); "fixed-center");
@ -461,12 +470,6 @@ gimp_rectangle_options_install_properties (GObjectClass *klass)
g_object_class_override_property (klass, g_object_class_override_property (klass,
GIMP_RECTANGLE_OPTIONS_PROP_CENTER_Y, GIMP_RECTANGLE_OPTIONS_PROP_CENTER_Y,
"center-y"); "center-y");
g_object_class_override_property (klass,
GIMP_RECTANGLE_OPTIONS_PROP_USE_STRING_CURRENT,
"use-string-current");
g_object_class_override_property (klass,
GIMP_RECTANGLE_OPTIONS_PROP_UNIT,
"unit");
} }
void void
@ -494,11 +497,12 @@ gimp_rectangle_options_set_property (GObject *object,
case GIMP_RECTANGLE_OPTIONS_PROP_GUIDE: case GIMP_RECTANGLE_OPTIONS_PROP_GUIDE:
private->guide = g_value_get_enum (value); private->guide = g_value_get_enum (value);
break; break;
case GIMP_RECTANGLE_OPTIONS_PROP_X0:
private->x0 = g_value_get_double (value); case GIMP_RECTANGLE_OPTIONS_PROP_X:
private->x = g_value_get_double (value);
break; break;
case GIMP_RECTANGLE_OPTIONS_PROP_Y0: case GIMP_RECTANGLE_OPTIONS_PROP_Y:
private->y0 = g_value_get_double (value); private->y = g_value_get_double (value);
break; break;
case GIMP_RECTANGLE_OPTIONS_PROP_WIDTH: case GIMP_RECTANGLE_OPTIONS_PROP_WIDTH:
private->width = g_value_get_double (value); private->width = g_value_get_double (value);
@ -506,24 +510,10 @@ gimp_rectangle_options_set_property (GObject *object,
case GIMP_RECTANGLE_OPTIONS_PROP_HEIGHT: case GIMP_RECTANGLE_OPTIONS_PROP_HEIGHT:
private->height = g_value_get_double (value); private->height = g_value_get_double (value);
break; break;
case GIMP_RECTANGLE_OPTIONS_PROP_ASPECT_NUMERATOR: case GIMP_RECTANGLE_OPTIONS_PROP_UNIT:
private->aspect_numerator = g_value_get_double (value); private->unit = g_value_get_int (value);
break;
case GIMP_RECTANGLE_OPTIONS_PROP_ASPECT_DENOMINATOR:
private->aspect_denominator = g_value_get_double (value);
break;
case GIMP_RECTANGLE_OPTIONS_PROP_DEFAULT_ASPECT_NUMERATOR:
private->default_aspect_numerator = g_value_get_double (value);
break;
case GIMP_RECTANGLE_OPTIONS_PROP_DEFAULT_ASPECT_DENOMINATOR:
private->default_aspect_denominator = g_value_get_double (value);
break;
case GIMP_RECTANGLE_OPTIONS_PROP_OVERRIDDEN_FIXED_ASPECT:
private->overridden_fixed_aspect = g_value_get_boolean (value);
break;
case GIMP_RECTANGLE_OPTIONS_PROP_FIXED_CENTER:
private->fixed_center = g_value_get_boolean (value);
break; break;
case GIMP_RECTANGLE_OPTIONS_PROP_FIXED_RULE_ACTIVE: case GIMP_RECTANGLE_OPTIONS_PROP_FIXED_RULE_ACTIVE:
private->fixed_rule_active = g_value_get_boolean (value); private->fixed_rule_active = g_value_get_boolean (value);
break; break;
@ -551,21 +541,37 @@ gimp_rectangle_options_set_property (GObject *object,
case GIMP_RECTANGLE_OPTIONS_PROP_OVERRIDDEN_FIXED_SIZE: case GIMP_RECTANGLE_OPTIONS_PROP_OVERRIDDEN_FIXED_SIZE:
private->overridden_fixed_size = g_value_get_boolean (value); private->overridden_fixed_size = g_value_get_boolean (value);
break; break;
case GIMP_RECTANGLE_OPTIONS_PROP_ASPECT_NUMERATOR:
private->aspect_numerator = g_value_get_double (value);
break;
case GIMP_RECTANGLE_OPTIONS_PROP_ASPECT_DENOMINATOR:
private->aspect_denominator = g_value_get_double (value);
break;
case GIMP_RECTANGLE_OPTIONS_PROP_DEFAULT_ASPECT_NUMERATOR:
private->default_aspect_numerator = g_value_get_double (value);
break;
case GIMP_RECTANGLE_OPTIONS_PROP_DEFAULT_ASPECT_DENOMINATOR:
private->default_aspect_denominator = g_value_get_double (value);
break;
case GIMP_RECTANGLE_OPTIONS_PROP_OVERRIDDEN_FIXED_ASPECT:
private->overridden_fixed_aspect = g_value_get_boolean (value);
break;
case GIMP_RECTANGLE_OPTIONS_PROP_USE_STRING_CURRENT:
private->use_string_current = g_value_get_boolean (value);
break;
case GIMP_RECTANGLE_OPTIONS_PROP_FIXED_UNIT: case GIMP_RECTANGLE_OPTIONS_PROP_FIXED_UNIT:
private->fixed_unit = g_value_get_int (value); private->fixed_unit = g_value_get_int (value);
break; break;
case GIMP_RECTANGLE_OPTIONS_PROP_FIXED_CENTER:
private->fixed_center = g_value_get_boolean (value);
break;
case GIMP_RECTANGLE_OPTIONS_PROP_CENTER_X: case GIMP_RECTANGLE_OPTIONS_PROP_CENTER_X:
private->center_x = g_value_get_double (value); private->center_x = g_value_get_double (value);
break; break;
case GIMP_RECTANGLE_OPTIONS_PROP_CENTER_Y: case GIMP_RECTANGLE_OPTIONS_PROP_CENTER_Y:
private->center_y = g_value_get_double (value); private->center_y = g_value_get_double (value);
break; break;
case GIMP_RECTANGLE_OPTIONS_PROP_USE_STRING_CURRENT:
private->use_string_current = g_value_get_boolean (value);
break;
case GIMP_RECTANGLE_OPTIONS_PROP_UNIT:
private->unit = g_value_get_int (value);
break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
@ -598,11 +604,12 @@ gimp_rectangle_options_get_property (GObject *object,
case GIMP_RECTANGLE_OPTIONS_PROP_GUIDE: case GIMP_RECTANGLE_OPTIONS_PROP_GUIDE:
g_value_set_enum (value, private->guide); g_value_set_enum (value, private->guide);
break; break;
case GIMP_RECTANGLE_OPTIONS_PROP_X0:
g_value_set_double (value, private->x0); case GIMP_RECTANGLE_OPTIONS_PROP_X:
g_value_set_double (value, private->x);
break; break;
case GIMP_RECTANGLE_OPTIONS_PROP_Y0: case GIMP_RECTANGLE_OPTIONS_PROP_Y:
g_value_set_double (value, private->y0); g_value_set_double (value, private->y);
break; break;
case GIMP_RECTANGLE_OPTIONS_PROP_WIDTH: case GIMP_RECTANGLE_OPTIONS_PROP_WIDTH:
g_value_set_double (value, private->width); g_value_set_double (value, private->width);
@ -610,24 +617,10 @@ gimp_rectangle_options_get_property (GObject *object,
case GIMP_RECTANGLE_OPTIONS_PROP_HEIGHT: case GIMP_RECTANGLE_OPTIONS_PROP_HEIGHT:
g_value_set_double (value, private->height); g_value_set_double (value, private->height);
break; break;
case GIMP_RECTANGLE_OPTIONS_PROP_ASPECT_NUMERATOR: case GIMP_RECTANGLE_OPTIONS_PROP_UNIT:
g_value_set_double (value, private->aspect_numerator); g_value_set_int (value, private->unit);
break;
case GIMP_RECTANGLE_OPTIONS_PROP_ASPECT_DENOMINATOR:
g_value_set_double (value, private->aspect_denominator);
break;
case GIMP_RECTANGLE_OPTIONS_PROP_DEFAULT_ASPECT_NUMERATOR:
g_value_set_double (value, private->default_aspect_numerator);
break;
case GIMP_RECTANGLE_OPTIONS_PROP_DEFAULT_ASPECT_DENOMINATOR:
g_value_set_double (value, private->default_aspect_denominator);
break;
case GIMP_RECTANGLE_OPTIONS_PROP_OVERRIDDEN_FIXED_ASPECT:
g_value_set_boolean (value, private->overridden_fixed_aspect);
break;
case GIMP_RECTANGLE_OPTIONS_PROP_FIXED_CENTER:
g_value_set_boolean (value, private->fixed_center);
break; break;
case GIMP_RECTANGLE_OPTIONS_PROP_FIXED_RULE_ACTIVE: case GIMP_RECTANGLE_OPTIONS_PROP_FIXED_RULE_ACTIVE:
g_value_set_boolean (value, private->fixed_rule_active); g_value_set_boolean (value, private->fixed_rule_active);
break; break;
@ -655,21 +648,37 @@ gimp_rectangle_options_get_property (GObject *object,
case GIMP_RECTANGLE_OPTIONS_PROP_OVERRIDDEN_FIXED_SIZE: case GIMP_RECTANGLE_OPTIONS_PROP_OVERRIDDEN_FIXED_SIZE:
g_value_set_boolean (value, private->overridden_fixed_size); g_value_set_boolean (value, private->overridden_fixed_size);
break; break;
case GIMP_RECTANGLE_OPTIONS_PROP_ASPECT_NUMERATOR:
g_value_set_double (value, private->aspect_numerator);
break;
case GIMP_RECTANGLE_OPTIONS_PROP_ASPECT_DENOMINATOR:
g_value_set_double (value, private->aspect_denominator);
break;
case GIMP_RECTANGLE_OPTIONS_PROP_DEFAULT_ASPECT_NUMERATOR:
g_value_set_double (value, private->default_aspect_numerator);
break;
case GIMP_RECTANGLE_OPTIONS_PROP_DEFAULT_ASPECT_DENOMINATOR:
g_value_set_double (value, private->default_aspect_denominator);
break;
case GIMP_RECTANGLE_OPTIONS_PROP_OVERRIDDEN_FIXED_ASPECT:
g_value_set_boolean (value, private->overridden_fixed_aspect);
break;
case GIMP_RECTANGLE_OPTIONS_PROP_USE_STRING_CURRENT:
g_value_set_boolean (value, private->use_string_current);
break;
case GIMP_RECTANGLE_OPTIONS_PROP_FIXED_UNIT: case GIMP_RECTANGLE_OPTIONS_PROP_FIXED_UNIT:
g_value_set_int (value, private->fixed_unit); g_value_set_int (value, private->fixed_unit);
break; break;
case GIMP_RECTANGLE_OPTIONS_PROP_FIXED_CENTER:
g_value_set_boolean (value, private->fixed_center);
break;
case GIMP_RECTANGLE_OPTIONS_PROP_CENTER_X: case GIMP_RECTANGLE_OPTIONS_PROP_CENTER_X:
g_value_set_double (value, private->center_x); g_value_set_double (value, private->center_x);
break; break;
case GIMP_RECTANGLE_OPTIONS_PROP_CENTER_Y: case GIMP_RECTANGLE_OPTIONS_PROP_CENTER_Y:
g_value_set_double (value, private->center_y); g_value_set_double (value, private->center_y);
break; break;
case GIMP_RECTANGLE_OPTIONS_PROP_USE_STRING_CURRENT:
g_value_set_boolean (value, private->use_string_current);
break;
case GIMP_RECTANGLE_OPTIONS_PROP_UNIT:
g_value_set_int (value, private->unit);
break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
@ -935,7 +944,7 @@ gimp_rectangle_options_gui (GimpToolOptions *tool_options)
gtk_widget_show (table); gtk_widget_show (table);
/* X */ /* X */
entry = gimp_prop_size_entry_new (config, "x0", TRUE, "unit", "%a", entry = gimp_prop_size_entry_new (config, "x", TRUE, "unit", "%a",
GIMP_SIZE_ENTRY_UPDATE_SIZE, 300); GIMP_SIZE_ENTRY_UPDATE_SIZE, 300);
gimp_size_entry_show_unit_menu (GIMP_SIZE_ENTRY (entry), FALSE); gimp_size_entry_show_unit_menu (GIMP_SIZE_ENTRY (entry), FALSE);
gimp_table_attach_aligned (GTK_TABLE (table), 0, row++, gimp_table_attach_aligned (GTK_TABLE (table), 0, row++,
@ -943,7 +952,7 @@ gimp_rectangle_options_gui (GimpToolOptions *tool_options)
entry, 1, TRUE); entry, 1, TRUE);
/* Y */ /* Y */
entry = gimp_prop_size_entry_new (config, "y0", TRUE, "unit", "%a", entry = gimp_prop_size_entry_new (config, "y", TRUE, "unit", "%a",
GIMP_SIZE_ENTRY_UPDATE_SIZE, 300); GIMP_SIZE_ENTRY_UPDATE_SIZE, 300);
gimp_size_entry_show_unit_menu (GIMP_SIZE_ENTRY (entry), FALSE); gimp_size_entry_show_unit_menu (GIMP_SIZE_ENTRY (entry), FALSE);
gimp_table_attach_aligned (GTK_TABLE (table), 0, row++, gimp_table_attach_aligned (GTK_TABLE (table), 0, row++,

50
app/tools/gimprectangleoptions.h
View File

@ -23,14 +23,20 @@
typedef enum typedef enum
{ {
GIMP_RECTANGLE_OPTIONS_PROP_0, GIMP_RECTANGLE_OPTIONS_PROP_0,
GIMP_RECTANGLE_OPTIONS_PROP_AUTO_SHRINK, GIMP_RECTANGLE_OPTIONS_PROP_AUTO_SHRINK,
GIMP_RECTANGLE_OPTIONS_PROP_SHRINK_MERGED, GIMP_RECTANGLE_OPTIONS_PROP_SHRINK_MERGED,
GIMP_RECTANGLE_OPTIONS_PROP_HIGHLIGHT, GIMP_RECTANGLE_OPTIONS_PROP_HIGHLIGHT,
GIMP_RECTANGLE_OPTIONS_PROP_GUIDE, GIMP_RECTANGLE_OPTIONS_PROP_GUIDE,
GIMP_RECTANGLE_OPTIONS_PROP_X0,
GIMP_RECTANGLE_OPTIONS_PROP_Y0, GIMP_RECTANGLE_OPTIONS_PROP_X,
GIMP_RECTANGLE_OPTIONS_PROP_Y,
GIMP_RECTANGLE_OPTIONS_PROP_WIDTH, GIMP_RECTANGLE_OPTIONS_PROP_WIDTH,
GIMP_RECTANGLE_OPTIONS_PROP_HEIGHT, GIMP_RECTANGLE_OPTIONS_PROP_HEIGHT,
GIMP_RECTANGLE_OPTIONS_PROP_UNIT,
GIMP_RECTANGLE_OPTIONS_PROP_FIXED_RULE_ACTIVE,
GIMP_RECTANGLE_OPTIONS_PROP_FIXED_RULE,
GIMP_RECTANGLE_OPTIONS_PROP_DESIRED_FIXED_WIDTH, GIMP_RECTANGLE_OPTIONS_PROP_DESIRED_FIXED_WIDTH,
GIMP_RECTANGLE_OPTIONS_PROP_DESIRED_FIXED_HEIGHT, GIMP_RECTANGLE_OPTIONS_PROP_DESIRED_FIXED_HEIGHT,
GIMP_RECTANGLE_OPTIONS_PROP_DESIRED_FIXED_SIZE_WIDTH, GIMP_RECTANGLE_OPTIONS_PROP_DESIRED_FIXED_SIZE_WIDTH,
@ -44,13 +50,11 @@ typedef enum
GIMP_RECTANGLE_OPTIONS_PROP_DEFAULT_ASPECT_DENOMINATOR, GIMP_RECTANGLE_OPTIONS_PROP_DEFAULT_ASPECT_DENOMINATOR,
GIMP_RECTANGLE_OPTIONS_PROP_OVERRIDDEN_FIXED_ASPECT, GIMP_RECTANGLE_OPTIONS_PROP_OVERRIDDEN_FIXED_ASPECT,
GIMP_RECTANGLE_OPTIONS_PROP_USE_STRING_CURRENT, GIMP_RECTANGLE_OPTIONS_PROP_USE_STRING_CURRENT,
GIMP_RECTANGLE_OPTIONS_PROP_FIXED_RULE_ACTIVE,
GIMP_RECTANGLE_OPTIONS_PROP_FIXED_RULE,
GIMP_RECTANGLE_OPTIONS_PROP_FIXED_CENTER,
GIMP_RECTANGLE_OPTIONS_PROP_FIXED_UNIT, GIMP_RECTANGLE_OPTIONS_PROP_FIXED_UNIT,
GIMP_RECTANGLE_OPTIONS_PROP_FIXED_CENTER,
GIMP_RECTANGLE_OPTIONS_PROP_CENTER_X, GIMP_RECTANGLE_OPTIONS_PROP_CENTER_X,
GIMP_RECTANGLE_OPTIONS_PROP_CENTER_Y, GIMP_RECTANGLE_OPTIONS_PROP_CENTER_Y,
GIMP_RECTANGLE_OPTIONS_PROP_UNIT,
GIMP_RECTANGLE_OPTIONS_PROP_LAST = GIMP_RECTANGLE_OPTIONS_PROP_UNIT GIMP_RECTANGLE_OPTIONS_PROP_LAST = GIMP_RECTANGLE_OPTIONS_PROP_UNIT
} GimpRectangleOptionsProp; } GimpRectangleOptionsProp;
@ -80,11 +84,16 @@ struct _GimpRectangleOptionsPrivate
gboolean highlight; gboolean highlight;
GimpRectangleGuide guide; GimpRectangleGuide guide;
gdouble x0; gdouble x;
gdouble y0; gdouble y;
gdouble width; gdouble width;
gdouble height; gdouble height;
GimpUnit unit;
gboolean fixed_rule_active;
GimpRectangleToolFixedRule fixed_rule;
gdouble desired_fixed_width; gdouble desired_fixed_width;
gdouble desired_fixed_height; gdouble desired_fixed_height;
@ -102,8 +111,10 @@ struct _GimpRectangleOptionsPrivate
gdouble default_aspect_denominator; gdouble default_aspect_denominator;
gboolean overridden_fixed_aspect; gboolean overridden_fixed_aspect;
gboolean fixed_rule_active; /* This gboolean is not part of the actual rectangle tool options,
GimpRectangleToolFixedRule fixed_rule; * and should be refactored out along with the pointers to widgets.
*/
gboolean use_string_current;
GimpUnit fixed_unit; GimpUnit fixed_unit;
@ -111,15 +122,8 @@ struct _GimpRectangleOptionsPrivate
gdouble center_x; gdouble center_x;
gdouble center_y; gdouble center_y;
GimpUnit unit;
/* options gui */ /* options gui */
/* This gboolean is not part of the actual rectangle tool options,
* and should be refactored out along with the pointers to widgets.
*/
gboolean use_string_current;
GtkWidget *auto_shrink_button; GtkWidget *auto_shrink_button;
GtkWidget *fixed_width_entry; GtkWidget *fixed_width_entry;
@ -135,19 +139,18 @@ struct _GimpRectangleOptionsPrivate
GtkWidget *width_entry; GtkWidget *width_entry;
GtkWidget *height_entry; GtkWidget *height_entry;
}; };
GType gimp_rectangle_options_interface_get_type (void) G_GNUC_CONST; GType gimp_rectangle_options_interface_get_type (void) G_GNUC_CONST;
GtkWidget * gimp_rectangle_options_gui (GimpToolOptions *tool_options); GtkWidget * gimp_rectangle_options_gui (GimpToolOptions *tool_options);
gboolean gimp_rectangle_options_fixed_rule_active (GimpRectangleOptions *rectangle_options, gboolean gimp_rectangle_options_fixed_rule_active (GimpRectangleOptions *rectangle_options,
GimpRectangleToolFixedRule fixed_rule); GimpRectangleToolFixedRule fixed_rule);
GimpRectangleOptionsPrivate * GimpRectangleOptionsPrivate *
gimp_rectangle_options_get_private (GimpRectangleOptions *options); gimp_rectangle_options_get_private (GimpRectangleOptions *options);
/* convenience functions */ /* convenience functions */
@ -162,4 +165,5 @@ void gimp_rectangle_options_get_property (GObject *object,
GValue *value, GValue *value,
GParamSpec *pspec); GParamSpec *pspec);
#endif /* __GIMP_RECTANGLE_OPTIONS_H__ */ #endif /* __GIMP_RECTANGLE_OPTIONS_H__ */

20
app/tools/gimprectangletool.c
View File

@ -2067,8 +2067,8 @@ gimp_rectangle_tool_update_options (GimpRectangleTool *rectangle,
rectangle); rectangle);
g_object_set (options, g_object_set (options,
"x0", x, "x", x,
"y0", y, "y", y,
NULL); NULL);
g_object_set (options, g_object_set (options,
@ -2154,21 +2154,21 @@ gimp_rectangle_tool_options_notify (GimpRectangleOptions *options,
if (! GIMP_TOOL (rectangle)->display) if (! GIMP_TOOL (rectangle)->display)
return; return;
if (! strcmp (pspec->name, "x0")) if (! strcmp (pspec->name, "x"))
{ {
if (private->x1 != options_private->x0) if (private->x1 != options_private->x)
gimp_rectangle_tool_synthesize_motion (rectangle, gimp_rectangle_tool_synthesize_motion (rectangle,
RECT_MOVING, RECT_MOVING,
options_private->x0, options_private->x,
private->y1); private->y1);
} }
else if (! strcmp (pspec->name, "y0")) else if (! strcmp (pspec->name, "y"))
{ {
if (private->y1 != options_private->y0) if (private->y1 != options_private->y)
gimp_rectangle_tool_synthesize_motion (rectangle, gimp_rectangle_tool_synthesize_motion (rectangle,
RECT_MOVING, RECT_MOVING,
private->x1, private->x1,
options_private->y0); options_private->y);
} }
else if (! strcmp (pspec->name, "width")) else if (! strcmp (pspec->name, "width"))
{ {
@ -2251,10 +2251,10 @@ gimp_rectangle_tool_options_notify (GimpRectangleOptions *options,
/* For some reason these needs to be set separately... */ /* For some reason these needs to be set separately... */
g_object_set (options, g_object_set (options,
"x0", x, "x", x,
NULL); NULL);
g_object_set (options, g_object_set (options,
"y0", y, "y", y,
NULL); NULL);
} }
} }