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

renamed the values of the GimpGradientSegment* enums from GIMP_GRAD_* to 

2004-06-01  Michael Natterer  <mitch@gimp.org>

	* app/core/core-enums.h: renamed the values of the
	GimpGradientSegment* enums from GIMP_GRAD_* to
	GIMP_GRADIENT_SEGMENT_* because they are exported now.

	* app/core/gimp-gradients.c
	* app/core/gimpgradient.c
	* app/actions/gradient-editor-actions.c: changed accordingly.

	* libgimp/gimpenums.h
	* plug-ins/pygimp/gimpenums.py
	* plug-ins/script-fu/script-fu-constants.c
	* tools/pdbgen/enums.pl: regenerated.
This commit is contained in:
Michael Natterer 2004-06-01 18:49:50 +00:00 committed by Michael Natterer
parent 88da8b10cc
commit c399ae1fe9
9 changed files with 103 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ChangeLog
View File

@ -1,3 +1,18 @@
2004-06-01 Michael Natterer <mitch@gimp.org>
* app/core/core-enums.h: renamed the values of the
GimpGradientSegment* enums from GIMP_GRAD_* to
GIMP_GRADIENT_SEGMENT_* because they are exported now.
* app/core/gimp-gradients.c
* app/core/gimpgradient.c
* app/actions/gradient-editor-actions.c: changed accordingly.
* libgimp/gimpenums.h
* plug-ins/pygimp/gimpenums.py
* plug-ins/script-fu/script-fu-constants.c
* tools/pdbgen/enums.pl: regenerated.
2004-06-01 Sven Neumann <sven@gimp.org>
* plug-ins/common/tiff.c: don't call gtk_entry_set_text() with a

42
app/actions/gradient-editor-actions.c
View File

@ -243,27 +243,27 @@ static GimpRadioActionEntry gradient_editor_blending_actions[] =
{
{ "gradient-editor-blending-linear", NULL,
N_("_Linear"), NULL, NULL,
GIMP_GRAD_LINEAR,
GIMP_GRADIENT_SEGMENT_LINEAR,
GIMP_HELP_GRADIENT_EDITOR_BLENDING },
{ "gradient-editor-blending-curved", NULL,
N_("_Curved"), NULL, NULL,
GIMP_GRAD_CURVED,
GIMP_GRADIENT_SEGMENT_CURVED,
GIMP_HELP_GRADIENT_EDITOR_BLENDING },
{ "gradient-editor-blending-sine", NULL,
N_("_Sinusoidal"), NULL, NULL,
GIMP_GRAD_SINE,
GIMP_GRADIENT_SEGMENT_SINE,
GIMP_HELP_GRADIENT_EDITOR_BLENDING },
{ "gradient-editor-blending-sphere-increasing", NULL,
N_("Spherical (i_ncreasing)"), NULL, NULL,
GIMP_GRAD_SPHERE_INCREASING,
GIMP_GRADIENT_SEGMENT_SPHERE_INCREASING,
GIMP_HELP_GRADIENT_EDITOR_BLENDING },
{ "gradient-editor-blending-sphere-decreasing", NULL,
N_("Spherical (_decreasing)"), NULL, NULL,
GIMP_GRAD_SPHERE_DECREASING,
GIMP_GRADIENT_SEGMENT_SPHERE_DECREASING,
GIMP_HELP_GRADIENT_EDITOR_BLENDING },
{ "gradient-editor-blending-varies", NULL,
@ -276,17 +276,17 @@ static GimpRadioActionEntry gradient_editor_coloring_actions[] =
{
{ "gradient-editor-coloring-rgb", NULL,
N_("_RGB"), NULL, NULL,
GIMP_GRAD_RGB,
GIMP_GRADIENT_SEGMENT_RGB,
GIMP_HELP_GRADIENT_EDITOR_COLORING },
{ "gradient-editor-coloring-hsv-ccw", NULL,
N_("HSV (_counter-clockwise hue)"), NULL, NULL,
GIMP_GRAD_HSV_CCW,
GIMP_GRADIENT_SEGMENT_HSV_CCW,
GIMP_HELP_GRADIENT_EDITOR_COLORING },
{ "gradient-editor-coloring-hsv-cw", NULL,
N_("HSV (clockwise _hue)"), NULL, NULL,
GIMP_GRAD_HSV_CW,
GIMP_GRADIENT_SEGMENT_HSV_CW,
GIMP_HELP_GRADIENT_EDITOR_COLORING },
{ "gradient-editor-coloring-varies", NULL,
@ -520,55 +520,53 @@ gradient_editor_actions_update (GimpActionGroup *group,
SET_SENSITIVE ("gradient-editor-blending-varies", FALSE);
SET_SENSITIVE ("gradient-editor-coloring-varies", FALSE);
SET_VISIBLE ("gradient-editor-blending-varies", ! blending_equal);
if (blending_equal)
{
SET_VISIBLE ("gradient-editor-blending-varies", FALSE);
switch (editor->control_sel_l->type)
{
case GIMP_GRAD_LINEAR:
case GIMP_GRADIENT_SEGMENT_LINEAR:
SET_ACTIVE ("gradient-editor-blending-linear", TRUE);
break;
case GIMP_GRAD_CURVED:
case GIMP_GRADIENT_SEGMENT_CURVED:
SET_ACTIVE ("gradient-editor-blending-curved", TRUE);
break;
case GIMP_GRAD_SINE:
case GIMP_GRADIENT_SEGMENT_SINE:
SET_ACTIVE ("gradient-editor-blending-sine", TRUE);
break;
case GIMP_GRAD_SPHERE_INCREASING:
case GIMP_GRADIENT_SEGMENT_SPHERE_INCREASING:
SET_ACTIVE ("gradient-editor-blending-sphere-increasing", TRUE);
break;
case GIMP_GRAD_SPHERE_DECREASING:
case GIMP_GRADIENT_SEGMENT_SPHERE_DECREASING:
SET_ACTIVE ("gradient-editor-blending-sphere-decreasing", TRUE);
break;
}
}
else
{
SET_VISIBLE ("gradient-editor-blending-varies", TRUE);
SET_ACTIVE ("gradient-editor-blending-varies", TRUE);
}
SET_VISIBLE ("gradient-editor-coloring-varies", ! coloring_equal);
if (coloring_equal)
{
SET_VISIBLE ("gradient-editor-coloring-varies", FALSE);
switch (editor->control_sel_l->color)
{
case GIMP_GRAD_RGB:
case GIMP_GRADIENT_SEGMENT_RGB:
SET_ACTIVE ("gradient-editor-coloring-rgb", TRUE);
break;
case GIMP_GRAD_HSV_CCW:
case GIMP_GRADIENT_SEGMENT_HSV_CCW:
SET_ACTIVE ("gradient-editor-coloring-hsv-ccw", TRUE);
break;
case GIMP_GRAD_HSV_CW:
case GIMP_GRADIENT_SEGMENT_HSV_CW:
SET_ACTIVE ("gradient-editor-coloring-hsv-cw", TRUE);
break;
}
}
else
{
SET_VISIBLE ("gradient-editor-coloring-varies", TRUE);
SET_ACTIVE ("gradient-editor-coloring-varies", TRUE);
}

16
app/core/core-enums.h
View File

@ -580,18 +580,18 @@ typedef enum /*< skip >*/
typedef enum /*< skip >*/
{
GIMP_GRAD_LINEAR = 0,
GIMP_GRAD_CURVED,
GIMP_GRAD_SINE,
GIMP_GRAD_SPHERE_INCREASING,
GIMP_GRAD_SPHERE_DECREASING
GIMP_GRADIENT_SEGMENT_LINEAR,
GIMP_GRADIENT_SEGMENT_CURVED,
GIMP_GRADIENT_SEGMENT_SINE,
GIMP_GRADIENT_SEGMENT_SPHERE_INCREASING,
GIMP_GRADIENT_SEGMENT_SPHERE_DECREASING
} GimpGradientSegmentType;
typedef enum /*< skip >*/
{
GIMP_GRAD_RGB, /* normal RGB */
GIMP_GRAD_HSV_CCW, /* counterclockwise hue */
GIMP_GRAD_HSV_CW /* clockwise hue */
GIMP_GRADIENT_SEGMENT_RGB, /* normal RGB */
GIMP_GRADIENT_SEGMENT_HSV_CCW, /* counterclockwise hue */
GIMP_GRADIENT_SEGMENT_HSV_CW /* clockwise hue */
} GimpGradientSegmentColor;
typedef enum /*< skip >*/

4
app/core/gimp-gradients.c
View File

@ -74,12 +74,12 @@ gimp_gradients_init (Gimp *gimp)
gradient = gimp_gradients_add_gradient (gimp,
_("FG to BG (HSV counter-clockwise)"),
FG_BG_HSV_CCW_KEY);
gradient->segments->color = GIMP_GRAD_HSV_CCW;
gradient->segments->color = GIMP_GRADIENT_SEGMENT_HSV_CCW;
gradient = gimp_gradients_add_gradient (gimp,
_("FG to BG (HSV clockwise hue)"),
FG_BG_HSV_CW_KEY);
gradient->segments->color = GIMP_GRAD_HSV_CW;
gradient->segments->color = GIMP_GRADIENT_SEGMENT_HSV_CW;
gradient = gimp_gradients_add_gradient (gimp,
_("FG to Transparent"),

36
app/core/gimpgradient.c
View File

@ -683,23 +683,23 @@ gimp_gradient_get_color_at (GimpGradient *gradient,
switch (seg->type)
{
case GIMP_GRAD_LINEAR:
case GIMP_GRADIENT_SEGMENT_LINEAR:
factor = gimp_gradient_calc_linear_factor (middle, pos);
break;
case GIMP_GRAD_CURVED:
case GIMP_GRADIENT_SEGMENT_CURVED:
factor = gimp_gradient_calc_curved_factor (middle, pos);
break;
case GIMP_GRAD_SINE:
case GIMP_GRADIENT_SEGMENT_SINE:
factor = gimp_gradient_calc_sine_factor (middle, pos);
break;
case GIMP_GRAD_SPHERE_INCREASING:
case GIMP_GRADIENT_SEGMENT_SPHERE_INCREASING:
factor = gimp_gradient_calc_sphere_increasing_factor (middle, pos);
break;
case GIMP_GRAD_SPHERE_DECREASING:
case GIMP_GRADIENT_SEGMENT_SPHERE_DECREASING:
factor = gimp_gradient_calc_sphere_decreasing_factor (middle, pos);
break;
@ -711,7 +711,7 @@ gimp_gradient_get_color_at (GimpGradient *gradient,
/* Calculate color components */
if (seg->color == GIMP_GRAD_RGB)
if (seg->color == GIMP_GRADIENT_SEGMENT_RGB)
{
rgb.r =
seg->left_color.r + (seg->right_color.r - seg->left_color.r) * factor;
@ -735,7 +735,7 @@ gimp_gradient_get_color_at (GimpGradient *gradient,
switch (seg->color)
{
case GIMP_GRAD_HSV_CCW:
case GIMP_GRADIENT_SEGMENT_HSV_CCW:
if (left_hsv.h < right_hsv.h)
{
left_hsv.h += (right_hsv.h - left_hsv.h) * factor;
@ -749,7 +749,7 @@ gimp_gradient_get_color_at (GimpGradient *gradient,
}
break;
case GIMP_GRAD_HSV_CW:
case GIMP_GRADIENT_SEGMENT_HSV_CW:
if (right_hsv.h < left_hsv.h)
{
left_hsv.h -= (left_hsv.h - right_hsv.h) * factor;
@ -920,8 +920,8 @@ gimp_gradient_segment_new (void)
gimp_rgba_set (&seg->left_color, 0.0, 0.0, 0.0, 1.0);
gimp_rgba_set (&seg->right_color, 1.0, 1.0, 1.0, 1.0);
seg->type = GIMP_GRAD_LINEAR;
seg->color = GIMP_GRAD_RGB;
seg->type = GIMP_GRADIENT_SEGMENT_LINEAR;
seg->color = GIMP_GRADIENT_SEGMENT_RGB;
seg->prev = seg->next = NULL;
@ -1541,12 +1541,12 @@ gimp_gradient_segment_range_flip (GimpGradient *gradient,
switch (oseg->type)
{
case GIMP_GRAD_SPHERE_INCREASING:
seg->type = GIMP_GRAD_SPHERE_DECREASING;
case GIMP_GRADIENT_SEGMENT_SPHERE_INCREASING:
seg->type = GIMP_GRADIENT_SEGMENT_SPHERE_DECREASING;
break;
case GIMP_GRAD_SPHERE_DECREASING:
seg->type = GIMP_GRAD_SPHERE_INCREASING;
case GIMP_GRADIENT_SEGMENT_SPHERE_DECREASING:
seg->type = GIMP_GRADIENT_SEGMENT_SPHERE_INCREASING;
break;
default:
@ -1555,12 +1555,12 @@ gimp_gradient_segment_range_flip (GimpGradient *gradient,
switch (oseg->color)
{
case GIMP_GRAD_HSV_CCW:
seg->color = GIMP_GRAD_HSV_CW;
case GIMP_GRADIENT_SEGMENT_HSV_CCW:
seg->color = GIMP_GRADIENT_SEGMENT_HSV_CW;
break;
case GIMP_GRAD_HSV_CW:
seg->color = GIMP_GRAD_HSV_CCW;
case GIMP_GRADIENT_SEGMENT_HSV_CW:
seg->color = GIMP_GRADIENT_SEGMENT_HSV_CCW;
break;
default:

16
libgimp/gimpenums.h
View File

@ -126,18 +126,18 @@ typedef enum
typedef enum
{
GIMP_GRAD_RGB,
GIMP_GRAD_HSV_CCW,
GIMP_GRAD_HSV_CW
GIMP_GRADIENT_SEGMENT_RGB,
GIMP_GRADIENT_SEGMENT_HSV_CCW,
GIMP_GRADIENT_SEGMENT_HSV_CW
} GimpGradientSegmentColor;
typedef enum
{
GIMP_GRAD_LINEAR,
GIMP_GRAD_CURVED,
GIMP_GRAD_SINE,
GIMP_GRAD_SPHERE_INCREASING,
GIMP_GRAD_SPHERE_DECREASING
GIMP_GRADIENT_SEGMENT_LINEAR,
GIMP_GRADIENT_SEGMENT_CURVED,
GIMP_GRADIENT_SEGMENT_SINE,
GIMP_GRADIENT_SEGMENT_SPHERE_INCREASING,
GIMP_GRADIENT_SEGMENT_SPHERE_DECREASING
} GimpGradientSegmentType;
typedef enum

16
plug-ins/pygimp/gimpenums.py
View File

@ -108,16 +108,16 @@ TRANSPARENT_FILL = 3
PATTERN_FILL = 4
# GimpGradientSegmentColor
GRAD_RGB = 0
GRAD_HSV_CCW = 1
GRAD_HSV_CW = 2
GRADIENT_SEGMENT_RGB = 0
GRADIENT_SEGMENT_HSV_CCW = 1
GRADIENT_SEGMENT_HSV_CW = 2
# GimpGradientSegmentType
GRAD_LINEAR = 0
GRAD_CURVED = 1
GRAD_SINE = 2
GRAD_SPHERE_INCREASING = 3
GRAD_SPHERE_DECREASING = 4
GRADIENT_SEGMENT_LINEAR = 0
GRADIENT_SEGMENT_CURVED = 1
GRADIENT_SEGMENT_SINE = 2
GRADIENT_SEGMENT_SPHERE_INCREASING = 3
GRADIENT_SEGMENT_SPHERE_DECREASING = 4
# GimpGradientType
GRADIENT_LINEAR = 0

16
plug-ins/script-fu/script-fu-constants.c
View File

@ -84,15 +84,15 @@ init_generated_constants (void)
setvar (cintern ("TRANSPARENT-FILL"), flocons (3), NIL);
setvar (cintern ("PATTERN-FILL"), flocons (4), NIL);
setvar (cintern ("GRAD-RGB"), flocons (0), NIL);
setvar (cintern ("GRAD-HSV-CCW"), flocons (1), NIL);
setvar (cintern ("GRAD-HSV-CW"), flocons (2), NIL);
setvar (cintern ("GRADIENT-SEGMENT-RGB"), flocons (0), NIL);
setvar (cintern ("GRADIENT-SEGMENT-HSV-CCW"), flocons (1), NIL);
setvar (cintern ("GRADIENT-SEGMENT-HSV-CW"), flocons (2), NIL);
setvar (cintern ("GRAD-LINEAR"), flocons (0), NIL);
setvar (cintern ("GRAD-CURVED"), flocons (1), NIL);
setvar (cintern ("GRAD-SINE"), flocons (2), NIL);
setvar (cintern ("GRAD-SPHERE-INCREASING"), flocons (3), NIL);
setvar (cintern ("GRAD-SPHERE-DECREASING"), flocons (4), NIL);
setvar (cintern ("GRADIENT-SEGMENT-LINEAR"), flocons (0), NIL);
setvar (cintern ("GRADIENT-SEGMENT-CURVED"), flocons (1), NIL);
setvar (cintern ("GRADIENT-SEGMENT-SINE"), flocons (2), NIL);
setvar (cintern ("GRADIENT-SEGMENT-SPHERE-INCREASING"), flocons (3), NIL);
setvar (cintern ("GRADIENT-SEGMENT-SPHERE-DECREASING"), flocons (4), NIL);
setvar (cintern ("GRADIENT-LINEAR"), flocons (0), NIL);
setvar (cintern ("GRADIENT-BILINEAR"), flocons (1), NIL);

28
tools/pdbgen/enums.pl
View File

@ -361,22 +361,26 @@ package Gimp::CodeGen::enums;
GimpGradientSegmentType =>
{ contig => 1,
header => 'core/core-enums.h',
symbols => [ qw(GIMP_GRAD_LINEAR GIMP_GRAD_CURVED GIMP_GRAD_SINE
GIMP_GRAD_SPHERE_INCREASING
GIMP_GRAD_SPHERE_DECREASING) ],
mapping => { GIMP_GRAD_LINEAR => '0',
GIMP_GRAD_CURVED => '1',
GIMP_GRAD_SINE => '2',
GIMP_GRAD_SPHERE_INCREASING => '3',
GIMP_GRAD_SPHERE_DECREASING => '4' }
symbols => [ qw(GIMP_GRADIENT_SEGMENT_LINEAR
GIMP_GRADIENT_SEGMENT_CURVED
GIMP_GRADIENT_SEGMENT_SINE
GIMP_GRADIENT_SEGMENT_SPHERE_INCREASING
GIMP_GRADIENT_SEGMENT_SPHERE_DECREASING) ],
mapping => { GIMP_GRADIENT_SEGMENT_LINEAR => '0',
GIMP_GRADIENT_SEGMENT_CURVED => '1',
GIMP_GRADIENT_SEGMENT_SINE => '2',
GIMP_GRADIENT_SEGMENT_SPHERE_INCREASING => '3',
GIMP_GRADIENT_SEGMENT_SPHERE_DECREASING => '4' }
},
GimpGradientSegmentColor =>
{ contig => 1,
header => 'core/core-enums.h',
symbols => [ qw(GIMP_GRAD_RGB GIMP_GRAD_HSV_CCW GIMP_GRAD_HSV_CW) ],
mapping => { GIMP_GRAD_RGB => '0',
GIMP_GRAD_HSV_CCW => '1',
GIMP_GRAD_HSV_CW => '2' }
symbols => [ qw(GIMP_GRADIENT_SEGMENT_RGB
GIMP_GRADIENT_SEGMENT_HSV_CCW
GIMP_GRADIENT_SEGMENT_HSV_CW) ],
mapping => { GIMP_GRADIENT_SEGMENT_RGB => '0',
GIMP_GRADIENT_SEGMENT_HSV_CCW => '1',
GIMP_GRADIENT_SEGMENT_HSV_CW => '2' }
},
GimpMaskApplyMode =>
{ contig => 1,