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

app, libgimp: rename GIMP_LAYER_MODE_NORMAL to NORMAL_LINEAR 

and NORMAL_NON_LINEAR to NORMAL, so it's consistent with all other
modes.
This commit is contained in:
Michael Natterer 2017-01-28 21:38:52 +01:00
parent cdfbc74297
commit 5389e8e417
14 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/core/core-enums.c
View File

@ -289,7 +289,7 @@ gimp_layer_mode_get_type (void)
{
static const GEnumValue values[] =
{
{ GIMP_LAYER_MODE_NORMAL_NON_LINEAR, "GIMP_LAYER_MODE_NORMAL_NON_LINEAR", "normal-non-linear" },
{ GIMP_LAYER_MODE_NORMAL, "GIMP_LAYER_MODE_NORMAL", "normal" },
{ GIMP_LAYER_MODE_DISSOLVE, "GIMP_LAYER_MODE_DISSOLVE", "dissolve" },
{ GIMP_LAYER_MODE_BEHIND, "GIMP_LAYER_MODE_BEHIND", "behind" },
{ GIMP_LAYER_MODE_MULTIPLY_LEGACY, "GIMP_LAYER_MODE_MULTIPLY_LEGACY", "multiply-legacy" },
@ -317,7 +317,7 @@ gimp_layer_mode_get_type (void)
{ GIMP_LAYER_MODE_LCH_CHROMA, "GIMP_LAYER_MODE_LCH_CHROMA", "lch-chroma" },
{ GIMP_LAYER_MODE_LCH_COLOR, "GIMP_LAYER_MODE_LCH_COLOR", "lch-color" },
{ GIMP_LAYER_MODE_LCH_LIGHTNESS, "GIMP_LAYER_MODE_LCH_LIGHTNESS", "lch-lightness" },
{ GIMP_LAYER_MODE_NORMAL, "GIMP_LAYER_MODE_NORMAL", "normal" },
{ GIMP_LAYER_MODE_NORMAL_LINEAR, "GIMP_LAYER_MODE_NORMAL_LINEAR", "normal-linear" },
{ GIMP_LAYER_MODE_BEHIND_LINEAR, "GIMP_LAYER_MODE_BEHIND_LINEAR", "behind-linear" },
{ GIMP_LAYER_MODE_MULTIPLY, "GIMP_LAYER_MODE_MULTIPLY", "multiply" },
{ GIMP_LAYER_MODE_MULTIPLY_LINEAR, "GIMP_LAYER_MODE_MULTIPLY_LINEAR", "multiply-linear" },
@ -368,7 +368,7 @@ gimp_layer_mode_get_type (void)
static const GimpEnumDesc descs[] =
{
{ GIMP_LAYER_MODE_NORMAL_NON_LINEAR, NC_("layer-mode", "Normal"), NULL },
{ GIMP_LAYER_MODE_NORMAL, NC_("layer-mode", "Normal"), NULL },
{ GIMP_LAYER_MODE_DISSOLVE, NC_("layer-mode", "Dissolve"), NULL },
{ GIMP_LAYER_MODE_BEHIND, NC_("layer-mode", "Behind"), NULL },
{ GIMP_LAYER_MODE_MULTIPLY_LEGACY, NC_("layer-mode", "Multiply (legacy)"), NULL },
@ -396,7 +396,7 @@ gimp_layer_mode_get_type (void)
{ GIMP_LAYER_MODE_LCH_CHROMA, NC_("layer-mode", "Chroma (LCH)"), NULL },
{ GIMP_LAYER_MODE_LCH_COLOR, NC_("layer-mode", "Color (LCH)"), NULL },
{ GIMP_LAYER_MODE_LCH_LIGHTNESS, NC_("layer-mode", "Lightness (LCH)"), NULL },
{ GIMP_LAYER_MODE_NORMAL, NC_("layer-mode", "Normal (linear)"), NULL },
{ GIMP_LAYER_MODE_NORMAL_LINEAR, NC_("layer-mode", "Normal (linear)"), NULL },
{ GIMP_LAYER_MODE_BEHIND_LINEAR, NC_("layer-mode", "Behind (linear)"), NULL },
{ GIMP_LAYER_MODE_MULTIPLY, NC_("layer-mode", "Multiply"), NULL },
{ GIMP_LAYER_MODE_MULTIPLY_LINEAR, NC_("layer-mode", "Multiply (linear)"), NULL },

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

@ -155,7 +155,7 @@ GType gimp_layer_mode_get_type (void) G_GNUC_CONST;
typedef enum
{
/* Modes that exist since ancient times */
GIMP_LAYER_MODE_NORMAL_NON_LINEAR, /*< desc="Normal" >*/
GIMP_LAYER_MODE_NORMAL, /*< desc="Normal" >*/
GIMP_LAYER_MODE_DISSOLVE, /*< desc="Dissolve" >*/
GIMP_LAYER_MODE_BEHIND, /*< desc="Behind" >*/
GIMP_LAYER_MODE_MULTIPLY_LEGACY, /*< desc="Multiply (legacy)" >*/
@ -187,7 +187,7 @@ typedef enum
GIMP_LAYER_MODE_LCH_LIGHTNESS, /*< desc="Lightness (LCH)" >*/
/* Since 2.10 */
GIMP_LAYER_MODE_NORMAL, /*< desc="Normal (linear)" >*/
GIMP_LAYER_MODE_NORMAL_LINEAR, /*< desc="Normal (linear)" >*/
GIMP_LAYER_MODE_BEHIND_LINEAR, /*< desc="Behind (linear)" >*/
GIMP_LAYER_MODE_MULTIPLY, /*< desc="Multiply" >*/
GIMP_LAYER_MODE_MULTIPLY_LINEAR, /*< desc="Multiply (linear)" >*/

18
app/core/gimp-layer-modes.c
View File

@ -66,7 +66,7 @@ gimp_layer_mode_is_linear (GimpLayerMode mode)
{
switch (mode)
{
case GIMP_LAYER_MODE_NORMAL_NON_LINEAR:
case GIMP_LAYER_MODE_NORMAL:
return FALSE;
case GIMP_LAYER_MODE_DISSOLVE:
@ -108,7 +108,7 @@ gimp_layer_mode_is_linear (GimpLayerMode mode)
case GIMP_LAYER_MODE_LCH_LIGHTNESS:
return TRUE;
case GIMP_LAYER_MODE_NORMAL:
case GIMP_LAYER_MODE_NORMAL_LINEAR:
return TRUE;
case GIMP_LAYER_MODE_MULTIPLY:
@ -171,7 +171,7 @@ gimp_layer_mode_get_blend_space (GimpLayerMode mode)
{
switch (mode)
{
case GIMP_LAYER_MODE_NORMAL_NON_LINEAR:
case GIMP_LAYER_MODE_NORMAL:
return GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL;
case GIMP_LAYER_MODE_DISSOLVE:
@ -211,7 +211,7 @@ gimp_layer_mode_get_blend_space (GimpLayerMode mode)
case GIMP_LAYER_MODE_LCH_LIGHTNESS:
return GIMP_LAYER_COLOR_SPACE_LAB;
case GIMP_LAYER_MODE_NORMAL:
case GIMP_LAYER_MODE_NORMAL_LINEAR:
return GIMP_LAYER_COLOR_SPACE_RGB_LINEAR;
case GIMP_LAYER_MODE_MULTIPLY:
@ -280,8 +280,8 @@ gimp_layer_mode_get_composite_mode (GimpLayerMode mode)
{
switch (mode)
{
case GIMP_LAYER_MODE_NORMAL_NON_LINEAR:
case GIMP_LAYER_MODE_NORMAL:
case GIMP_LAYER_MODE_NORMAL_LINEAR:
case GIMP_LAYER_MODE_DISSOLVE:
case GIMP_LAYER_MODE_BEHIND:
case GIMP_LAYER_MODE_BEHIND_LINEAR:
@ -369,8 +369,8 @@ gimp_layer_mode_get_operation (GimpLayerMode mode)
{
switch (mode)
{
case GIMP_LAYER_MODE_NORMAL_NON_LINEAR:
case GIMP_LAYER_MODE_NORMAL:
case GIMP_LAYER_MODE_NORMAL_LINEAR:
return "gimp:normal";
case GIMP_LAYER_MODE_DISSOLVE:
@ -481,10 +481,10 @@ gimp_layer_mode_get_for_group (GimpLayerMode old_mode,
static GimpLayerMode mode_groups[][4] =
{
{
GIMP_LAYER_MODE_NORMAL_NON_LINEAR,
GIMP_LAYER_MODE_NORMAL,
GIMP_LAYER_MODE_NORMAL_NON_LINEAR,
GIMP_LAYER_MODE_NORMAL_NON_LINEAR
GIMP_LAYER_MODE_NORMAL_LINEAR,
GIMP_LAYER_MODE_NORMAL,
GIMP_LAYER_MODE_NORMAL
},
{

2
app/operations/layer-modes/gimplayermodefunctions.c
View File

@ -62,7 +62,7 @@ gimp_get_layer_mode_function (GimpLayerMode paint_mode)
switch (paint_mode)
{
case GIMP_LAYER_MODE_NORMAL:
case GIMP_LAYER_MODE_NORMAL_NON_LINEAR:
case GIMP_LAYER_MODE_NORMAL_LINEAR:
func = gimp_operation_normal_process;
break;

2
app/operations/layer-modes/gimpoperationlayermode.c
View File

@ -1687,7 +1687,7 @@ static inline GimpBlendFunc gimp_layer_mode_get_blend_fun (GimpLayerMode mode)
case GIMP_LAYER_MODE_SUBTRACT: return blendfun_subtract;
case GIMP_LAYER_MODE_MULTIPLY_LINEAR:
case GIMP_LAYER_MODE_MULTIPLY: return blendfun_multiply;
case GIMP_LAYER_MODE_NORMAL_NON_LINEAR:
case GIMP_LAYER_MODE_NORMAL_LINEAR:
case GIMP_LAYER_MODE_NORMAL: return blendfun_normal;
case GIMP_LAYER_MODE_BURN_LINEAR:
case GIMP_LAYER_MODE_BURN: return blendfun_burn;

4
app/pdb/brush-select-cmds.c
View File

@ -204,7 +204,7 @@ register_brush_select_procs (GimpPDB *pdb)
"paint mode",
"The initial paint mode",
GIMP_TYPE_LAYER_MODE,
GIMP_LAYER_MODE_NORMAL_NON_LINEAR,
GIMP_LAYER_MODE_NORMAL,
GIMP_PARAM_READWRITE));
gimp_pdb_register_procedure (pdb, procedure);
g_object_unref (procedure);
@ -278,7 +278,7 @@ register_brush_select_procs (GimpPDB *pdb)
"paint mode",
"The initial paint mode",
GIMP_TYPE_LAYER_MODE,
GIMP_LAYER_MODE_NORMAL_NON_LINEAR,
GIMP_LAYER_MODE_NORMAL,
GIMP_PARAM_READWRITE));
gimp_pdb_register_procedure (pdb, procedure);
g_object_unref (procedure);

2
app/pdb/brushes-cmds.c
View File

@ -440,7 +440,7 @@ register_brushes_procs (GimpPDB *pdb)
"paint mode",
"The paint mode",
GIMP_TYPE_LAYER_MODE,
GIMP_LAYER_MODE_NORMAL_NON_LINEAR,
GIMP_LAYER_MODE_NORMAL,
GIMP_PARAM_READWRITE));
gimp_procedure_add_return_value (procedure,
gimp_param_spec_int32 ("width",

4
app/pdb/context-cmds.c
View File

@ -3139,7 +3139,7 @@ register_context_procs (GimpPDB *pdb)
"paint mode",
"The paint mode",
GIMP_TYPE_LAYER_MODE,
GIMP_LAYER_MODE_NORMAL_NON_LINEAR,
GIMP_LAYER_MODE_NORMAL,
GIMP_PARAM_READWRITE));
gimp_pdb_register_procedure (pdb, procedure);
g_object_unref (procedure);
@ -3163,7 +3163,7 @@ register_context_procs (GimpPDB *pdb)
"paint mode",
"The paint mode",
GIMP_TYPE_LAYER_MODE,
GIMP_LAYER_MODE_NORMAL_NON_LINEAR,
GIMP_LAYER_MODE_NORMAL,
GIMP_PARAM_READWRITE));
gimp_pdb_register_procedure (pdb, procedure);
g_object_unref (procedure);

6
app/pdb/edit-cmds.c
View File

@ -1349,7 +1349,7 @@ register_edit_procs (GimpPDB *pdb)
"paint mode",
"The paint application mode",
GIMP_TYPE_LAYER_MODE,
GIMP_LAYER_MODE_NORMAL_NON_LINEAR,
GIMP_LAYER_MODE_NORMAL,
GIMP_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
g_param_spec_double ("opacity",
@ -1416,7 +1416,7 @@ register_edit_procs (GimpPDB *pdb)
"paint mode",
"The paint application mode",
GIMP_TYPE_LAYER_MODE,
GIMP_LAYER_MODE_NORMAL_NON_LINEAR,
GIMP_LAYER_MODE_NORMAL,
GIMP_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
g_param_spec_double ("opacity",
@ -1496,7 +1496,7 @@ register_edit_procs (GimpPDB *pdb)
"paint mode",
"The paint application mode",
GIMP_TYPE_LAYER_MODE,
GIMP_LAYER_MODE_NORMAL_NON_LINEAR,
GIMP_LAYER_MODE_NORMAL,
GIMP_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
g_param_spec_enum ("gradient-type",

6
app/pdb/layer-cmds.c
View File

@ -1212,7 +1212,7 @@ register_layer_procs (GimpPDB *pdb)
"mode",
"The layer combination mode",
GIMP_TYPE_LAYER_MODE,
GIMP_LAYER_MODE_NORMAL_NON_LINEAR,
GIMP_LAYER_MODE_NORMAL,
GIMP_PARAM_READWRITE));
gimp_procedure_add_return_value (procedure,
gimp_param_spec_layer_id ("layer",
@ -2148,7 +2148,7 @@ register_layer_procs (GimpPDB *pdb)
"mode",
"The layer combination mode",
GIMP_TYPE_LAYER_MODE,
GIMP_LAYER_MODE_NORMAL_NON_LINEAR,
GIMP_LAYER_MODE_NORMAL,
GIMP_PARAM_READWRITE));
gimp_pdb_register_procedure (pdb, procedure);
g_object_unref (procedure);
@ -2178,7 +2178,7 @@ register_layer_procs (GimpPDB *pdb)
"mode",
"The new layer combination mode",
GIMP_TYPE_LAYER_MODE,
GIMP_LAYER_MODE_NORMAL_NON_LINEAR,
GIMP_LAYER_MODE_NORMAL,
GIMP_PARAM_READWRITE));
gimp_pdb_register_procedure (pdb, procedure);
g_object_unref (procedure);

12
app/widgets/gimplayermodecombobox.c
View File

@ -321,7 +321,7 @@ gimp_layer_mode_combo_box_create_default_model (GimpLayerModeComboBox *combo)
store = gimp_enum_store_new_with_values (GIMP_TYPE_LAYER_MODE,
30,
GIMP_LAYER_MODE_NORMAL_NON_LINEAR,
GIMP_LAYER_MODE_NORMAL,
GIMP_LAYER_MODE_DISSOLVE,
GIMP_LAYER_MODE_LIGHTEN_ONLY,
GIMP_LAYER_MODE_SCREEN,
@ -386,7 +386,7 @@ gimp_layer_mode_combo_box_create_default_model (GimpLayerModeComboBox *combo)
if (combo->priv->with_replace)
{
gimp_layer_mode_combo_box_insert_value (store,
GIMP_LAYER_MODE_NORMAL_NON_LINEAR,
GIMP_LAYER_MODE_NORMAL,
GIMP_LAYER_MODE_REPLACE);
gimp_layer_mode_combo_box_insert_value (store,
GIMP_LAYER_MODE_COLOR_ERASE,
@ -406,7 +406,7 @@ gimp_layer_mode_combo_box_create_linear_model (GimpLayerModeComboBox *combo)
store = gimp_enum_store_new_with_values (GIMP_TYPE_LAYER_MODE,
22,
GIMP_LAYER_MODE_NORMAL,
GIMP_LAYER_MODE_NORMAL_LINEAR,
GIMP_LAYER_MODE_DISSOLVE,
GIMP_LAYER_MODE_LIGHTEN_ONLY,
GIMP_LAYER_MODE_SCREEN_LINEAR,
@ -454,7 +454,7 @@ gimp_layer_mode_combo_box_create_linear_model (GimpLayerModeComboBox *combo)
if (combo->priv->with_replace)
{
gimp_layer_mode_combo_box_insert_value (store,
GIMP_LAYER_MODE_NORMAL,
GIMP_LAYER_MODE_NORMAL_LINEAR,
GIMP_LAYER_MODE_REPLACE);
gimp_layer_mode_combo_box_insert_value (store,
GIMP_LAYER_MODE_REPLACE,
@ -474,7 +474,7 @@ gimp_layer_mode_combo_box_create_perceptual_model (GimpLayerModeComboBox *combo)
store = gimp_enum_store_new_with_values (GIMP_TYPE_LAYER_MODE,
30,
GIMP_LAYER_MODE_NORMAL_NON_LINEAR,
GIMP_LAYER_MODE_NORMAL,
GIMP_LAYER_MODE_DISSOLVE,
GIMP_LAYER_MODE_LIGHTEN_ONLY,
GIMP_LAYER_MODE_SCREEN,
@ -546,7 +546,7 @@ gimp_layer_mode_combo_box_create_legacy_model (GimpLayerModeComboBox *combo)
store = gimp_enum_store_new_with_values (GIMP_TYPE_LAYER_MODE,
20,
GIMP_LAYER_MODE_NORMAL_NON_LINEAR,
GIMP_LAYER_MODE_NORMAL,
GIMP_LAYER_MODE_DISSOLVE,
GIMP_LAYER_MODE_LIGHTEN_ONLY_LEGACY,
GIMP_LAYER_MODE_SCREEN_LEGACY,

4
app/widgets/gimpwidgets-constructors.c
View File

@ -105,8 +105,8 @@ gimp_paint_mode_menu_new (gboolean with_behind_mode,
store = gimp_enum_store_new_with_values (GIMP_TYPE_LAYER_MODE,
45,
GIMP_LAYER_MODE_NORMAL_NON_LINEAR,
GIMP_LAYER_MODE_NORMAL,
GIMP_LAYER_MODE_NORMAL_LINEAR,
GIMP_LAYER_MODE_DISSOLVE,
GIMP_LAYER_MODE_LIGHTEN_ONLY,
GIMP_LAYER_MODE_LIGHTEN_ONLY_LEGACY,
@ -190,7 +190,7 @@ gimp_paint_mode_menu_new (gboolean with_behind_mode,
if (with_replace_modes)
{
gimp_enum_store_insert_value_after (GIMP_ENUM_STORE (store),
GIMP_LAYER_MODE_NORMAL,
GIMP_LAYER_MODE_NORMAL_LINEAR,
GIMP_LAYER_MODE_REPLACE);
gimp_enum_store_insert_value_after (GIMP_ENUM_STORE (store),
GIMP_LAYER_MODE_COLOR_ERASE,

4
libgimp/gimpenums.h
View File

@ -69,7 +69,7 @@ GType gimp_layer_mode_get_type (void) G_GNUC_CONST;
typedef enum
{
GIMP_LAYER_MODE_NORMAL_NON_LINEAR,
GIMP_LAYER_MODE_NORMAL,
GIMP_LAYER_MODE_DISSOLVE,
GIMP_LAYER_MODE_BEHIND,
GIMP_LAYER_MODE_MULTIPLY_LEGACY,
@ -97,7 +97,7 @@ typedef enum
GIMP_LAYER_MODE_LCH_CHROMA,
GIMP_LAYER_MODE_LCH_COLOR,
GIMP_LAYER_MODE_LCH_LIGHTNESS,
GIMP_LAYER_MODE_NORMAL,
GIMP_LAYER_MODE_NORMAL_LINEAR,
GIMP_LAYER_MODE_BEHIND_LINEAR,
GIMP_LAYER_MODE_MULTIPLY,
GIMP_LAYER_MODE_MULTIPLY_LINEAR,

10
tools/pdbgen/enums.pl
View File

@ -695,8 +695,8 @@ package Gimp::CodeGen::enums;
GimpLayerMode =>
{ contig => 1,
header => 'core/core-enums.h',
symbols => [ qw(GIMP_LAYER_MODE_NORMAL_NON_LINEAR
GIMP_LAYER_MODE_DISSOLVE GIMP_LAYER_MODE_BEHIND
symbols => [ qw(GIMP_LAYER_MODE_NORMAL GIMP_LAYER_MODE_DISSOLVE
GIMP_LAYER_MODE_BEHIND
GIMP_LAYER_MODE_MULTIPLY_LEGACY
GIMP_LAYER_MODE_SCREEN_LEGACY
GIMP_LAYER_MODE_OVERLAY_LEGACY
@ -721,7 +721,7 @@ package Gimp::CodeGen::enums;
GIMP_LAYER_MODE_LCH_CHROMA
GIMP_LAYER_MODE_LCH_COLOR
GIMP_LAYER_MODE_LCH_LIGHTNESS
GIMP_LAYER_MODE_NORMAL
GIMP_LAYER_MODE_NORMAL_LINEAR
GIMP_LAYER_MODE_BEHIND_LINEAR
GIMP_LAYER_MODE_MULTIPLY
GIMP_LAYER_MODE_MULTIPLY_LINEAR
@ -761,7 +761,7 @@ package Gimp::CodeGen::enums;
GIMP_LAYER_MODE_EXCLUSION_LINEAR
GIMP_LAYER_MODE_LINEAR_BURN
GIMP_LAYER_MODE_LINEAR_BURN_LINEAR) ],
mapping => { GIMP_LAYER_MODE_NORMAL_NON_LINEAR => '0',
mapping => { GIMP_LAYER_MODE_NORMAL => '0',
GIMP_LAYER_MODE_DISSOLVE => '1',
GIMP_LAYER_MODE_BEHIND => '2',
GIMP_LAYER_MODE_MULTIPLY_LEGACY => '3',
@ -789,7 +789,7 @@ package Gimp::CodeGen::enums;
GIMP_LAYER_MODE_LCH_CHROMA => '25',
GIMP_LAYER_MODE_LCH_COLOR => '26',
GIMP_LAYER_MODE_LCH_LIGHTNESS => '27',
GIMP_LAYER_MODE_NORMAL => '28',
GIMP_LAYER_MODE_NORMAL_LINEAR => '28',
GIMP_LAYER_MODE_BEHIND_LINEAR => '29',
GIMP_LAYER_MODE_MULTIPLY => '30',
GIMP_LAYER_MODE_MULTIPLY_LINEAR => '31',