[gimp] app: add enum value GIMP_LAYER_MODE_GROUP_DEFAULT



commit a6545cc363de6b918ea6204ef79534cd1f17ba02
Author: Michael Natterer <mitch gimp org>
Date:   Thu Jan 26 17:15:27 2017 +0100

    app: add enum value GIMP_LAYER_MODE_GROUP_DEFAULT
    
    and change the labels of the NORMAL and NORMAL_NON_LINEAR modes.

 app/core/core-enums.c |    6 ++++--
 app/core/core-enums.h |    5 +++--
 2 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/app/core/core-enums.c b/app/core/core-enums.c
index bc5eb09..17c518a 100644
--- a/app/core/core-enums.c
+++ b/app/core/core-enums.c
@@ -368,7 +368,7 @@ gimp_layer_mode_get_type (void)
 
   static const GimpEnumDesc descs[] =
   {
-    { GIMP_LAYER_MODE_NORMAL_NON_LINEAR, NC_("layer-mode", "Normal (non-linear)"), NULL },
+    { GIMP_LAYER_MODE_NORMAL_NON_LINEAR, 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"), NULL },
+    { GIMP_LAYER_MODE_NORMAL, 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 },
@@ -462,6 +462,7 @@ gimp_layer_mode_group_get_type (void)
 {
   static const GEnumValue values[] =
   {
+    { GIMP_LAYER_MODE_GROUP_DEFAULT, "GIMP_LAYER_MODE_GROUP_DEFAULT", "default" },
     { GIMP_LAYER_MODE_GROUP_LINEAR, "GIMP_LAYER_MODE_GROUP_LINEAR", "linear" },
     { GIMP_LAYER_MODE_GROUP_PERCEPTUAL, "GIMP_LAYER_MODE_GROUP_PERCEPTUAL", "perceptual" },
     { GIMP_LAYER_MODE_GROUP_LEGACY, "GIMP_LAYER_MODE_GROUP_LEGACY", "legacy" },
@@ -470,6 +471,7 @@ gimp_layer_mode_group_get_type (void)
 
   static const GimpEnumDesc descs[] =
   {
+    { GIMP_LAYER_MODE_GROUP_DEFAULT, NC_("layer-mode-group", "Default"), NULL },
     { GIMP_LAYER_MODE_GROUP_LINEAR, NC_("layer-mode-group", "Linear light"), NULL },
     { GIMP_LAYER_MODE_GROUP_PERCEPTUAL, NC_("layer-mode-group", "Perceptual"), NULL },
     { GIMP_LAYER_MODE_GROUP_LEGACY, NC_("layer-mode-group", "Legacy"), NULL },
diff --git a/app/core/core-enums.h b/app/core/core-enums.h
index 07280ec..836a285 100644
--- a/app/core/core-enums.h
+++ b/app/core/core-enums.h
@@ -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 (non-linear)"      >*/
+  GIMP_LAYER_MODE_NORMAL_NON_LINEAR,     /*< 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"                   >*/
+  GIMP_LAYER_MODE_NORMAL,                /*< 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)"        >*/
@@ -244,6 +244,7 @@ GType gimp_layer_mode_group_get_type (void) G_GNUC_CONST;
 
 typedef enum  /*< pdb-skip >*/
 {
+  GIMP_LAYER_MODE_GROUP_DEFAULT,     /*< desc="Default"      >*/
   GIMP_LAYER_MODE_GROUP_LINEAR,      /*< desc="Linear light" >*/
   GIMP_LAYER_MODE_GROUP_PERCEPTUAL,  /*< desc="Perceptual"   >*/
   GIMP_LAYER_MODE_GROUP_LEGACY,      /*< desc="Legacy"       >*/


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]