GNOME.org
 

[gimp] app, menus, plug-ins: add new menu Color -> Tone Mapping

commit c6f00eb87f565fd398aa5417cb5bf8aa6211757b
Author: Michael Natterer <mitch gimp org>
Date:   Thu Feb 2 20:42:58 2017 +0100

    app, menus, plug-ins: add new menu Color -> Tone Mapping
    
    Move all related GEGL filters and the retinex plug-in there..

 app/actions/filters-actions.c      |   24 ++++++++++++++++++++++++
 app/actions/image-actions.c        |   13 +++++++------
 app/sanity.c                       |    4 ++++
 app/tools/gimpgegltool.c           |    4 ++++
 app/widgets/gimphelp-ids.h         |    4 ++++
 menus/image-menu.xml.in            |    7 +++++++
 plug-ins/common/contrast-retinex.c |    2 +-
 7 files changed, 51 insertions(+), 7 deletions(-)
---
diff --git a/app/actions/filters-actions.c b/app/actions/filters-actions.c
index a978f89..466e2e1 100644
--- a/app/actions/filters-actions.c
+++ b/app/actions/filters-actions.c
@@ -257,6 +257,11 @@ static const GimpStringActionEntry filters_actions[] =
     "gegl:exposure",
     GIMP_HELP_FILTER_EXPOSURE },
 
+  { "filters-fattal-2002", GIMP_STOCK_GEGL,
+    NC_("filters-action", "_Fattal et al. 2002..."), NULL, NULL,
+    "gegl:fattal02",
+    GIMP_HELP_FILTER_FATTAL_2002 },
+
   { "filters-fractal-trace", GIMP_STOCK_GEGL,
     NC_("filters-action", "_Fractal Trace..."), NULL, NULL,
     "gegl:fractal-trace",
@@ -312,6 +317,11 @@ static const GimpStringActionEntry filters_actions[] =
     "gegl:lens-flare",
     GIMP_HELP_FILTER_LENS_FLARE },
 
+  { "filters-mantiuk-2006", GIMP_STOCK_GEGL,
+    NC_("filters-action", "_Mantiuk 2006..."), NULL, NULL,
+    "gegl:mantiuk06",
+    GIMP_HELP_FILTER_MANTIUK_2006 },
+
   { "filters-maze", GIMP_STOCK_GEGL,
     NC_("filters-action", "_Maze..."), NULL, NULL,
     "gegl:maze",
@@ -442,6 +452,11 @@ static const GimpStringActionEntry filters_actions[] =
     "gegl:red-eye-removal",
     GIMP_HELP_FILTER_RED_EYE_REMOVAL },
 
+  { "filters-reinhard-2005", GIMP_STOCK_GEGL,
+    NC_("filters-action", "_Reinhard 2005..."), NULL, NULL,
+    "gegl:reinhard05",
+    GIMP_HELP_FILTER_REINHARD_2005 },
+
   { "filters-rgb-clip", GIMP_STOCK_GEGL,
     NC_("filters-action", "RGB _Clip..."), NULL, NULL,
     "gegl:rgb-clip",
@@ -502,6 +517,11 @@ static const GimpStringActionEntry filters_actions[] =
     "gegl:stretch-contrast-hsv",
     GIMP_HELP_FILTER_STRETCH_CONTRAST_HSV },
 
+  { "filters-stress", GIMP_STOCK_GEGL,
+    NC_("filters-action", "_Stress..."), NULL, NULL,
+    "gegl:stress",
+    GIMP_HELP_FILTER_STRESS },
+
   { "filters-supernova", GIMP_STOCK_GEGL,
     NC_("filters-action", "Super_nova..."), NULL, NULL,
     "gegl:supernova",
@@ -721,6 +741,7 @@ filters_actions_update (GimpActionGroup *group,
   SET_SENSITIVE ("filters-emboss",                  writable);
   SET_SENSITIVE ("filters-engrave",                 writable);
   SET_SENSITIVE ("filters-exposure",                writable);
+  SET_SENSITIVE ("filters-fattal-2002",             writable);
   SET_SENSITIVE ("filters-fractal-trace",           writable);
   SET_SENSITIVE ("filters-gaussian-blur",           writable);
   SET_SENSITIVE ("filters-gaussian-blur-selective", writable);
@@ -732,6 +753,7 @@ filters_actions_update (GimpActionGroup *group,
   SET_SENSITIVE ("filters-kaleidoscope",            writable);
   SET_SENSITIVE ("filters-lens-distortion",         writable);
   SET_SENSITIVE ("filters-lens-flare",              writable);
+  SET_SENSITIVE ("filters-mantiuk-2006",            writable);
   SET_SENSITIVE ("filters-maze",                    writable);
   SET_SENSITIVE ("filters-mono-mixer",              writable && !gray);
   SET_SENSITIVE ("filters-mosaic",                  writable);
@@ -758,6 +780,7 @@ filters_actions_update (GimpActionGroup *group,
   SET_SENSITIVE ("filters-polar-coordinates",       writable);
   SET_SENSITIVE ("filters-posterize",               writable);
   SET_SENSITIVE ("filters-red-eye-removal",         writable && !gray);
+  SET_SENSITIVE ("filters-reinhard-2005",           writable);
   SET_SENSITIVE ("filters-rgb-clip",                writable);
   SET_SENSITIVE ("filters-ripple",                  writable);
   SET_SENSITIVE ("filters-saturation",              writable && !gray);
@@ -770,6 +793,7 @@ filters_actions_update (GimpActionGroup *group,
   SET_SENSITIVE ("filters-softglow",                writable);
   SET_SENSITIVE ("filters-stretch-contrast",        writable);
   SET_SENSITIVE ("filters-stretch-contrast-hsv",    writable);
+  SET_SENSITIVE ("filters-stress",                  writable);
   SET_SENSITIVE ("filters-supernova",               writable);
   SET_SENSITIVE ("filters-threshold-alpha",         writable && alpha);
   SET_SENSITIVE ("filters-tile-glass",              writable);
diff --git a/app/actions/image-actions.c b/app/actions/image-actions.c
index 3f660d5..afcbf32 100644
--- a/app/actions/image-actions.c
+++ b/app/actions/image-actions.c
@@ -63,12 +63,13 @@ static const GimpActionEntry image_actions[] =
   { "image-transform-menu",        NULL, NC_("image-action", "_Transform") },
   { "image-guides-menu",           NULL, NC_("image-action", "_Guides")    },
 
-  { "colors-menu",            NULL, NC_("image-action", "_Colors")     },
-  { "colors-info-menu",       NULL, NC_("image-action", "I_nfo")       },
-  { "colors-auto-menu",       NULL, NC_("image-action", "_Auto")       },
-  { "colors-map-menu",        NULL, NC_("image-action", "_Map")        },
-  { "colors-components-menu", NULL, NC_("image-action", "C_omponents") },
-  { "colors-desaturate-menu", NULL, NC_("image-action", "D_esaturate") },
+  { "colors-menu",              NULL, NC_("image-action", "_Colors")       },
+  { "colors-info-menu",         NULL, NC_("image-action", "I_nfo")         },
+  { "colors-auto-menu",         NULL, NC_("image-action", "_Auto")         },
+  { "colors-map-menu",          NULL, NC_("image-action", "_Map")          },
+  { "colors-tone-mapping-menu", NULL, NC_("image-action", "_Tone Mapping") },
+  { "colors-components-menu",   NULL, NC_("image-action", "C_omponents")   },
+  { "colors-desaturate-menu",   NULL, NC_("image-action", "D_esaturate")   },
 
   { "image-new", "document-new",
     NC_("image-action", "_New..."), "<primary>N",
diff --git a/app/sanity.c b/app/sanity.c
index a67b797..7703b94 100644
--- a/app/sanity.c
+++ b/app/sanity.c
@@ -558,6 +558,7 @@ sanity_check_gegl_ops (void)
     "gegl:emboss",
     "gegl:engrave",
     "gegl:exposure",
+    "gegl:fattal02",
     "gegl:fractal-trace",
     "gegl:gaussian-blur",
     "gegl:gaussian-blur-selective",
@@ -571,6 +572,7 @@ sanity_check_gegl_ops (void)
     "gegl:invert-linear",
     "gegl:lens-distortion",
     "gegl:lens-flare",
+    "gegl:mantiuk06",
     "gegl:map-absolute",
     "gegl:map-relative",
     "gegl:matting-global",
@@ -599,6 +601,7 @@ sanity_check_gegl_ops (void)
     "gegl:pixelize",
     "gegl:polar-coordinates",
     "gegl:red-eye-removal",
+    "gegl:reinhard05",
     "gegl:rgb-clip",
     "gegl:ripple",
     "gegl:saturation",
@@ -614,6 +617,7 @@ sanity_check_gegl_ops (void)
     "gegl:softglow",
     "gegl:stretch-contrast",
     "gegl:stretch-contrast-hsv",
+    "gegl:stress",
     "gegl:supernova",
     "gegl:threshold",
     "gegl:tile",
diff --git a/app/tools/gimpgegltool.c b/app/tools/gimpgegltool.c
index e5b0a52..8a69d5f 100644
--- a/app/tools/gimpgegltool.c
+++ b/app/tools/gimpgegltool.c
@@ -144,6 +144,7 @@ gimp_gegl_tool_operation_blacklisted (const gchar *name,
     "gegl:emboss",
     "gegl:engrave",
     "gegl:exposure",
+    "gegl:fattal02",
     "gegl:fractal-trace",
     "gegl:gaussian-blur",
     "gegl:gaussian-blur-selective",
@@ -156,6 +157,7 @@ gimp_gegl_tool_operation_blacklisted (const gchar *name,
     "gegl:invert-gamma",
     "gegl:lens-distortion",
     "gegl:lens-flare",
+    "gegl:mantiuk06",
     "gegl:maze",
     "gegl:mirrors",
     "gegl:mono-mixer",
@@ -180,6 +182,7 @@ gimp_gegl_tool_operation_blacklisted (const gchar *name,
     "gegl:plasma",
     "gegl:polar-coordinates",
     "gegl:red-eye-removal",
+    "gegl:reinhard05",
     "gegl:rgb-clip",
     "gegl:ripple",
     "gegl:saturation",
@@ -192,6 +195,7 @@ gimp_gegl_tool_operation_blacklisted (const gchar *name,
     "gegl:softglow",
     "gegl:stretch-contrast",
     "gegl:stretch-contrast-hsv",
+    "gegl:stress",
     "gegl:supernova",
     "gegl:texturize-canvas",
     "gegl:tile-glass",
diff --git a/app/widgets/gimphelp-ids.h b/app/widgets/gimphelp-ids.h
index 1ff9df3..20e93f9 100644
--- a/app/widgets/gimphelp-ids.h
+++ b/app/widgets/gimphelp-ids.h
@@ -364,6 +364,7 @@
 #define GIMP_HELP_FILTER_EMBOSS                   "gimp-filter-emboss"
 #define GIMP_HELP_FILTER_ENGRAVE                  "gimp-filter-engrave"
 #define GIMP_HELP_FILTER_EXPOSURE                 "gimp-filter-exposure"
+#define GIMP_HELP_FILTER_FATTAL_2002              "gimp-filter-fattal-2002"
 #define GIMP_HELP_FILTER_FRACTAL_TRACE            "gimp-filter-fractal-trace"
 #define GIMP_HELP_FILTER_GAUSSIAN_BLUR            "gimp-filter-gaussian-blur"
 #define GIMP_HELP_FILTER_GAUSSIAN_BLUR_SELECTIVE  "gimp-filter-gaussian-blur-selective"
@@ -375,6 +376,7 @@
 #define GIMP_HELP_FILTER_KALEIDOSCOPE             "gimp-filter-kaleidoscope"
 #define GIMP_HELP_FILTER_LENS_DISTORTION          "gimp-filter-lens-distortion"
 #define GIMP_HELP_FILTER_LENS_FLARE               "gimp-filter-lens-flare"
+#define GIMP_HELP_FILTER_MANTIUK_2006             "gimp-filter-manituk-2006"
 #define GIMP_HELP_FILTER_MAZE                     "gimp-filter-maze"
 #define GIMP_HELP_FILTER_MONO_MIXER               "gimp-filter-mono-mixer"
 #define GIMP_HELP_FILTER_MOSAIC                   "gimp-filter-mosaic"
@@ -401,6 +403,7 @@
 #define GIMP_HELP_FILTER_POLAR_COORDINATES        "gimp-filter-polar-coordinates"
 #define GIMP_HELP_FILTER_POSTERIZE                "gimp-filter-posterize"
 #define GIMP_HELP_FILTER_RED_EYE_REMOVAL          "gimp-filter-red-eye-removal"
+#define GIMP_HELP_FILTER_REINHARD_2005            "gimp-filter-reinhard-2005"
 #define GIMP_HELP_FILTER_RGB_CLIP                 "gimp-filter-rgb-clip"
 #define GIMP_HELP_FILTER_RIPPLE                   "gimp-filter-ripple"
 #define GIMP_HELP_FILTER_SATURATION               "gimp-filter-saturation"
@@ -413,6 +416,7 @@
 #define GIMP_HELP_FILTER_SOFTGLOW                 "gimp-filter-softglow"
 #define GIMP_HELP_FILTER_STRETCH_CONTRAST         "gimp-filter-stretch-contrast"
 #define GIMP_HELP_FILTER_STRETCH_CONTRAST_HSV     "gimp-filter-stretch-contrast-hsv"
+#define GIMP_HELP_FILTER_STRESS                   "gimp-filter-stress"
 #define GIMP_HELP_FILTER_SUPERNOVA                "gimp-filter-supernova"
 #define GIMP_HELP_FILTER_THRESHOLD_ALPHA          "gimp-filter-threshold-alpha"
 #define GIMP_HELP_FILTER_TILE_GLASS               "gimp-filter-tile-glass"
diff --git a/menus/image-menu.xml.in b/menus/image-menu.xml.in
index 9c96ce3..bee5a62 100644
--- a/menus/image-menu.xml.in
+++ b/menus/image-menu.xml.in
@@ -597,6 +597,13 @@
        <menuitem action="filters-color-exchange" />
        <menuitem action="filters-color-rotate" />
       </menu>
+      <menu action="colors-tone-mapping-menu" name="Tone Mapping">
+       <menuitem action="filters-fattal-2002" />
+       <menuitem action="filters-mantiuk-2006" />
+       <menuitem action="filters-reinhard-2005" />
+       <menuitem action="filters-stress" />
+        <separator />
+      </menu>
       <menu action="colors-info-menu" name="Info">
         <menuitem action="dialogs-histogram" />
       </menu>
diff --git a/plug-ins/common/contrast-retinex.c b/plug-ins/common/contrast-retinex.c
index 8eb093d..da58c1f 100644
--- a/plug-ins/common/contrast-retinex.c
+++ b/plug-ins/common/contrast-retinex.c
@@ -169,7 +169,7 @@ query (void)
                           G_N_ELEMENTS (args), 0,
                           args, NULL);
 
-  gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Colors/Modify");
+  gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Colors/Tone Mapping");
 }
 
 static void
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]