callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app: rename properties s/(horizontal|vertical)-position/\1-axis-position/.

Browse Source 
"Horizontal position" and "Vertical position" could be mistaken as
meaning respectively the x and y coordinates, hence the vertical (resp.
horizontal) guide's positions.
The more accurate "horizontal-axis-position" and "vertical-axis-position"
namings are less misleading.
This commit is contained in:
Jehan
2016-07-18 02:33:25 +02:00
parent 8cf8600b93
commit 08ffc1035b
2 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
app/core/gimpsymmetry-mirror.c
View File

@ -50,8 +50,8 @@ enum
PROP_VERTICAL_SYMMETRY, PROP_VERTICAL_SYMMETRY,
PROP_POINT_SYMMETRY, PROP_POINT_SYMMETRY,
PROP_DISABLE_TRANSFORMATION, PROP_DISABLE_TRANSFORMATION,
PROP_HORIZONTAL_POSITION, PROP_HORIZONTAL_AXIS_POSITION,
PROP_VERTICAL_POSITION PROP_VERTICAL_AXIS_POSITION
}; };
@ -157,27 +157,27 @@ gimp_mirror_class_init (GimpMirrorClass *klass)
GIMP_PARAM_STATIC_STRINGS | GIMP_PARAM_STATIC_STRINGS |
GIMP_SYMMETRY_PARAM_GUI); GIMP_SYMMETRY_PARAM_GUI);
GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_HORIZONTAL_POSITION, GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_HORIZONTAL_AXIS_POSITION,
"horizontal-position", "horizontal-axis-position",
_("Horizontal axis position"), _("Horizontal axis position"),
NULL, NULL,
0.0, G_MAXDOUBLE, 0.0, 0.0, G_MAXDOUBLE, 0.0,
GIMP_PARAM_STATIC_STRINGS | GIMP_PARAM_STATIC_STRINGS |
GIMP_SYMMETRY_PARAM_GUI); GIMP_SYMMETRY_PARAM_GUI);
pspec = g_object_class_find_property (object_class, "horizontal-position"); pspec = g_object_class_find_property (object_class, "horizontal-axis-position");
gegl_param_spec_set_property_key (pspec, "unit", "pixel-coordinate"); gegl_param_spec_set_property_key (pspec, "unit", "pixel-coordinate");
gegl_param_spec_set_property_key (pspec, "axis", "y"); gegl_param_spec_set_property_key (pspec, "axis", "y");
GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_VERTICAL_POSITION, GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_VERTICAL_AXIS_POSITION,
"vertical-position", "vertical-axis-position",
_("Vertical axis position"), _("Vertical axis position"),
NULL, NULL,
0.0, G_MAXDOUBLE, 0.0, 0.0, G_MAXDOUBLE, 0.0,
GIMP_PARAM_STATIC_STRINGS | GIMP_PARAM_STATIC_STRINGS |
GIMP_SYMMETRY_PARAM_GUI); GIMP_SYMMETRY_PARAM_GUI);
pspec = g_object_class_find_property (object_class, "vertical-position"); pspec = g_object_class_find_property (object_class, "vertical-axis-position");
gegl_param_spec_set_property_key (pspec, "unit", "pixel-coordinate"); gegl_param_spec_set_property_key (pspec, "unit", "pixel-coordinate");
gegl_param_spec_set_property_key (pspec, "axis", "x"); gegl_param_spec_set_property_key (pspec, "axis", "x");
} }
@ -255,11 +255,11 @@ gimp_mirror_set_property (GObject *object,
mirror->disable_transformation = g_value_get_boolean (value); mirror->disable_transformation = g_value_get_boolean (value);
break; break;
case PROP_HORIZONTAL_POSITION: case PROP_HORIZONTAL_AXIS_POSITION:
if (g_value_get_double (value) > 0.0 && if (g_value_get_double (value) > 0.0 &&
g_value_get_double (value) < (gdouble) gimp_image_get_height (image)) g_value_get_double (value) < (gdouble) gimp_image_get_height (image))
{ {
mirror->horizontal_position = g_value_get_double (value); mirror->horizontal_axis_position = g_value_get_double (value);
if (mirror->horizontal_guide) if (mirror->horizontal_guide)
{ {
@ -267,7 +267,7 @@ gimp_mirror_set_property (GObject *object,
gimp_mirror_guide_position_cb, gimp_mirror_guide_position_cb,
mirror); mirror);
gimp_image_move_guide (image, mirror->horizontal_guide, gimp_image_move_guide (image, mirror->horizontal_guide,
mirror->horizontal_position, mirror->horizontal_axis_position,
FALSE); FALSE);
g_signal_handlers_unblock_by_func (mirror->horizontal_guide, g_signal_handlers_unblock_by_func (mirror->horizontal_guide,
gimp_mirror_guide_position_cb, gimp_mirror_guide_position_cb,
@ -276,11 +276,11 @@ gimp_mirror_set_property (GObject *object,
} }
break; break;
case PROP_VERTICAL_POSITION: case PROP_VERTICAL_AXIS_POSITION:
if (g_value_get_double (value) > 0.0 && if (g_value_get_double (value) > 0.0 &&
g_value_get_double (value) < (gdouble) gimp_image_get_width (image)) g_value_get_double (value) < (gdouble) gimp_image_get_width (image))
{ {
mirror->vertical_position = g_value_get_double (value); mirror->vertical_axis_position = g_value_get_double (value);
if (mirror->vertical_guide) if (mirror->vertical_guide)
{ {
@ -288,7 +288,7 @@ gimp_mirror_set_property (GObject *object,
gimp_mirror_guide_position_cb, gimp_mirror_guide_position_cb,
mirror); mirror);
gimp_image_move_guide (image, mirror->vertical_guide, gimp_image_move_guide (image, mirror->vertical_guide,
mirror->vertical_position, mirror->vertical_axis_position,
FALSE); FALSE);
g_signal_handlers_unblock_by_func (mirror->vertical_guide, g_signal_handlers_unblock_by_func (mirror->vertical_guide,
gimp_mirror_guide_position_cb, gimp_mirror_guide_position_cb,
@ -325,11 +325,11 @@ gimp_mirror_get_property (GObject *object,
case PROP_DISABLE_TRANSFORMATION: case PROP_DISABLE_TRANSFORMATION:
g_value_set_boolean (value, mirror->disable_transformation); g_value_set_boolean (value, mirror->disable_transformation);
break; break;
case PROP_HORIZONTAL_POSITION: case PROP_HORIZONTAL_AXIS_POSITION:
g_value_set_double (value, mirror->horizontal_position); g_value_set_double (value, mirror->horizontal_axis_position);
break; break;
case PROP_VERTICAL_POSITION: case PROP_VERTICAL_AXIS_POSITION:
g_value_set_double (value, mirror->vertical_position); g_value_set_double (value, mirror->vertical_axis_position);
break; break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
@ -353,22 +353,22 @@ gimp_mirror_update_strokes (GimpSymmetry *sym,
if (mirror->horizontal_mirror) if (mirror->horizontal_mirror)
{ {
coords = g_memdup (origin, sizeof (GimpCoords)); coords = g_memdup (origin, sizeof (GimpCoords));
coords->y = 2.0 * mirror->horizontal_position - origin->y; coords->y = 2.0 * mirror->horizontal_axis_position - origin->y;
strokes = g_list_prepend (strokes, coords); strokes = g_list_prepend (strokes, coords);
} }
if (mirror->vertical_mirror) if (mirror->vertical_mirror)
{ {
coords = g_memdup (origin, sizeof (GimpCoords)); coords = g_memdup (origin, sizeof (GimpCoords));
coords->x = 2.0 * mirror->vertical_position - origin->x; coords->x = 2.0 * mirror->vertical_axis_position - origin->x;
strokes = g_list_prepend (strokes, coords); strokes = g_list_prepend (strokes, coords);
} }
if (mirror->point_symmetry) if (mirror->point_symmetry)
{ {
coords = g_memdup (origin, sizeof (GimpCoords)); coords = g_memdup (origin, sizeof (GimpCoords));
coords->x = 2.0 * mirror->vertical_position - origin->x; coords->x = 2.0 * mirror->vertical_axis_position - origin->x;
coords->y = 2.0 * mirror->horizontal_position - origin->y; coords->y = 2.0 * mirror->horizontal_axis_position - origin->y;
strokes = g_list_prepend (strokes, coords); strokes = g_list_prepend (strokes, coords);
} }
@ -484,13 +484,13 @@ gimp_mirror_add_guide (GimpMirror *mirror,
if (orientation == GIMP_ORIENTATION_HORIZONTAL) if (orientation == GIMP_ORIENTATION_HORIZONTAL)
{ {
/* Mirror guide position at first activation is at canvas middle. */ /* Mirror guide position at first activation is at canvas middle. */
if (mirror->horizontal_position < 1.0) if (mirror->horizontal_axis_position < 1.0)
position = gimp_image_get_height (image) / 2.0; position = gimp_image_get_height (image) / 2.0;
else else
position = mirror->horizontal_position; position = mirror->horizontal_axis_position;
g_object_set (mirror, g_object_set (mirror,
"horizontal-position", position, "horizontal-axis-position", position,
NULL); NULL);
mirror->horizontal_guide = guide; mirror->horizontal_guide = guide;
@ -498,13 +498,13 @@ gimp_mirror_add_guide (GimpMirror *mirror,
else else
{ {
/* Mirror guide position at first activation is at canvas middle. */ /* Mirror guide position at first activation is at canvas middle. */
if (mirror->vertical_position < 1.0) if (mirror->vertical_axis_position < 1.0)
position = gimp_image_get_width (image) / 2.0; position = gimp_image_get_width (image) / 2.0;
else else
position = mirror->vertical_position; position = mirror->vertical_axis_position;
g_object_set (mirror, g_object_set (mirror,
"vertical-position", position, "vertical-axis-position", position,
NULL); NULL);
mirror->vertical_guide = guide; mirror->vertical_guide = guide;
@ -570,7 +570,7 @@ gimp_mirror_guide_removed_cb (GObject *object,
mirror->horizontal_mirror = FALSE; mirror->horizontal_mirror = FALSE;
mirror->point_symmetry = FALSE; mirror->point_symmetry = FALSE;
g_object_set (mirror, g_object_set (mirror,
"horizontal-position", 0.0, "horizontal-axis-position", 0.0,
NULL); NULL);
if (mirror->vertical_guide && if (mirror->vertical_guide &&
@ -597,7 +597,7 @@ gimp_mirror_guide_removed_cb (GObject *object,
mirror->vertical_mirror = FALSE; mirror->vertical_mirror = FALSE;
mirror->point_symmetry = FALSE; mirror->point_symmetry = FALSE;
g_object_set (mirror, g_object_set (mirror,
"vertical-position", 0.0, "vertical-axis-position", 0.0,
NULL); NULL);
if (mirror->horizontal_guide && if (mirror->horizontal_guide &&
@ -641,13 +641,13 @@ gimp_mirror_guide_position_cb (GObject *object,
if (guide == mirror->horizontal_guide) if (guide == mirror->horizontal_guide)
{ {
g_object_set (mirror, g_object_set (mirror,
"horizontal-position", (gdouble) gimp_guide_get_position (guide), "horizontal-axis-position", (gdouble) gimp_guide_get_position (guide),
NULL); NULL);
} }
else if (guide == mirror->vertical_guide) else if (guide == mirror->vertical_guide)
{ {
g_object_set (mirror, g_object_set (mirror,
"vertical-position", (gdouble) gimp_guide_get_position (guide), "vertical-axis-position", (gdouble) gimp_guide_get_position (guide),
NULL); NULL);
} }
} }

4
app/core/gimpsymmetry-mirror.h
View File

@ -44,8 +44,8 @@ struct _GimpMirror
gboolean point_symmetry; gboolean point_symmetry;
gboolean disable_transformation; gboolean disable_transformation;
gdouble horizontal_position; gdouble horizontal_axis_position;
gdouble vertical_position; gdouble vertical_axis_position;
GimpGuide *horizontal_guide; GimpGuide *horizontal_guide;
GimpGuide *vertical_guide; GimpGuide *vertical_guide;