[gimp/soc-2010-cage] Bug 608622 - Desaturate icon causes confusion with Gradients tool

[Michael Muré <mmure src gnome org>]

commit e2f6e388d3e74b4bf16a277963f4e87be9b5c6f3
Author: Martin Nordholts <martinn src gnome org>
Date:   Fri Jun 18 22:35:24 2010 +0200

    Bug 608622 - Desaturate icon causes confusion with Gradients tool

 libgimpwidgets/gimpstock.c                         |    3 +++
 libgimpwidgets/gimpstock.h                         |    2 +-
 themes/Default/images/Makefile.am                  |    2 ++
 .../images/tools/stock-tool-desaturate-16.png      |  Bin 0 -> 561 bytes
 .../images/tools/stock-tool-desaturate-22.png      |  Bin 0 -> 789 bytes
 5 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/libgimpwidgets/gimpstock.c b/libgimpwidgets/gimpstock.c
index ea1f399..8aaf949 100644
--- a/libgimpwidgets/gimpstock.c
+++ b/libgimpwidgets/gimpstock.c
@@ -295,6 +295,7 @@ static const GtkStockItem gimp_stock_items[] =
   { GIMP_STOCK_TOOL_COLORIZE,            NULL,        0, 0, LIBGIMP_DOMAIN },
   { GIMP_STOCK_TOOL_CROP,         N_("Cr_op"),        0, 0, LIBGIMP_DOMAIN },
   { GIMP_STOCK_TOOL_CURVES,              NULL,        0, 0, LIBGIMP_DOMAIN },
+  { GIMP_STOCK_TOOL_DESATURATE,          NULL,        0, 0, LIBGIMP_DOMAIN },
   { GIMP_STOCK_TOOL_DODGE,               NULL,        0, 0, LIBGIMP_DOMAIN },
   { GIMP_STOCK_TOOL_ELLIPSE_SELECT,      NULL,        0, 0, LIBGIMP_DOMAIN },
   { GIMP_STOCK_TOOL_ERASER,              NULL,        0, 0, LIBGIMP_DOMAIN },
@@ -446,6 +447,7 @@ gimp_stock_button_pixbufs[] =
   { GIMP_STOCK_TOOL_COLORIZE,            stock_tool_colorize_22            },
   { GIMP_STOCK_TOOL_CROP,                stock_tool_crop_22                },
   { GIMP_STOCK_TOOL_CURVES,              stock_tool_curves_22              },
+  { GIMP_STOCK_TOOL_DESATURATE,          stock_tool_desaturate_22          },
   { GIMP_STOCK_TOOL_DODGE,               stock_tool_dodge_22               },
   { GIMP_STOCK_TOOL_ELLIPSE_SELECT,      stock_tool_ellipse_select_22      },
   { GIMP_STOCK_TOOL_ERASER,              stock_tool_eraser_22              },
@@ -609,6 +611,7 @@ gimp_stock_menu_pixbufs[] =
   { GIMP_STOCK_TOOL_COLORIZE,            stock_tool_colorize_16            },
   { GIMP_STOCK_TOOL_CROP,                stock_tool_crop_16                },
   { GIMP_STOCK_TOOL_CURVES,              stock_tool_curves_16              },
+  { GIMP_STOCK_TOOL_DESATURATE,          stock_tool_desaturate_16          },
   { GIMP_STOCK_TOOL_DODGE,               stock_tool_dodge_16               },
   { GIMP_STOCK_TOOL_ELLIPSE_SELECT,      stock_tool_ellipse_select_16      },
   { GIMP_STOCK_TOOL_ERASER,              stock_tool_eraser_16              },
diff --git a/libgimpwidgets/gimpstock.h b/libgimpwidgets/gimpstock.h
index 491a16e..f51389b 100644
--- a/libgimpwidgets/gimpstock.h
+++ b/libgimpwidgets/gimpstock.h
@@ -110,6 +110,7 @@ G_BEGIN_DECLS
 #define GIMP_STOCK_TOOL_COLORIZE            "gimp-tool-colorize"
 #define GIMP_STOCK_TOOL_CROP                "gimp-tool-crop"
 #define GIMP_STOCK_TOOL_CURVES              "gimp-tool-curves"
+#define GIMP_STOCK_TOOL_DESATURATE          "gimp-tool-desaturate"
 #define GIMP_STOCK_TOOL_DODGE               "gimp-tool-dodge"
 #define GIMP_STOCK_TOOL_ELLIPSE_SELECT      "gimp-tool-ellipse-select"
 #define GIMP_STOCK_TOOL_ERASER              "gimp-tool-eraser"
@@ -277,7 +278,6 @@ G_BEGIN_DECLS
 #define GIMP_STOCK_PALETTE                  GTK_STOCK_SELECT_COLOR
 #define GIMP_STOCK_PATTERN                  GIMP_STOCK_TOOL_BUCKET_FILL
 #define GIMP_STOCK_TOOL_PRESET              GIMP_STOCK_TOOL_PAINTBRUSH
-#define GIMP_STOCK_TOOL_DESATURATE          GIMP_STOCK_CONVERT_GRAYSCALE
 
 
 void   gimp_stock_init (void);
diff --git a/themes/Default/images/Makefile.am b/themes/Default/images/Makefile.am
index 84ea90c..d8aec5a 100644
--- a/themes/Default/images/Makefile.am
+++ b/themes/Default/images/Makefile.am
@@ -285,6 +285,8 @@ STOCK_TOOL_IMAGES = \
 	tools/stock-tool-crop-22.png			\
 	tools/stock-tool-curves-16.png			\
 	tools/stock-tool-curves-22.png			\
+	tools/stock-tool-desaturate-16.png		\
+	tools/stock-tool-desaturate-22.png		\
 	tools/stock-tool-dodge-16.png			\
 	tools/stock-tool-dodge-22.png			\
 	tools/stock-tool-ellipse-select-16.png		\
diff --git a/themes/Default/images/tools/stock-tool-desaturate-16.png b/themes/Default/images/tools/stock-tool-desaturate-16.png
new file mode 100644
index 0000000..92f829c
Binary files /dev/null and b/themes/Default/images/tools/stock-tool-desaturate-16.png differ
diff --git a/themes/Default/images/tools/stock-tool-desaturate-22.png b/themes/Default/images/tools/stock-tool-desaturate-22.png
new file mode 100644
index 0000000..3f02c0a
Binary files /dev/null and b/themes/Default/images/tools/stock-tool-desaturate-22.png differ