GNOME.org
 

[gimp/gimp-2-10] app: rename "Fade" section of GimpFilterTool to "Blending Options"

commit ba7d2f4f879a9e3e021987afe0c48be18b5b109f
Author: Ell <ell_se yahoo com>
Date:   Wed Apr 8 15:58:11 2020 +0300

    app: rename "Fade" section of GimpFilterTool to "Blending Options"
    
    ... and GIMP_LAYER_MODE_CONTEXT_FADE to
    GIMP_LAYER_MODE_CONTEXT_FILTER.
    
    (cherry picked from commit 38059dc5fd6fa6e64c0db7f0b3f9387ae34386f2)

 app/operations/layer-modes/gimp-layer-modes.c | 10 +++++-----
 app/operations/operations-enums.c             |  4 ++--
 app/operations/operations-enums.h             | 10 +++++-----
 app/tools/gimpfilteroptions.c                 | 14 +++++++-------
 app/tools/gimpfilteroptions.h                 |  2 +-
 app/tools/gimpfiltertool.c                    |  8 ++++----
 6 files changed, 24 insertions(+), 24 deletions(-)
---
diff --git a/app/operations/layer-modes/gimp-layer-modes.c b/app/operations/layer-modes/gimp-layer-modes.c
index 7a751bc855..30bf839799 100644
--- a/app/operations/layer-modes/gimp-layer-modes.c
+++ b/app/operations/layer-modes/gimp-layer-modes.c
@@ -87,7 +87,7 @@ static const GimpLayerModeInfo layer_mode_infos[] =
                             GIMP_LAYER_MODE_FLAG_COMPOSITE_SPACE_IMMUTABLE |
                             GIMP_LAYER_MODE_FLAG_COMPOSITE_MODE_IMMUTABLE,
     .context              = GIMP_LAYER_MODE_CONTEXT_PAINT |
-                            GIMP_LAYER_MODE_CONTEXT_FADE,
+                            GIMP_LAYER_MODE_CONTEXT_FILTER,
     .paint_composite_mode = GIMP_LAYER_COMPOSITE_UNION,
     .composite_mode       = GIMP_LAYER_COMPOSITE_UNION,
     .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL
@@ -369,7 +369,7 @@ static const GimpLayerModeInfo layer_mode_infos[] =
                             GIMP_LAYER_MODE_FLAG_COMPOSITE_MODE_IMMUTABLE  |
                             GIMP_LAYER_MODE_FLAG_SUBTRACTIVE,
     .context              = GIMP_LAYER_MODE_CONTEXT_PAINT |
-                            GIMP_LAYER_MODE_CONTEXT_FADE,
+                            GIMP_LAYER_MODE_CONTEXT_FILTER,
     .paint_composite_mode = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
     .composite_mode       = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
     .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL,
@@ -451,7 +451,7 @@ static const GimpLayerModeInfo layer_mode_infos[] =
     .op_name              = "gimp:behind",
     .flags                = GIMP_LAYER_MODE_FLAG_BLEND_SPACE_IMMUTABLE,
     .context              = GIMP_LAYER_MODE_CONTEXT_PAINT |
-                            GIMP_LAYER_MODE_CONTEXT_FADE,
+                            GIMP_LAYER_MODE_CONTEXT_FILTER,
     .paint_composite_mode = GIMP_LAYER_COMPOSITE_UNION,
     .composite_mode       = GIMP_LAYER_COMPOSITE_UNION,
     .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_LINEAR
@@ -826,7 +826,7 @@ static const GimpLayerModeInfo layer_mode_infos[] =
     .op_name              = "gimp:replace",
     .flags                = GIMP_LAYER_MODE_FLAG_BLEND_SPACE_IMMUTABLE |
                             GIMP_LAYER_MODE_FLAG_TRIVIAL,
-    .context              = GIMP_LAYER_MODE_CONTEXT_FADE,
+    .context              = GIMP_LAYER_MODE_CONTEXT_FILTER,
     .paint_composite_mode = GIMP_LAYER_COMPOSITE_UNION,
     .composite_mode       = GIMP_LAYER_COMPOSITE_UNION,
     .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_LINEAR
@@ -838,7 +838,7 @@ static const GimpLayerModeInfo layer_mode_infos[] =
     .flags                = GIMP_LAYER_MODE_FLAG_BLEND_SPACE_IMMUTABLE     |
                             GIMP_LAYER_MODE_FLAG_COMPOSITE_SPACE_IMMUTABLE |
                             GIMP_LAYER_MODE_FLAG_ALPHA_ONLY,
-    .context              = GIMP_LAYER_MODE_CONTEXT_FADE,
+    .context              = GIMP_LAYER_MODE_CONTEXT_FILTER,
     .paint_composite_mode = GIMP_LAYER_COMPOSITE_UNION,
     .composite_mode       = GIMP_LAYER_COMPOSITE_UNION
   }
diff --git a/app/operations/operations-enums.c b/app/operations/operations-enums.c
index a0d67b88e0..1e8101d2e5 100644
--- a/app/operations/operations-enums.c
+++ b/app/operations/operations-enums.c
@@ -338,7 +338,7 @@ gimp_layer_mode_context_get_type (void)
     { GIMP_LAYER_MODE_CONTEXT_LAYER, "GIMP_LAYER_MODE_CONTEXT_LAYER", "layer" },
     { GIMP_LAYER_MODE_CONTEXT_GROUP, "GIMP_LAYER_MODE_CONTEXT_GROUP", "group" },
     { GIMP_LAYER_MODE_CONTEXT_PAINT, "GIMP_LAYER_MODE_CONTEXT_PAINT", "paint" },
-    { GIMP_LAYER_MODE_CONTEXT_FADE, "GIMP_LAYER_MODE_CONTEXT_FADE", "fade" },
+    { GIMP_LAYER_MODE_CONTEXT_FILTER, "GIMP_LAYER_MODE_CONTEXT_FILTER", "filter" },
     { GIMP_LAYER_MODE_CONTEXT_ALL, "GIMP_LAYER_MODE_CONTEXT_ALL", "all" },
     { 0, NULL, NULL }
   };
@@ -348,7 +348,7 @@ gimp_layer_mode_context_get_type (void)
     { GIMP_LAYER_MODE_CONTEXT_LAYER, "GIMP_LAYER_MODE_CONTEXT_LAYER", NULL },
     { GIMP_LAYER_MODE_CONTEXT_GROUP, "GIMP_LAYER_MODE_CONTEXT_GROUP", NULL },
     { GIMP_LAYER_MODE_CONTEXT_PAINT, "GIMP_LAYER_MODE_CONTEXT_PAINT", NULL },
-    { GIMP_LAYER_MODE_CONTEXT_FADE, "GIMP_LAYER_MODE_CONTEXT_FADE", NULL },
+    { GIMP_LAYER_MODE_CONTEXT_FILTER, "GIMP_LAYER_MODE_CONTEXT_FILTER", NULL },
     { GIMP_LAYER_MODE_CONTEXT_ALL, "GIMP_LAYER_MODE_CONTEXT_ALL", NULL },
     { 0, NULL, NULL }
   };
diff --git a/app/operations/operations-enums.h b/app/operations/operations-enums.h
index e9cb41b3b3..0dc51b95fc 100644
--- a/app/operations/operations-enums.h
+++ b/app/operations/operations-enums.h
@@ -150,15 +150,15 @@ GType gimp_layer_mode_context_get_type (void) G_GNUC_CONST;
 
 typedef enum  /*< pdb-skip >*/
 {
-  GIMP_LAYER_MODE_CONTEXT_LAYER = 1 << 0,
-  GIMP_LAYER_MODE_CONTEXT_GROUP = 1 << 1,
-  GIMP_LAYER_MODE_CONTEXT_PAINT = 1 << 2,
-  GIMP_LAYER_MODE_CONTEXT_FADE  = 1 << 3,
+  GIMP_LAYER_MODE_CONTEXT_LAYER  = 1 << 0,
+  GIMP_LAYER_MODE_CONTEXT_GROUP  = 1 << 1,
+  GIMP_LAYER_MODE_CONTEXT_PAINT  = 1 << 2,
+  GIMP_LAYER_MODE_CONTEXT_FILTER = 1 << 3,
 
   GIMP_LAYER_MODE_CONTEXT_ALL = (GIMP_LAYER_MODE_CONTEXT_LAYER |
                                  GIMP_LAYER_MODE_CONTEXT_GROUP |
                                  GIMP_LAYER_MODE_CONTEXT_PAINT |
-                                 GIMP_LAYER_MODE_CONTEXT_FADE)
+                                 GIMP_LAYER_MODE_CONTEXT_FILTER)
 } GimpLayerModeContext;
 
 
diff --git a/app/tools/gimpfilteroptions.c b/app/tools/gimpfilteroptions.c
index e3ee0b89e2..69616b39a1 100644
--- a/app/tools/gimpfilteroptions.c
+++ b/app/tools/gimpfilteroptions.c
@@ -37,7 +37,7 @@ enum
   PROP_PREVIEW_SPLIT_ALIGNMENT,
   PROP_PREVIEW_SPLIT_POSITION,
   PROP_CONTROLLER,
-  PROP_FADE_EXPANDED,
+  PROP_BLENDING_OPTIONS_EXPANDED,
   PROP_COLOR_OPTIONS_EXPANDED
 };
 
@@ -103,8 +103,8 @@ gimp_filter_options_class_init (GimpFilterOptionsClass *klass)
                             TRUE,
                             GIMP_PARAM_STATIC_STRINGS);
 
-  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_FADE_EXPANDED,
-                            "fade-expanded",
+  GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_BLENDING_OPTIONS_EXPANDED,
+                            "blending-options-expanded",
                             NULL, NULL,
                             FALSE,
                             GIMP_PARAM_STATIC_STRINGS);
@@ -151,8 +151,8 @@ gimp_filter_options_set_property (GObject      *object,
       options->controller = g_value_get_boolean (value);
       break;
 
-    case PROP_FADE_EXPANDED:
-      options->fade_expanded = g_value_get_boolean (value);
+    case PROP_BLENDING_OPTIONS_EXPANDED:
+      options->blending_options_expanded = g_value_get_boolean (value);
       break;
 
     case PROP_COLOR_OPTIONS_EXPANDED:
@@ -195,8 +195,8 @@ gimp_filter_options_get_property (GObject    *object,
       g_value_set_boolean (value, options->controller);
       break;
 
-    case PROP_FADE_EXPANDED:
-      g_value_set_boolean (value, options->fade_expanded);
+    case PROP_BLENDING_OPTIONS_EXPANDED:
+      g_value_set_boolean (value, options->blending_options_expanded);
       break;
 
     case PROP_COLOR_OPTIONS_EXPANDED:
diff --git a/app/tools/gimpfilteroptions.h b/app/tools/gimpfilteroptions.h
index bf1d59fedf..04b18217f2 100644
--- a/app/tools/gimpfilteroptions.h
+++ b/app/tools/gimpfilteroptions.h
@@ -42,7 +42,7 @@ struct _GimpFilterOptions
   gdouble            preview_split_position;
   gboolean           controller;
 
-  gboolean           fade_expanded;
+  gboolean           blending_options_expanded;
   gboolean           color_options_expanded;
 };
 
diff --git a/app/tools/gimpfiltertool.c b/app/tools/gimpfiltertool.c
index a8f95f5adb..fdb1681bea 100644
--- a/app/tools/gimpfiltertool.c
+++ b/app/tools/gimpfiltertool.c
@@ -1095,13 +1095,13 @@ gimp_filter_tool_update_dialog_operation_settings (GimpFilterTool *filter_tool)
           gtk_box_pack_start (GTK_BOX (vbox), filter_tool->region_combo,
                               FALSE, FALSE, 0);
 
-          /*  The Fade expander  */
-          expander = gtk_expander_new (_("Fade"));
+          /*  The blending-options expander  */
+          expander = gtk_expander_new (_("Blending Options"));
           gtk_box_pack_start (GTK_BOX (vbox), expander,
                               FALSE, FALSE, 0);
           gtk_widget_show (expander);
 
-          g_object_bind_property (options,  "fade-expanded",
+          g_object_bind_property (options,  "blending-options-expanded",
                                   expander, "expanded",
                                   G_BINDING_SYNC_CREATE |
                                   G_BINDING_BIDIRECTIONAL);
@@ -1117,7 +1117,7 @@ gimp_filter_tool_update_dialog_operation_settings (GimpFilterTool *filter_tool)
           /*  The mode box  */
           mode_box = gimp_prop_layer_mode_box_new (
             filter_tool->config, "gimp-mode",
-            GIMP_LAYER_MODE_CONTEXT_FADE);
+            GIMP_LAYER_MODE_CONTEXT_FILTER);
           gimp_layer_mode_box_set_label (GIMP_LAYER_MODE_BOX (mode_box),
                                          _("Mode"));
           gtk_box_pack_start (GTK_BOX (vbox2), mode_box,
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]