[gimp] app, libgimpwidgets, icons: rename mypaint brush icons and help ID

[Michael Natterer <mitch src gnome org>]

commit d4aa39a7cd038c7cfa4d1af1981698f57b00c60e
Author: Michael Natterer <mitch gimp org>
Date:   Mon Dec 21 00:08:53 2015 +0100

    app, libgimpwidgets, icons: rename mypaint brush icons and help ID
    
    from "mybrush" to "mypaint brush".

 app/actions/tools-actions.c                        |    2 +-
 app/core/gimpmybrush.c                             |    2 +-
 app/paint/gimpmybrushcore.c                        |    2 +-
 app/tools/gimpmybrushtool.c                        |    4 ++--
 app/widgets/gimphelp-ids.h                         |    2 +-
 ...ool-mybrush.png => gimp-tool-mypaint-brush.png} |  Bin 3474 -> 3474 bytes
 ...ool-mybrush.png => gimp-tool-mypaint-brush.png} |  Bin 3469 -> 3469 bytes
 icons/Default/Makefile.am                          |    4 ++--
 libgimpwidgets/gimpicons.c                         |    2 +-
 libgimpwidgets/gimpicons.h                         |    4 ++--
 10 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/app/actions/tools-actions.c b/app/actions/tools-actions.c
index 67636ec..3b15985 100644
--- a/app/actions/tools-actions.c
+++ b/app/actions/tools-actions.c
@@ -190,7 +190,7 @@ static const GimpEnumActionEntry tools_airbrush_flow_actions[] =
 #ifdef HAVE_LIBMYPAINT
 static const GimpEnumActionEntry tools_mybrush_radius_actions[] =
 {
-  { "tools-mybrush-radius-set", GIMP_STOCK_TOOL_MYBRUSH,
+  { "tools-mybrush-radius-set", GIMP_STOCK_TOOL_MYPAINT_BRUSH,
     "Set MyPaint Brush Radius", NULL, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL }
diff --git a/app/core/gimpmybrush.c b/app/core/gimpmybrush.c
index df0f3ca..68a8fbb 100644
--- a/app/core/gimpmybrush.c
+++ b/app/core/gimpmybrush.c
@@ -81,7 +81,7 @@ gimp_mybrush_class_init (GimpMybrushClass *klass)
 
   gimp_object_class->get_memsize    = gimp_mybrush_get_memsize;
 
-  viewable_class->default_icon_name = "gimp-tool-mybrush";
+  viewable_class->default_icon_name = "gimp-tool-mypaint-brush";
   viewable_class->get_description   = gimp_mybrush_get_description;
 
   data_class->dirty                 = gimp_mybrush_dirty;
diff --git a/app/paint/gimpmybrushcore.c b/app/paint/gimpmybrushcore.c
index c29ac78..7bf951d 100644
--- a/app/paint/gimpmybrushcore.c
+++ b/app/paint/gimpmybrushcore.c
@@ -96,7 +96,7 @@ gimp_mybrush_core_register (Gimp                      *gimp,
                   GIMP_TYPE_MYBRUSH_OPTIONS,
                   "gimp-mybrush",
                   _("Mybrush"),
-                  "gimp-tool-mybrush");
+                  "gimp-tool-mypaint-brush");
 }
 
 static void
diff --git a/app/tools/gimpmybrushtool.c b/app/tools/gimpmybrushtool.c
index 75e99da..3e2c578 100644
--- a/app/tools/gimpmybrushtool.c
+++ b/app/tools/gimpmybrushtool.c
@@ -77,8 +77,8 @@ gimp_mybrush_tool_register (GimpToolRegisterCallback  callback,
                   _("MyPaint Brush"),
                   _("MyPaint Brush Tool: Use MyPaint brushes in GIMP"),
                   N_("M_yPaint Brush"), "Y",
-                  NULL, GIMP_HELP_TOOL_MYBRUSH,
-                  GIMP_STOCK_TOOL_MYBRUSH,
+                  NULL, GIMP_HELP_TOOL_MYPAINT_BRUSH,
+                  GIMP_STOCK_TOOL_MYPAINT_BRUSH,
                   data);
 }
 
diff --git a/app/widgets/gimphelp-ids.h b/app/widgets/gimphelp-ids.h
index e5436a1..796e70f 100644
--- a/app/widgets/gimphelp-ids.h
+++ b/app/widgets/gimphelp-ids.h
@@ -298,7 +298,7 @@
 #define GIMP_HELP_TOOL_LEVELS                     "gimp-tool-levels"
 #define GIMP_HELP_TOOL_MEASURE                    "gimp-tool-measure"
 #define GIMP_HELP_TOOL_MOVE                       "gimp-tool-move"
-#define GIMP_HELP_TOOL_MYBRUSH                    "gimp-tool-mybrush"
+#define GIMP_HELP_TOOL_MYPAINT_BRUSH              "gimp-tool-mypaint-brush"
 #define GIMP_HELP_TOOL_N_POINT_DEFORMATION        "gimp-tool-n-point-deformation"
 #define GIMP_HELP_TOOL_PATH                       "gimp-tool-path"
 #define GIMP_HELP_TOOL_PAINTBRUSH                 "gimp-tool-paintbrush"
diff --git a/icons/Default/Makefile.am b/icons/Default/Makefile.am
index 2dace18..591dc5d 100644
--- a/icons/Default/Makefile.am
+++ b/icons/Default/Makefile.am
@@ -194,7 +194,7 @@ icons16_DATA = \
        16/gimp-tool-levels.png                         \
        16/gimp-tool-measure.png                        \
        16/gimp-tool-move.png                           \
-       16/gimp-tool-mybrush.png                        \
+       16/gimp-tool-mypaint-brush.png                  \
        16/gimp-tool-n-point-deformation.png            \
        16/gimp-tool-options.png                        \
        16/gimp-tool-paintbrush.png                     \
@@ -308,7 +308,7 @@ icons22_DATA = \
        22/gimp-tool-levels.png                 \
        22/gimp-tool-measure.png                \
        22/gimp-tool-move.png                   \
-       22/gimp-tool-mybrush.png                \
+       22/gimp-tool-mypaint-brush.png          \
        22/gimp-tool-n-point-deformation.png    \
        22/gimp-tool-paintbrush.png             \
        22/gimp-tool-path.png                   \
diff --git a/libgimpwidgets/gimpicons.c b/libgimpwidgets/gimpicons.c
index 2153d3b..b7edd2e 100644
--- a/libgimpwidgets/gimpicons.c
+++ b/libgimpwidgets/gimpicons.c
@@ -263,7 +263,7 @@ static const GtkStockItem gimp_stock_items[] =
   { GIMP_STOCK_TOOL_LEVELS,              NULL,        0, 0, LIBGIMP_DOMAIN },
   { GIMP_STOCK_TOOL_MEASURE,             NULL,        0, 0, LIBGIMP_DOMAIN },
   { GIMP_STOCK_TOOL_MOVE,                NULL,        0, 0, LIBGIMP_DOMAIN },
-  { GIMP_STOCK_TOOL_MYBRUSH,             NULL,        0, 0, LIBGIMP_DOMAIN },
+  { GIMP_STOCK_TOOL_MYPAINT_BRUSH,       NULL,        0, 0, LIBGIMP_DOMAIN },
   { GIMP_STOCK_TOOL_N_POINT_DEFORMATION, NULL,        0, 0, LIBGIMP_DOMAIN },
   { GIMP_STOCK_TOOL_PAINTBRUSH,          NULL,        0, 0, LIBGIMP_DOMAIN },
   { GIMP_STOCK_TOOL_PATH,                NULL,        0, 0, LIBGIMP_DOMAIN },
diff --git a/libgimpwidgets/gimpicons.h b/libgimpwidgets/gimpicons.h
index ea1e638..ec7ee80 100644
--- a/libgimpwidgets/gimpicons.h
+++ b/libgimpwidgets/gimpicons.h
@@ -133,7 +133,7 @@ G_BEGIN_DECLS
 #define GIMP_STOCK_TOOL_LEVELS              "gimp-tool-levels"
 #define GIMP_STOCK_TOOL_MEASURE             "gimp-tool-measure"
 #define GIMP_STOCK_TOOL_MOVE                "gimp-tool-move"
-#define GIMP_STOCK_TOOL_MYBRUSH             "gimp-tool-mybrush"
+#define GIMP_STOCK_TOOL_MYPAINT_BRUSH       "gimp-tool-mypaint-brush"
 #define GIMP_STOCK_TOOL_N_POINT_DEFORMATION "gimp-tool-n-point-deformation"
 #define GIMP_STOCK_TOOL_PAINTBRUSH          "gimp-tool-paintbrush"
 #define GIMP_STOCK_TOOL_PATH                "gimp-tool-path"
@@ -290,7 +290,7 @@ G_BEGIN_DECLS
 #define GIMP_STOCK_DETACH                   GTK_STOCK_CONVERT
 #define GIMP_STOCK_FONT                     GTK_STOCK_SELECT_FONT
 #define GIMP_STOCK_GRADIENT                 GIMP_STOCK_TOOL_BLEND
-#define GIMP_STOCK_MYPAINT_BRUSH            GIMP_STOCK_TOOL_MYBRUSH
+#define GIMP_STOCK_MYPAINT_BRUSH            GIMP_STOCK_TOOL_MYPAINT_BRUSH
 #define GIMP_STOCK_PALETTE                  GTK_STOCK_SELECT_COLOR
 #define GIMP_STOCK_PATTERN                  GIMP_STOCK_TOOL_BUCKET_FILL
 #define GIMP_STOCK_CONTROLLER_MOUSE         GIMP_STOCK_CURSOR