Added "default-aspect-numerator", "default-aspect-denominator",

2007-08-10  Martin Nordholts  <martinn@svn.gnome.org>

	* app/tools/gimprectangleoptions.c: Added
	"default-aspect-numerator", "default-aspect-denominator",
	"default-fixed-size-width" and "default-fixed-size-height" as
	non-serialized tool options, and "overridden-fixed-aspect" and
	"overridden-fixed-size" as serialized ones.

	* app/widgets/gimppropwidgets.c (gimp_prop_number_pair_entry_*):
	Added support for the new GimpRectangleOptions.

svn path=/trunk/; revision=23187
This commit is contained in:
Martin Nordholts
2007-08-10 14:57:27 +00:00
committed by Martin Nordholts
parent f1fb36551d
commit 49df5ada5b
5 changed files with 273 additions and 36 deletions

View File

@ -35,8 +35,14 @@ typedef enum
GIMP_RECTANGLE_OPTIONS_PROP_DESIRED_FIXED_HEIGHT,
GIMP_RECTANGLE_OPTIONS_PROP_DESIRED_FIXED_SIZE_WIDTH,
GIMP_RECTANGLE_OPTIONS_PROP_DESIRED_FIXED_SIZE_HEIGHT,
GIMP_RECTANGLE_OPTIONS_PROP_DEFAULT_FIXED_SIZE_WIDTH,
GIMP_RECTANGLE_OPTIONS_PROP_DEFAULT_FIXED_SIZE_HEIGHT,
GIMP_RECTANGLE_OPTIONS_PROP_OVERRIDDEN_FIXED_SIZE,
GIMP_RECTANGLE_OPTIONS_PROP_ASPECT_NUMERATOR,
GIMP_RECTANGLE_OPTIONS_PROP_ASPECT_DENOMINATOR,
GIMP_RECTANGLE_OPTIONS_PROP_DEFAULT_ASPECT_NUMERATOR,
GIMP_RECTANGLE_OPTIONS_PROP_DEFAULT_ASPECT_DENOMINATOR,
GIMP_RECTANGLE_OPTIONS_PROP_OVERRIDDEN_FIXED_ASPECT,
GIMP_RECTANGLE_OPTIONS_PROP_FIXED_RULE_ACTIVE,
GIMP_RECTANGLE_OPTIONS_PROP_FIXED_RULE,
GIMP_RECTANGLE_OPTIONS_PROP_FIXED_CENTER,
@ -77,17 +83,23 @@ struct _GimpRectangleOptionsPrivate
gdouble width;
gdouble height;
/* Width and height for Fixed: Width and Fixed: Height */
gdouble desired_fixed_width;
gdouble desired_fixed_height;
/* Width and height for Fixed: Size */
gdouble desired_fixed_size_width;
gdouble desired_fixed_size_height;
gdouble default_fixed_size_width;
gdouble default_fixed_size_height;
gboolean overridden_fixed_size;
gdouble aspect_numerator;
gdouble aspect_denominator;
gdouble default_aspect_numerator;
gdouble default_aspect_denominator;
gboolean overridden_fixed_aspect;
gboolean fixed_rule_active;
GimpRectangleToolFixedRule fixed_rule;