[gimp/pippin/linear-is-the-new-black: 7/7] app: limit layer/paint mode menus to saner subset

[Øyvind Kolås <ok src gnome org>]

commit 2f8b04bd97f1ae88b5d5bd0c54520b1c1147fa3c
Author: Øyvind Kolås <pippin gimp org>
Date:   Wed Jan 25 02:41:40 2017 +0100

    app: limit layer/paint mode menus to saner subset

 app/widgets/gimpwidgets-constructors.c |   61 ++++++++++++++------------------
 1 files changed, 27 insertions(+), 34 deletions(-)
---
diff --git a/app/widgets/gimpwidgets-constructors.c b/app/widgets/gimpwidgets-constructors.c
index 80e4fa3..9b1db05 100644
--- a/app/widgets/gimpwidgets-constructors.c
+++ b/app/widgets/gimpwidgets-constructors.c
@@ -104,63 +104,56 @@ gimp_paint_mode_menu_new (gboolean with_behind_mode,
   GtkWidget    *combo;
 
   store = gimp_enum_store_new_with_values (GIMP_TYPE_LAYER_MODE,
-                                           45,
+                                           26,
                                            GIMP_LAYER_MODE_NORMAL_NON_LINEAR,
                                            GIMP_LAYER_MODE_NORMAL,
-                                           GIMP_LAYER_MODE_DISSOLVE,
+
                                            GIMP_LAYER_MODE_LIGHTEN_ONLY,
-                                           GIMP_LAYER_MODE_LIGHTEN_ONLY_LEGACY,
-                                           GIMP_LAYER_MODE_SCREEN,
-                                           GIMP_LAYER_MODE_SCREEN_LEGACY,
+                                           GIMP_LAYER_MODE_SCREEN_LINEAR,
                                            GIMP_LAYER_MODE_DODGE,
-                                           GIMP_LAYER_MODE_DODGE_LEGACY,
-                                           GIMP_LAYER_MODE_ADDITION,
-                                           GIMP_LAYER_MODE_ADDITION_LEGACY,
+                                           GIMP_LAYER_MODE_ADDITION_LINEAR,
+
                                            GIMP_LAYER_MODE_DARKEN_ONLY,
-                                           GIMP_LAYER_MODE_DARKEN_ONLY_LEGACY,
-                                           GIMP_LAYER_MODE_MULTIPLY,
                                            GIMP_LAYER_MODE_MULTIPLY_LINEAR,
-                                           GIMP_LAYER_MODE_MULTIPLY_LEGACY,
                                            GIMP_LAYER_MODE_BURN,
-                                           GIMP_LAYER_MODE_BURN_LEGACY,
                                            GIMP_LAYER_MODE_LINEAR_BURN,
+
                                            GIMP_LAYER_MODE_OVERLAY,
                                            GIMP_LAYER_MODE_SOFTLIGHT,
-                                           GIMP_LAYER_MODE_SOFTLIGHT_LEGACY,
                                            GIMP_LAYER_MODE_HARDLIGHT,
-                                           GIMP_LAYER_MODE_HARDLIGHT_LEGACY,
                                            GIMP_LAYER_MODE_VIVID_LIGHT,
                                            GIMP_LAYER_MODE_PIN_LIGHT,
                                            GIMP_LAYER_MODE_LINEAR_LIGHT,
-                                           GIMP_LAYER_MODE_DIFFERENCE,
-                                           GIMP_LAYER_MODE_DIFFERENCE_LEGACY,
-                                           GIMP_LAYER_MODE_SUBTRACT,
-                                           GIMP_LAYER_MODE_SUBTRACT_LEGACY,
-                                           GIMP_LAYER_MODE_EXCLUSION,
+
+                                           GIMP_LAYER_MODE_DIFFERENCE,  
+                                           //GIMP_LAYER_MODE_DIFFERENCE_LINEAR,
+                                           GIMP_LAYER_MODE_SUBTRACT_LINEAR,
+                                           //GIMP_LAYER_MODE_EXCLUSION, // similar to difference..
+                                           //GIMP_LAYER_MODE_EXCLUSION_LINEAR,
                                            GIMP_LAYER_MODE_GRAIN_EXTRACT,
-                                           GIMP_LAYER_MODE_GRAIN_EXTRACT_LEGACY,
+                                           //GIMP_LAYER_MODE_GRAIN_EXTRACT_LINEAR,
                                            GIMP_LAYER_MODE_GRAIN_MERGE,
-                                           GIMP_LAYER_MODE_GRAIN_MERGE_LEGACY,
-                                           GIMP_LAYER_MODE_DIVIDE,
-                                           GIMP_LAYER_MODE_DIVIDE_LEGACY,
-                                           GIMP_LAYER_MODE_HSV_HUE,
-                                           GIMP_LAYER_MODE_HSV_SATURATION,
-                                           GIMP_LAYER_MODE_HSV_COLOR,
-                                           GIMP_LAYER_MODE_HSV_VALUE,
-                                           GIMP_LAYER_MODE_HSV_HUE_LEGACY,
-                                           GIMP_LAYER_MODE_HSV_SATURATION_LEGACY,
-                                           GIMP_LAYER_MODE_HSV_COLOR_LEGACY,
-                                           GIMP_LAYER_MODE_HSV_VALUE_LEGACY,
+                                           //GIMP_LAYER_MODE_GRAIN_MERGE_LINEAR,
+                                           //GIMP_LAYER_MODE_DIVIDE,
+                                           GIMP_LAYER_MODE_DIVIDE_LINEAR,
+                                           //GIMP_LAYER_MODE_HSV_HUE,
+                                           //GIMP_LAYER_MODE_HSV_SATURATION,
+                                           //GIMP_LAYER_MODE_HSV_COLOR,
+                                           //GIMP_LAYER_MODE_HSV_VALUE,
+                                           //GIMP_LAYER_MODE_HSV_HUE_LEGACY,
+                                           //GIMP_LAYER_MODE_HSV_SATURATION_LEGACY,
+                                           //GIMP_LAYER_MODE_HSV_COLOR_LEGACY,
+                                           //GIMP_LAYER_MODE_HSV_VALUE_LEGACY,
                                            GIMP_LAYER_MODE_LCH_HUE,
                                            GIMP_LAYER_MODE_LCH_CHROMA,
                                            GIMP_LAYER_MODE_LCH_COLOR,
                                            GIMP_LAYER_MODE_LCH_LIGHTNESS);
 
   gimp_int_store_insert_separator_after (GIMP_INT_STORE (store),
-                                         GIMP_LAYER_MODE_DISSOLVE, -1);
+                                         GIMP_LAYER_MODE_NORMAL, -1);
 
   gimp_int_store_insert_separator_after (GIMP_INT_STORE (store),
-                                         GIMP_LAYER_MODE_ADDITION_LEGACY, -1);
+                                         GIMP_LAYER_MODE_ADDITION_LINEAR, -1);
 
   gimp_int_store_insert_separator_after (GIMP_INT_STORE (store),
                                          GIMP_LAYER_MODE_LINEAR_BURN, -1);
@@ -169,7 +162,7 @@ gimp_paint_mode_menu_new (gboolean with_behind_mode,
                                          GIMP_LAYER_MODE_LINEAR_LIGHT, -1);
 
   gimp_int_store_insert_separator_after (GIMP_INT_STORE (store),
-                                         GIMP_LAYER_MODE_DIVIDE_LEGACY, -1);
+                                         GIMP_LAYER_MODE_DIVIDE_LINEAR, -1);
 
   gimp_int_store_insert_separator_after (GIMP_INT_STORE (store),
                                          GIMP_LAYER_MODE_HSV_VALUE_LEGACY, -1);