GNOME.org
 

[gimp] Bug 795230 - Rename Blend tool and provide PDB compatibility

commit ebb9d83d631764b8d4d17c7740ee9f020f3f545d
Author: Michael Natterer <mitch gimp org>
Date:   Fri Apr 13 23:07:08 2018 +0200

    Bug 795230 - Rename Blend tool and provide PDB compatibility
    
    Step 1: rename the icon to GIMP_ICON_TOOL_GRADIENT (gimp-tool-gradient)

 app/core/gimpgradient.c                            |    2 +-
 app/tools/gimpblendtool.c                          |    4 ++--
 .../libgimpwidgets/libgimpwidgets-sections.txt     |    2 +-
 ...{gimp-tool-blend.png => gimp-tool-gradient.png} |  Bin 990 -> 990 bytes
 ...{gimp-tool-blend.png => gimp-tool-gradient.png} |  Bin 1582 -> 1582 bytes
 ...{gimp-tool-blend.svg => gimp-tool-gradient.svg} |    0
 ...{gimp-tool-blend.svg => gimp-tool-gradient.svg} |    0
 ...{gimp-tool-blend.png => gimp-tool-gradient.png} |  Bin 290 -> 290 bytes
 ...{gimp-tool-blend.png => gimp-tool-gradient.png} |  Bin 449 -> 449 bytes
 icons/Legacy/Makefile.am                           |    4 ++--
 ...{gimp-tool-blend.png => gimp-tool-gradient.png} |  Bin 400 -> 400 bytes
 ...{gimp-tool-blend.png => gimp-tool-gradient.png} |  Bin 507 -> 507 bytes
 ...{gimp-tool-blend.svg => gimp-tool-gradient.svg} |    0
 ...{gimp-tool-blend.svg => gimp-tool-gradient.svg} |    0
 icons/icon-list.mk                                 |    8 ++++----
 libgimpwidgets/gimpicons.c                         |    2 ++
 libgimpwidgets/gimpicons.h                         |    6 +++---
 17 files changed, 15 insertions(+), 13 deletions(-)
---
diff --git a/app/core/gimpgradient.c b/app/core/gimpgradient.c
index 9043ce8..4d36d4e 100644
--- a/app/core/gimpgradient.c
+++ b/app/core/gimpgradient.c
@@ -114,7 +114,7 @@ gimp_gradient_class_init (GimpGradientClass *klass)
 
   gimp_object_class->get_memsize    = gimp_gradient_get_memsize;
 
-  viewable_class->default_icon_name = "gimp-tool-blend";
+  viewable_class->default_icon_name = "gimp-tool-gradient";
   viewable_class->get_preview_size  = gimp_gradient_get_preview_size;
   viewable_class->get_popup_size    = gimp_gradient_get_popup_size;
   viewable_class->get_new_preview   = gimp_gradient_get_new_preview;
diff --git a/app/tools/gimpblendtool.c b/app/tools/gimpblendtool.c
index 27e73b4..88da693 100644
--- a/app/tools/gimpblendtool.c
+++ b/app/tools/gimpblendtool.c
@@ -157,7 +157,7 @@ gimp_blend_tool_register (GimpToolRegisterCallback  callback,
                 _("Blend Tool: Fill selected area with a color gradient"),
                 N_("Blen_d"), "L",
                 NULL, GIMP_HELP_TOOL_BLEND,
-                GIMP_ICON_TOOL_BLEND,
+                GIMP_ICON_TOOL_GRADIENT,
                 data);
 }
 
@@ -1014,7 +1014,7 @@ gimp_blend_tool_create_filter (GimpBlendTool *blend_tool,
   blend_tool->filter = gimp_drawable_filter_new (drawable,
                                                  C_("undo-type", "Blend"),
                                                  blend_tool->graph,
-                                                 GIMP_ICON_TOOL_BLEND);
+                                                 GIMP_ICON_TOOL_GRADIENT);
 
   gimp_drawable_filter_set_region (blend_tool->filter,
                                    GIMP_FILTER_REGION_DRAWABLE);
diff --git a/devel-docs/libgimpwidgets/libgimpwidgets-sections.txt 
b/devel-docs/libgimpwidgets/libgimpwidgets-sections.txt
index 6b9fc0c..402af87 100644
--- a/devel-docs/libgimpwidgets/libgimpwidgets-sections.txt
+++ b/devel-docs/libgimpwidgets/libgimpwidgets-sections.txt
@@ -1008,7 +1008,6 @@ GIMP_ICON_SHAPE_SQUARE
 GIMP_ICON_SYSTEM_RUN
 GIMP_ICON_TOOL_AIRBRUSH
 GIMP_ICON_TOOL_ALIGN
-GIMP_ICON_TOOL_BLEND
 GIMP_ICON_TOOL_BLUR
 GIMP_ICON_TOOL_BRIGHTNESS_CONTRAST
 GIMP_ICON_TOOL_BUCKET_FILL
@@ -1030,6 +1029,7 @@ GIMP_ICON_TOOL_FLIP
 GIMP_ICON_TOOL_FOREGROUND_SELECT
 GIMP_ICON_TOOL_FREE_SELECT
 GIMP_ICON_TOOL_FUZZY_SELECT
+GIMP_ICON_TOOL_GRADIENT
 GIMP_ICON_TOOL_HANDLE_TRANSFORM
 GIMP_ICON_TOOL_HEAL
 GIMP_ICON_TOOL_HUE_SATURATION
diff --git a/icons/Color/24/gimp-tool-blend.svg b/icons/Color/24/gimp-tool-gradient.svg
similarity index 100%
rename from icons/Color/24/gimp-tool-blend.svg
rename to icons/Color/24/gimp-tool-gradient.svg
diff --git a/icons/Color/scalable/gimp-tool-blend.svg b/icons/Color/scalable/gimp-tool-gradient.svg
similarity index 100%
rename from icons/Color/scalable/gimp-tool-blend.svg
rename to icons/Color/scalable/gimp-tool-gradient.svg
diff --git a/icons/Legacy/Makefile.am b/icons/Legacy/Makefile.am
index 75043bf..eec3230 100644
--- a/icons/Legacy/Makefile.am
+++ b/icons/Legacy/Makefile.am
@@ -171,7 +171,6 @@ icons16_DATA = \
        16/gimp-toilet-paper.png                        \
        16/gimp-tool-airbrush.png                       \
        16/gimp-tool-align.png                          \
-       16/gimp-tool-blend.png                          \
        16/gimp-tool-blur.png                           \
        16/gimp-tool-brightness-contrast.png            \
        16/gimp-tool-bucket-fill.png                    \
@@ -191,6 +190,7 @@ icons16_DATA = \
        16/gimp-tool-foreground-select.png              \
        16/gimp-tool-free-select.png                    \
        16/gimp-tool-fuzzy-select.png                   \
+       16/gimp-tool-gradient.png                       \
        16/gimp-tool-handle-transform.png               \
        16/gimp-tool-heal.png                           \
        16/gimp-tool-hue-saturation.png                 \
@@ -289,7 +289,6 @@ tools22_DATA = \
        22/gimp-gegl.png                        \
        22/gimp-tool-airbrush.png               \
        22/gimp-tool-align.png                  \
-       22/gimp-tool-blend.png                  \
        22/gimp-tool-blur.png                   \
        22/gimp-tool-brightness-contrast.png    \
        22/gimp-tool-bucket-fill.png            \
@@ -309,6 +308,7 @@ tools22_DATA = \
        22/gimp-tool-foreground-select.png      \
        22/gimp-tool-free-select.png            \
        22/gimp-tool-fuzzy-select.png           \
+       22/gimp-tool-gradient.png               \
        22/gimp-tool-handle-transform.png       \
        22/gimp-tool-heal.png                   \
        22/gimp-tool-hue-saturation.png         \
diff --git a/icons/Symbolic/24/gimp-tool-blend.svg b/icons/Symbolic/24/gimp-tool-gradient.svg
similarity index 100%
rename from icons/Symbolic/24/gimp-tool-blend.svg
rename to icons/Symbolic/24/gimp-tool-gradient.svg
diff --git a/icons/Symbolic/scalable/gimp-tool-blend.svg b/icons/Symbolic/scalable/gimp-tool-gradient.svg
similarity index 100%
rename from icons/Symbolic/scalable/gimp-tool-blend.svg
rename to icons/Symbolic/scalable/gimp-tool-gradient.svg
diff --git a/icons/icon-list.mk b/icons/icon-list.mk
index 5a6097c..1522116 100644
--- a/icons/icon-list.mk
+++ b/icons/icon-list.mk
@@ -258,7 +258,6 @@ scalable_images = \
        scalable/gimp-toilet-paper.svg                          \
        scalable/gimp-tool-airbrush.svg                         \
        scalable/gimp-tool-align.svg                            \
-       scalable/gimp-tool-blend.svg                            \
        scalable/gimp-tool-blur.svg                             \
        scalable/gimp-tool-brightness-contrast.svg              \
        scalable/gimp-tool-bucket-fill.svg                      \
@@ -280,6 +279,7 @@ scalable_images = \
        scalable/gimp-tool-foreground-select.svg                \
        scalable/gimp-tool-free-select.svg                      \
        scalable/gimp-tool-fuzzy-select.svg                     \
+       scalable/gimp-tool-gradient.svg                         \
        scalable/gimp-tool-handle-transform.svg                 \
        scalable/gimp-tool-heal.svg                             \
        scalable/gimp-tool-hue-saturation.svg                   \
@@ -435,7 +435,6 @@ vector24_images = \
        24/gimp-text-layer.svg                                  \
        24/gimp-tool-airbrush.svg                               \
        24/gimp-tool-align.svg                                  \
-       24/gimp-tool-blend.svg                                  \
        24/gimp-tool-blur.svg                                   \
        24/gimp-tool-brightness-contrast.svg                    \
        24/gimp-tool-bucket-fill.svg                            \
@@ -456,6 +455,7 @@ vector24_images = \
        24/gimp-tool-foreground-select.svg                      \
        24/gimp-tool-free-select.svg                            \
        24/gimp-tool-fuzzy-select.svg                           \
+       24/gimp-tool-gradient.svg                               \
        24/gimp-tool-handle-transform.svg                       \
        24/gimp-tool-heal.svg                                   \
        24/gimp-tool-hue-saturation.svg                         \
@@ -719,7 +719,6 @@ icons16_images = \
        16/gimp-toilet-paper.png                                \
        16/gimp-tool-airbrush.png                               \
        16/gimp-tool-align.png                                  \
-       16/gimp-tool-blend.png                                  \
        16/gimp-tool-blur.png                                   \
        16/gimp-tool-brightness-contrast.png                    \
        16/gimp-tool-bucket-fill.png                            \
@@ -740,6 +739,7 @@ icons16_images = \
        16/gimp-tool-foreground-select.png                      \
        16/gimp-tool-free-select.png                            \
        16/gimp-tool-fuzzy-select.png                           \
+       16/gimp-tool-gradient.png                               \
        16/gimp-tool-handle-transform.png                       \
        16/gimp-tool-heal.png                                   \
        16/gimp-tool-hue-saturation.png                         \
@@ -926,7 +926,6 @@ icons24_images = \
        24/gimp-toilet-paper.png                                \
        24/gimp-tool-airbrush.png                               \
        24/gimp-tool-align.png                                  \
-       24/gimp-tool-blend.png                                  \
        24/gimp-tool-blur.png                                   \
        24/gimp-tool-brightness-contrast.png                    \
        24/gimp-tool-bucket-fill.png                            \
@@ -947,6 +946,7 @@ icons24_images = \
        24/gimp-tool-foreground-select.png                      \
        24/gimp-tool-free-select.png                            \
        24/gimp-tool-fuzzy-select.png                           \
+       24/gimp-tool-gradient.png                               \
        24/gimp-tool-handle-transform.png                       \
        24/gimp-tool-heal.png                                   \
        24/gimp-tool-hue-saturation.png                         \
diff --git a/libgimpwidgets/gimpicons.c b/libgimpwidgets/gimpicons.c
index 5ab3894..010b681 100644
--- a/libgimpwidgets/gimpicons.c
+++ b/libgimpwidgets/gimpicons.c
@@ -574,6 +574,8 @@ gimp_icons_init (void)
                        "gimp-qmask-off", GIMP_STOCK_QUICK_MASK_OFF);
   register_stock_icon (gimp_stock_factory,
                        "gimp-qmask-on", GIMP_STOCK_QUICK_MASK_ON);
+  register_stock_icon (gimp_stock_factory,
+                       "gimp-tool-blend", GIMP_STOCK_TOOL_BLEND);
 
   gtk_icon_factory_add_default (gimp_stock_factory);
 
diff --git a/libgimpwidgets/gimpicons.h b/libgimpwidgets/gimpicons.h
index 5bcdb21..1c19417 100644
--- a/libgimpwidgets/gimpicons.h
+++ b/libgimpwidgets/gimpicons.h
@@ -63,7 +63,7 @@ G_BEGIN_DECLS
 #define GIMP_ICON_DYNAMICS                  "gimp-dynamics"
 #define GIMP_ICON_FILE_MANAGER              "gimp-file-manager"
 #define GIMP_ICON_FONT                      "gtk-select-font"
-#define GIMP_ICON_GRADIENT                  GIMP_ICON_TOOL_BLEND
+#define GIMP_ICON_GRADIENT                  GIMP_ICON_TOOL_GRADIENT
 #define GIMP_ICON_GRID                      "gimp-grid"
 #define GIMP_ICON_INPUT_DEVICE              "gimp-input-device"
 #define GIMP_ICON_MYPAINT_BRUSH             GIMP_ICON_TOOL_MYPAINT_BRUSH
@@ -322,7 +322,6 @@ G_BEGIN_DECLS
 
 #define GIMP_ICON_TOOL_AIRBRUSH             "gimp-tool-airbrush"
 #define GIMP_ICON_TOOL_ALIGN                "gimp-tool-align"
-#define GIMP_ICON_TOOL_BLEND                "gimp-tool-blend"
 #define GIMP_ICON_TOOL_BLUR                 "gimp-tool-blur"
 #define GIMP_ICON_TOOL_BRIGHTNESS_CONTRAST  "gimp-tool-brightness-contrast"
 #define GIMP_ICON_TOOL_BUCKET_FILL          "gimp-tool-bucket-fill"
@@ -344,6 +343,7 @@ G_BEGIN_DECLS
 #define GIMP_ICON_TOOL_FOREGROUND_SELECT    "gimp-tool-foreground-select"
 #define GIMP_ICON_TOOL_FREE_SELECT          "gimp-tool-free-select"
 #define GIMP_ICON_TOOL_FUZZY_SELECT         "gimp-tool-fuzzy-select"
+#define GIMP_ICON_TOOL_GRADIENT             "gimp-tool-gradient"
 #define GIMP_ICON_TOOL_HANDLE_TRANSFORM     "gimp-tool-handle-transform"
 #define GIMP_ICON_TOOL_HEAL                 "gimp-tool-heal"
 #define GIMP_ICON_TOOL_HUE_SATURATION       "gimp-tool-hue-saturation"
@@ -462,7 +462,7 @@ G_BEGIN_DECLS
 
 #define GIMP_STOCK_TOOL_AIRBRUSH            "gimp-tool-airbrush"
 #define GIMP_STOCK_TOOL_ALIGN               "gimp-tool-align"
-#define GIMP_STOCK_TOOL_BLEND               "gimp-tool-blend"
+#define GIMP_STOCK_TOOL_BLEND               "gimp-tool-gradient"
 #define GIMP_STOCK_TOOL_BLUR                "gimp-tool-blur"
 #define GIMP_STOCK_TOOL_BRIGHTNESS_CONTRAST "gimp-tool-brightness-contrast"
 #define GIMP_STOCK_TOOL_BUCKET_FILL         "gimp-tool-bucket-fill"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]