Commit ebb9d83d authored by Michael Natterer's avatar Michael Natterer 😴

Bug 795230 - Rename Blend tool and provide PDB compatibility

Step 1: rename the icon to GIMP_ICON_TOOL_GRADIENT (gimp-tool-gradient)
parent bf49b476
......@@ -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;
......
......@@ -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);
......
......@@ -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
......
......@@ -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 \
......
......@@ -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 \
......
......@@ -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);
......
......@@ -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"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment