[gimp] app: add abbreviations for layer modes



commit 5a28753924d15f9e01e48f0015d5e3e2ea587b05
Author: Ell <ell_se yahoo com>
Date:   Thu Nov 30 04:29:31 2017 -0500

    app: add abbreviations for layer modes
    
    Add abbreviated versions for long layer mode names.  In particular,
    replace the "(legacy)" suffixes with "(l)" in the abbreviated
    versions.

 app/operations/operations-enums.c   |   72 +++++++++++++++++++
 app/operations/operations-enums.h   |  130 +++++++++++++++++-----------------
 app/widgets/gimplayermodecombobox.c |   12 +++-
 3 files changed, 146 insertions(+), 68 deletions(-)
---
diff --git a/app/operations/operations-enums.c b/app/operations/operations-enums.c
index 5dcc347..84826fe 100644
--- a/app/operations/operations-enums.c
+++ b/app/operations/operations-enums.c
@@ -151,28 +151,94 @@ gimp_layer_mode_get_type (void)
   static const GimpEnumDesc descs[] =
   {
     { GIMP_LAYER_MODE_NORMAL_LEGACY, NC_("layer-mode", "Normal (legacy)"), NULL },
+    /* Translators: this is an abbreviated version of "Normal (legacy)".
+       Keep it short. */
+    { GIMP_LAYER_MODE_NORMAL_LEGACY, NC_("layer-mode", "Normal (l)"), NULL },
     { GIMP_LAYER_MODE_DISSOLVE, NC_("layer-mode", "Dissolve"), NULL },
     { GIMP_LAYER_MODE_BEHIND_LEGACY, NC_("layer-mode", "Behind (legacy)"), NULL },
+    /* Translators: this is an abbreviated version of "Behind (legacy)".
+       Keep it short. */
+    { GIMP_LAYER_MODE_BEHIND_LEGACY, NC_("layer-mode", "Behind (l)"), NULL },
     { GIMP_LAYER_MODE_MULTIPLY_LEGACY, NC_("layer-mode", "Multiply (legacy)"), NULL },
+    /* Translators: this is an abbreviated version of "Multiply (legacy)".
+       Keep it short. */
+    { GIMP_LAYER_MODE_MULTIPLY_LEGACY, NC_("layer-mode", "Multiply (l)"), NULL },
     { GIMP_LAYER_MODE_SCREEN_LEGACY, NC_("layer-mode", "Screen (legacy)"), NULL },
+    /* Translators: this is an abbreviated version of "Screen (legacy)".
+       Keep it short. */
+    { GIMP_LAYER_MODE_SCREEN_LEGACY, NC_("layer-mode", "Screen (l)"), NULL },
     { GIMP_LAYER_MODE_OVERLAY_LEGACY, NC_("layer-mode", "Old broken Overlay"), NULL },
+    /* Translators: this is an abbreviated version of "Old broken Overlay".
+       Keep it short. */
+    { GIMP_LAYER_MODE_OVERLAY_LEGACY, NC_("layer-mode", "Old Overlay"), NULL },
     { GIMP_LAYER_MODE_DIFFERENCE_LEGACY, NC_("layer-mode", "Difference (legacy)"), NULL },
+    /* Translators: this is an abbreviated version of "Difference (legacy)".
+       Keep it short. */
+    { GIMP_LAYER_MODE_DIFFERENCE_LEGACY, NC_("layer-mode", "Difference (l)"), NULL },
     { GIMP_LAYER_MODE_ADDITION_LEGACY, NC_("layer-mode", "Addition (legacy)"), NULL },
+    /* Translators: this is an abbreviated version of "Addition (legacy)".
+       Keep it short. */
+    { GIMP_LAYER_MODE_ADDITION_LEGACY, NC_("layer-mode", "Addition (l)"), NULL },
     { GIMP_LAYER_MODE_SUBTRACT_LEGACY, NC_("layer-mode", "Subtract (legacy)"), NULL },
+    /* Translators: this is an abbreviated version of "Subtract (legacy)".
+       Keep it short. */
+    { GIMP_LAYER_MODE_SUBTRACT_LEGACY, NC_("layer-mode", "Subtract (l)"), NULL },
     { GIMP_LAYER_MODE_DARKEN_ONLY_LEGACY, NC_("layer-mode", "Darken only (legacy)"), NULL },
+    /* Translators: this is an abbreviated version of "Darken only (legacy)".
+       Keep it short. */
+    { GIMP_LAYER_MODE_DARKEN_ONLY_LEGACY, NC_("layer-mode", "Darken only (l)"), NULL },
     { GIMP_LAYER_MODE_LIGHTEN_ONLY_LEGACY, NC_("layer-mode", "Lighten only (legacy)"), NULL },
+    /* Translators: this is an abbreviated version of "Lighten only (legacy)".
+       Keep it short. */
+    { GIMP_LAYER_MODE_LIGHTEN_ONLY_LEGACY, NC_("layer-mode", "Lighten only (l)"), NULL },
     { GIMP_LAYER_MODE_HSV_HUE_LEGACY, NC_("layer-mode", "Hue (HSV) (legacy)"), NULL },
+    /* Translators: this is an abbreviated version of "Hue (HSV) (legacy)".
+       Keep it short. */
+    { GIMP_LAYER_MODE_HSV_HUE_LEGACY, NC_("layer-mode", "Hue (HSV) (l)"), NULL },
     { GIMP_LAYER_MODE_HSV_SATURATION_LEGACY, NC_("layer-mode", "Saturation (HSV) (legacy)"), NULL },
+    /* Translators: this is an abbreviated version of "Saturation (HSV) (legacy)".
+       Keep it short. */
+    { GIMP_LAYER_MODE_HSV_SATURATION_LEGACY, NC_("layer-mode", "Saturation (HSV) (l)"), NULL },
     { GIMP_LAYER_MODE_HSL_COLOR_LEGACY, NC_("layer-mode", "Color (HSL) (legacy)"), NULL },
+    /* Translators: this is an abbreviated version of "Color (HSL) (legacy)".
+       Keep it short. */
+    { GIMP_LAYER_MODE_HSL_COLOR_LEGACY, NC_("layer-mode", "Color (HSL) (l)"), NULL },
     { GIMP_LAYER_MODE_HSV_VALUE_LEGACY, NC_("layer-mode", "Value (HSV) (legacy)"), NULL },
+    /* Translators: this is an abbreviated version of "Value (HSV) (legacy)".
+       Keep it short. */
+    { GIMP_LAYER_MODE_HSV_VALUE_LEGACY, NC_("layer-mode", "Value (HSV) (l)"), NULL },
     { GIMP_LAYER_MODE_DIVIDE_LEGACY, NC_("layer-mode", "Divide (legacy)"), NULL },
+    /* Translators: this is an abbreviated version of "Divide (legacy)".
+       Keep it short. */
+    { GIMP_LAYER_MODE_DIVIDE_LEGACY, NC_("layer-mode", "Divide (l)"), NULL },
     { GIMP_LAYER_MODE_DODGE_LEGACY, NC_("layer-mode", "Dodge (legacy)"), NULL },
+    /* Translators: this is an abbreviated version of "Dodge (legacy)".
+       Keep it short. */
+    { GIMP_LAYER_MODE_DODGE_LEGACY, NC_("layer-mode", "Dodge (l)"), NULL },
     { GIMP_LAYER_MODE_BURN_LEGACY, NC_("layer-mode", "Burn (legacy)"), NULL },
+    /* Translators: this is an abbreviated version of "Burn (legacy)".
+       Keep it short. */
+    { GIMP_LAYER_MODE_BURN_LEGACY, NC_("layer-mode", "Burn (l)"), NULL },
     { GIMP_LAYER_MODE_HARDLIGHT_LEGACY, NC_("layer-mode", "Hard light (legacy)"), NULL },
+    /* Translators: this is an abbreviated version of "Hard light (legacy)".
+       Keep it short. */
+    { GIMP_LAYER_MODE_HARDLIGHT_LEGACY, NC_("layer-mode", "Hard light (l)"), NULL },
     { GIMP_LAYER_MODE_SOFTLIGHT_LEGACY, NC_("layer-mode", "Soft light (legacy)"), NULL },
+    /* Translators: this is an abbreviated version of "Soft light (legacy)".
+       Keep it short. */
+    { GIMP_LAYER_MODE_SOFTLIGHT_LEGACY, NC_("layer-mode", "Soft light (l)"), NULL },
     { GIMP_LAYER_MODE_GRAIN_EXTRACT_LEGACY, NC_("layer-mode", "Grain extract (legacy)"), NULL },
+    /* Translators: this is an abbreviated version of "Grain extract (legacy)".
+       Keep it short. */
+    { GIMP_LAYER_MODE_GRAIN_EXTRACT_LEGACY, NC_("layer-mode", "Grain extract (l)"), NULL },
     { GIMP_LAYER_MODE_GRAIN_MERGE_LEGACY, NC_("layer-mode", "Grain merge (legacy)"), NULL },
+    /* Translators: this is an abbreviated version of "Grain merge (legacy)".
+       Keep it short. */
+    { GIMP_LAYER_MODE_GRAIN_MERGE_LEGACY, NC_("layer-mode", "Grain merge (l)"), NULL },
     { GIMP_LAYER_MODE_COLOR_ERASE_LEGACY, NC_("layer-mode", "Color erase (legacy)"), NULL },
+    /* Translators: this is an abbreviated version of "Color erase (legacy)".
+       Keep it short. */
+    { GIMP_LAYER_MODE_COLOR_ERASE_LEGACY, NC_("layer-mode", "Color erase (l)"), NULL },
     { GIMP_LAYER_MODE_OVERLAY, NC_("layer-mode", "Overlay"), NULL },
     { GIMP_LAYER_MODE_LCH_HUE, NC_("layer-mode", "Hue (LCH)"), NULL },
     { GIMP_LAYER_MODE_LCH_CHROMA, NC_("layer-mode", "Chroma (LCH)"), NULL },
@@ -205,7 +271,13 @@ gimp_layer_mode_get_type (void)
     { GIMP_LAYER_MODE_EXCLUSION, NC_("layer-mode", "Exclusion"), NULL },
     { GIMP_LAYER_MODE_LINEAR_BURN, NC_("layer-mode", "Linear burn"), NULL },
     { GIMP_LAYER_MODE_LUMA_DARKEN_ONLY, NC_("layer-mode", "Luma/Luminance darken only"), NULL },
+    /* Translators: this is an abbreviated version of "Luma/Luminance darken only".
+       Keep it short. */
+    { GIMP_LAYER_MODE_LUMA_DARKEN_ONLY, NC_("layer-mode", "Luma darken only"), NULL },
     { GIMP_LAYER_MODE_LUMA_LIGHTEN_ONLY, NC_("layer-mode", "Luma/Luminance lighten only"), NULL },
+    /* Translators: this is an abbreviated version of "Luma/Luminance lighten only".
+       Keep it short. */
+    { GIMP_LAYER_MODE_LUMA_LIGHTEN_ONLY, NC_("layer-mode", "Luma lighten only"), NULL },
     { GIMP_LAYER_MODE_LUMINANCE, NC_("layer-mode", "Luminance"), NULL },
     { GIMP_LAYER_MODE_COLOR_ERASE, NC_("layer-mode", "Color erase"), NULL },
     { GIMP_LAYER_MODE_ERASE, NC_("layer-mode", "Erase"), NULL },
diff --git a/app/operations/operations-enums.h b/app/operations/operations-enums.h
index b02c541..96d43b6 100644
--- a/app/operations/operations-enums.h
+++ b/app/operations/operations-enums.h
@@ -55,81 +55,81 @@ GType gimp_layer_mode_get_type (void) G_GNUC_CONST;
 typedef enum
 {
   /*  Modes that exist since ancient times  */
-  GIMP_LAYER_MODE_NORMAL_LEGACY,         /*< desc="Normal (legacy)"          >*/
-  GIMP_LAYER_MODE_DISSOLVE,              /*< desc="Dissolve"                 >*/
-  GIMP_LAYER_MODE_BEHIND_LEGACY,         /*< desc="Behind (legacy)"          >*/
-  GIMP_LAYER_MODE_MULTIPLY_LEGACY,       /*< desc="Multiply (legacy)"        >*/
-  GIMP_LAYER_MODE_SCREEN_LEGACY,         /*< desc="Screen (legacy)"          >*/
-  GIMP_LAYER_MODE_OVERLAY_LEGACY,        /*< desc="Old broken Overlay"       >*/
-  GIMP_LAYER_MODE_DIFFERENCE_LEGACY,     /*< desc="Difference (legacy)"      >*/
-  GIMP_LAYER_MODE_ADDITION_LEGACY,       /*< desc="Addition (legacy)"        >*/
-  GIMP_LAYER_MODE_SUBTRACT_LEGACY,       /*< desc="Subtract (legacy)"        >*/
-  GIMP_LAYER_MODE_DARKEN_ONLY_LEGACY,    /*< desc="Darken only (legacy)"     >*/
-  GIMP_LAYER_MODE_LIGHTEN_ONLY_LEGACY,   /*< desc="Lighten only (legacy)"    >*/
-  GIMP_LAYER_MODE_HSV_HUE_LEGACY,        /*< desc="Hue (HSV) (legacy)"       >*/
-  GIMP_LAYER_MODE_HSV_SATURATION_LEGACY, /*< desc="Saturation (HSV) (legacy)">*/
-  GIMP_LAYER_MODE_HSL_COLOR_LEGACY,      /*< desc="Color (HSL) (legacy)"     >*/
-  GIMP_LAYER_MODE_HSV_VALUE_LEGACY,      /*< desc="Value (HSV) (legacy)"     >*/
-  GIMP_LAYER_MODE_DIVIDE_LEGACY,         /*< desc="Divide (legacy)"          >*/
-  GIMP_LAYER_MODE_DODGE_LEGACY,          /*< desc="Dodge (legacy)"           >*/
-  GIMP_LAYER_MODE_BURN_LEGACY,           /*< desc="Burn (legacy)"            >*/
-  GIMP_LAYER_MODE_HARDLIGHT_LEGACY,      /*< desc="Hard light (legacy)"      >*/
+  GIMP_LAYER_MODE_NORMAL_LEGACY,         /*< desc="Normal (legacy)",             abbrev="Normal (l)"         
  >*/
+  GIMP_LAYER_MODE_DISSOLVE,              /*< desc="Dissolve"                                                 
  >*/
+  GIMP_LAYER_MODE_BEHIND_LEGACY,         /*< desc="Behind (legacy)",             abbrev="Behind (l)"         
  >*/
+  GIMP_LAYER_MODE_MULTIPLY_LEGACY,       /*< desc="Multiply (legacy)",           abbrev="Multiply (l)"       
  >*/
+  GIMP_LAYER_MODE_SCREEN_LEGACY,         /*< desc="Screen (legacy)",             abbrev="Screen (l)"         
  >*/
+  GIMP_LAYER_MODE_OVERLAY_LEGACY,        /*< desc="Old broken Overlay",          abbrev="Old Overlay"        
  >*/
+  GIMP_LAYER_MODE_DIFFERENCE_LEGACY,     /*< desc="Difference (legacy)",         abbrev="Difference (l)"     
  >*/
+  GIMP_LAYER_MODE_ADDITION_LEGACY,       /*< desc="Addition (legacy)",           abbrev="Addition (l)"       
  >*/
+  GIMP_LAYER_MODE_SUBTRACT_LEGACY,       /*< desc="Subtract (legacy)",           abbrev="Subtract (l)"       
  >*/
+  GIMP_LAYER_MODE_DARKEN_ONLY_LEGACY,    /*< desc="Darken only (legacy)",        abbrev="Darken only (l)"    
  >*/
+  GIMP_LAYER_MODE_LIGHTEN_ONLY_LEGACY,   /*< desc="Lighten only (legacy)",       abbrev="Lighten only (l)"   
  >*/
+  GIMP_LAYER_MODE_HSV_HUE_LEGACY,        /*< desc="Hue (HSV) (legacy)",          abbrev="Hue (HSV) (l)"      
  >*/
+  GIMP_LAYER_MODE_HSV_SATURATION_LEGACY, /*< desc="Saturation (HSV) (legacy)",   abbrev="Saturation (HSV) 
(l)" >*/
+  GIMP_LAYER_MODE_HSL_COLOR_LEGACY,      /*< desc="Color (HSL) (legacy)",        abbrev="Color (HSL) (l)"    
  >*/
+  GIMP_LAYER_MODE_HSV_VALUE_LEGACY,      /*< desc="Value (HSV) (legacy)",        abbrev="Value (HSV) (l)"    
  >*/
+  GIMP_LAYER_MODE_DIVIDE_LEGACY,         /*< desc="Divide (legacy)",             abbrev="Divide (l)"         
  >*/
+  GIMP_LAYER_MODE_DODGE_LEGACY,          /*< desc="Dodge (legacy)",              abbrev="Dodge (l)"          
  >*/
+  GIMP_LAYER_MODE_BURN_LEGACY,           /*< desc="Burn (legacy)",               abbrev="Burn (l)"           
  >*/
+  GIMP_LAYER_MODE_HARDLIGHT_LEGACY,      /*< desc="Hard light (legacy)",         abbrev="Hard light (l)"     
  >*/
 
   /*  Since 2.8 (XCF version 2)  */
-  GIMP_LAYER_MODE_SOFTLIGHT_LEGACY,      /*< desc="Soft light (legacy)"      >*/
-  GIMP_LAYER_MODE_GRAIN_EXTRACT_LEGACY,  /*< desc="Grain extract (legacy)"   >*/
-  GIMP_LAYER_MODE_GRAIN_MERGE_LEGACY,    /*< desc="Grain merge (legacy)"     >*/
-  GIMP_LAYER_MODE_COLOR_ERASE_LEGACY,    /*< desc="Color erase (legacy)"     >*/
+  GIMP_LAYER_MODE_SOFTLIGHT_LEGACY,      /*< desc="Soft light (legacy)",         abbrev="Soft light (l)"     
  >*/
+  GIMP_LAYER_MODE_GRAIN_EXTRACT_LEGACY,  /*< desc="Grain extract (legacy)",      abbrev="Grain extract (l)"  
  >*/
+  GIMP_LAYER_MODE_GRAIN_MERGE_LEGACY,    /*< desc="Grain merge (legacy)",        abbrev="Grain merge (l)"    
  >*/
+  GIMP_LAYER_MODE_COLOR_ERASE_LEGACY,    /*< desc="Color erase (legacy)",        abbrev="Color erase (l)"    
  >*/
 
   /*  Since 2.10 (XCF version 9) */
-  GIMP_LAYER_MODE_OVERLAY,               /*< desc="Overlay"                  >*/
-  GIMP_LAYER_MODE_LCH_HUE,               /*< desc="Hue (LCH)"                >*/
-  GIMP_LAYER_MODE_LCH_CHROMA,            /*< desc="Chroma (LCH)"             >*/
-  GIMP_LAYER_MODE_LCH_COLOR,             /*< desc="Color (LCH)"              >*/
-  GIMP_LAYER_MODE_LCH_LIGHTNESS,         /*< desc="Lightness (LCH)"          >*/
+  GIMP_LAYER_MODE_OVERLAY,               /*< desc="Overlay"                                                  
  >*/
+  GIMP_LAYER_MODE_LCH_HUE,               /*< desc="Hue (LCH)"                                                
  >*/
+  GIMP_LAYER_MODE_LCH_CHROMA,            /*< desc="Chroma (LCH)"                                             
  >*/
+  GIMP_LAYER_MODE_LCH_COLOR,             /*< desc="Color (LCH)"                                              
  >*/
+  GIMP_LAYER_MODE_LCH_LIGHTNESS,         /*< desc="Lightness (LCH)"                                          
  >*/
 
   /*  Since 2.10 (XCF version 10)  */
-  GIMP_LAYER_MODE_NORMAL,                /*< desc="Normal"                   >*/
-  GIMP_LAYER_MODE_BEHIND,                /*< desc="Behind"                   >*/
-  GIMP_LAYER_MODE_MULTIPLY,              /*< desc="Multiply"                 >*/
-  GIMP_LAYER_MODE_SCREEN,                /*< desc="Screen"                   >*/
-  GIMP_LAYER_MODE_DIFFERENCE,            /*< desc="Difference"               >*/
-  GIMP_LAYER_MODE_ADDITION,              /*< desc="Addition"                 >*/
-  GIMP_LAYER_MODE_SUBTRACT,              /*< desc="Subtract"                 >*/
-  GIMP_LAYER_MODE_DARKEN_ONLY,           /*< desc="Darken only"              >*/
-  GIMP_LAYER_MODE_LIGHTEN_ONLY,          /*< desc="Lighten only"             >*/
-  GIMP_LAYER_MODE_HSV_HUE,               /*< desc="Hue (HSV)"                >*/
-  GIMP_LAYER_MODE_HSV_SATURATION,        /*< desc="Saturation (HSV)"         >*/
-  GIMP_LAYER_MODE_HSL_COLOR,             /*< desc="Color (HSL)"              >*/
-  GIMP_LAYER_MODE_HSV_VALUE,             /*< desc="Value (HSV)"              >*/
-  GIMP_LAYER_MODE_DIVIDE,                /*< desc="Divide"                   >*/
-  GIMP_LAYER_MODE_DODGE,                 /*< desc="Dodge"                    >*/
-  GIMP_LAYER_MODE_BURN,                  /*< desc="Burn"                     >*/
-  GIMP_LAYER_MODE_HARDLIGHT,             /*< desc="Hard light"               >*/
-  GIMP_LAYER_MODE_SOFTLIGHT,             /*< desc="Soft light"               >*/
-  GIMP_LAYER_MODE_GRAIN_EXTRACT,         /*< desc="Grain extract"            >*/
-  GIMP_LAYER_MODE_GRAIN_MERGE,           /*< desc="Grain merge"              >*/
-  GIMP_LAYER_MODE_VIVID_LIGHT,           /*< desc="Vivid light"              >*/
-  GIMP_LAYER_MODE_PIN_LIGHT,             /*< desc="Pin light"                >*/
-  GIMP_LAYER_MODE_LINEAR_LIGHT,          /*< desc="Linear light"             >*/
-  GIMP_LAYER_MODE_HARD_MIX,              /*< desc="Hard mix"                 >*/
-  GIMP_LAYER_MODE_EXCLUSION,             /*< desc="Exclusion"                >*/
-  GIMP_LAYER_MODE_LINEAR_BURN,           /*< desc="Linear burn"              >*/
-  GIMP_LAYER_MODE_LUMA_DARKEN_ONLY,   /*< desc="Luma/Luminance darken only"  >*/
-  GIMP_LAYER_MODE_LUMA_LIGHTEN_ONLY,  /*< desc="Luma/Luminance lighten only" >*/
-  GIMP_LAYER_MODE_LUMINANCE,             /*< desc="Luminance"                >*/
-  GIMP_LAYER_MODE_COLOR_ERASE,           /*< desc="Color erase"              >*/
-  GIMP_LAYER_MODE_ERASE,                 /*< desc="Erase"                    >*/
-  GIMP_LAYER_MODE_MERGE,                 /*< desc="Merge"                    >*/
-  GIMP_LAYER_MODE_SPLIT,                 /*< desc="Split"                    >*/
-  GIMP_LAYER_MODE_PASS_THROUGH,          /*< desc="Pass through"             >*/
+  GIMP_LAYER_MODE_NORMAL,                /*< desc="Normal"                                                   
  >*/
+  GIMP_LAYER_MODE_BEHIND,                /*< desc="Behind"                                                   
  >*/
+  GIMP_LAYER_MODE_MULTIPLY,              /*< desc="Multiply"                                                 
  >*/
+  GIMP_LAYER_MODE_SCREEN,                /*< desc="Screen"                                                   
  >*/
+  GIMP_LAYER_MODE_DIFFERENCE,            /*< desc="Difference"                                               
  >*/
+  GIMP_LAYER_MODE_ADDITION,              /*< desc="Addition"                                                 
  >*/
+  GIMP_LAYER_MODE_SUBTRACT,              /*< desc="Subtract"                                                 
  >*/
+  GIMP_LAYER_MODE_DARKEN_ONLY,           /*< desc="Darken only"                                              
  >*/
+  GIMP_LAYER_MODE_LIGHTEN_ONLY,          /*< desc="Lighten only"                                             
  >*/
+  GIMP_LAYER_MODE_HSV_HUE,               /*< desc="Hue (HSV)"                                                
  >*/
+  GIMP_LAYER_MODE_HSV_SATURATION,        /*< desc="Saturation (HSV)"                                         
  >*/
+  GIMP_LAYER_MODE_HSL_COLOR,             /*< desc="Color (HSL)"                                              
  >*/
+  GIMP_LAYER_MODE_HSV_VALUE,             /*< desc="Value (HSV)"                                              
  >*/
+  GIMP_LAYER_MODE_DIVIDE,                /*< desc="Divide"                                                   
  >*/
+  GIMP_LAYER_MODE_DODGE,                 /*< desc="Dodge"                                                    
  >*/
+  GIMP_LAYER_MODE_BURN,                  /*< desc="Burn"                                                     
  >*/
+  GIMP_LAYER_MODE_HARDLIGHT,             /*< desc="Hard light"                                               
  >*/
+  GIMP_LAYER_MODE_SOFTLIGHT,             /*< desc="Soft light"                                               
  >*/
+  GIMP_LAYER_MODE_GRAIN_EXTRACT,         /*< desc="Grain extract"                                            
  >*/
+  GIMP_LAYER_MODE_GRAIN_MERGE,           /*< desc="Grain merge"                                              
  >*/
+  GIMP_LAYER_MODE_VIVID_LIGHT,           /*< desc="Vivid light"                                              
  >*/
+  GIMP_LAYER_MODE_PIN_LIGHT,             /*< desc="Pin light"                                                
  >*/
+  GIMP_LAYER_MODE_LINEAR_LIGHT,          /*< desc="Linear light"                                             
  >*/
+  GIMP_LAYER_MODE_HARD_MIX,              /*< desc="Hard mix"                                                 
  >*/
+  GIMP_LAYER_MODE_EXCLUSION,             /*< desc="Exclusion"                                                
  >*/
+  GIMP_LAYER_MODE_LINEAR_BURN,           /*< desc="Linear burn"                                              
  >*/
+  GIMP_LAYER_MODE_LUMA_DARKEN_ONLY,      /*< desc="Luma/Luminance darken only",  abbrev="Luma darken only"   
  >*/
+  GIMP_LAYER_MODE_LUMA_LIGHTEN_ONLY,     /*< desc="Luma/Luminance lighten only", abbrev="Luma lighten only"  
  >*/
+  GIMP_LAYER_MODE_LUMINANCE,             /*< desc="Luminance"                                                
  >*/
+  GIMP_LAYER_MODE_COLOR_ERASE,           /*< desc="Color erase"                                              
  >*/
+  GIMP_LAYER_MODE_ERASE,                 /*< desc="Erase"                                                    
  >*/
+  GIMP_LAYER_MODE_MERGE,                 /*< desc="Merge"                                                    
  >*/
+  GIMP_LAYER_MODE_SPLIT,                 /*< desc="Split"                                                    
  >*/
+  GIMP_LAYER_MODE_PASS_THROUGH,          /*< desc="Pass through"                                             
  >*/
 
   /*  Internal modes, not available to the PDB, must be kept at the end  */
-  GIMP_LAYER_MODE_REPLACE,               /*< pdb-skip, desc="Replace"        >*/
-  GIMP_LAYER_MODE_ANTI_ERASE,            /*< pdb-skip, desc="Anti erase"     >*/
+  GIMP_LAYER_MODE_REPLACE,               /*< pdb-skip, desc="Replace"                                        
  >*/
+  GIMP_LAYER_MODE_ANTI_ERASE,            /*< pdb-skip, desc="Anti erase"                                     
  >*/
 
   /*  Layer mode menu separator  */
-  GIMP_LAYER_MODE_SEPARATOR = -1         /*< pdb-skip, skip                  >*/
+  GIMP_LAYER_MODE_SEPARATOR = -1         /*< pdb-skip, skip                                                  
  >*/
 } GimpLayerMode;
 
 
diff --git a/app/widgets/gimplayermodecombobox.c b/app/widgets/gimplayermodecombobox.c
index 2697852..57da316 100644
--- a/app/widgets/gimplayermodecombobox.c
+++ b/app/widgets/gimplayermodecombobox.c
@@ -147,6 +147,9 @@ gimp_layer_mode_combo_box_constructed (GObject *object)
 
   gimp_int_combo_box_set_active (GIMP_INT_COMBO_BOX (combo),
                                  combo->priv->layer_mode);
+
+  gimp_int_combo_box_set_layout (GIMP_INT_COMBO_BOX (combo),
+                                 GIMP_INT_COMBO_BOX_LAYOUT_ABBREVIATED);
 }
 
 static void
@@ -339,17 +342,20 @@ gimp_enum_store_add_value (GtkListStore *store,
 {
   GtkTreeIter  iter = { 0, };
   const gchar *desc;
+  const gchar *abbrev;
   gchar       *stripped;
 
-  desc = gimp_enum_value_get_desc (GIMP_ENUM_STORE (store)->enum_class, value);
+  desc   = gimp_enum_value_get_desc   (GIMP_ENUM_STORE (store)->enum_class, value);
+  abbrev = gimp_enum_value_get_abbrev (GIMP_ENUM_STORE (store)->enum_class, value);
 
   /* no mnemonics in combo boxes */
   stripped = gimp_strip_uline (desc);
 
   gtk_list_store_append (store, &iter);
   gtk_list_store_set (store, &iter,
-                      GIMP_INT_STORE_VALUE, value->value,
-                      GIMP_INT_STORE_LABEL, stripped,
+                      GIMP_INT_STORE_VALUE,  value->value,
+                      GIMP_INT_STORE_LABEL,  stripped,
+                      GIMP_INT_STORE_ABBREV, abbrev,
                       -1);
 
   g_free (stripped);


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