cursors/Makefile.am cursors/gimp-tool-cursors.xcf

2008-02-28 Michael Natterer <[email protected]> * cursors/Makefile.am * cursors/gimp-tool-cursors.xcf * cursors/tool-polygon-select.png * cursors/xbm/tool-polygon-select.xbm * cursors/xbm/tool-polygon-select-mask.xbm * app/widgets/widgets-enums.h * app/widgets/gimpcursor.c: new cursor for polygon select. * app/tools/gimppolygonselecttool.c: use it. svn path=/trunk/; revision=24994
xfchris · Feb 28, 2008 · 96645da · 96645da
1 parent a8fbde5
commit 96645da
Show file tree

Hide file tree

Showing 9 changed files with 53 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,15 @@
+2008-02-28 Michael Natterer <[email protected]>
+
+ * cursors/Makefile.am
+ * cursors/gimp-tool-cursors.xcf
+ * cursors/tool-polygon-select.png
+ * cursors/xbm/tool-polygon-select.xbm
+ * cursors/xbm/tool-polygon-select-mask.xbm
+ * app/widgets/widgets-enums.h
+ * app/widgets/gimpcursor.c: new cursor for polygon select.
+
+ * app/tools/gimppolygonselecttool.c: use it.
+
 2008-02-27 Sven Neumann <[email protected]>
 
  * INSTALL

diff --git a/app/tools/gimppolygonselecttool.c b/app/tools/gimppolygonselecttool.c
@@ -192,7 +192,7 @@ gimp_polygon_select_tool_init (GimpPolygonSelectTool *poly_sel_tool)
  gimp_tool_control_set_scroll_lock (tool->control, FALSE);
  gimp_tool_control_set_wants_click (tool->control, TRUE);
  gimp_tool_control_set_tool_cursor (tool->control,
- GIMP_TOOL_CURSOR_FREE_SELECT);
+ GIMP_TOOL_CURSOR_POLYGON_SELECT);
 
  poly_sel_tool->points = NULL;
  poly_sel_tool->n_points = 0;

diff --git a/app/widgets/gimpcursor.c b/app/widgets/gimpcursor.c
@@ -66,6 +66,8 @@
 #include "cursors/xbm/tool-ellipse-select-mask.xbm"
 #include "cursors/xbm/tool-free-select.xbm"
 #include "cursors/xbm/tool-free-select-mask.xbm"
+#include "cursors/xbm/tool-polygon-select.xbm"
+#include "cursors/xbm/tool-polygon-select-mask.xbm"
 #include "cursors/xbm/tool-fuzzy-select.xbm"
 #include "cursors/xbm/tool-fuzzy-select-mask.xbm"
 #include "cursors/xbm/tool-paths.xbm"
@@ -304,6 +306,12 @@ static GimpCursor gimp_tool_cursors[] =
  0, 0,
  tool_free_select, NULL, NULL, NULL
  },
+ {
+ tool_polygon_select_bits, tool_polygon_select_mask_bits,
+ tool_polygon_select_width, tool_polygon_select_height,
+ 0, 0,
+ tool_polygon_select, NULL, NULL, NULL
+ },
  {
  tool_fuzzy_select_bits, tool_fuzzy_select_mask_bits,
  tool_fuzzy_select_width, tool_fuzzy_select_height,

diff --git a/app/widgets/widgets-enums.h b/app/widgets/widgets-enums.h
@@ -229,6 +229,7 @@ typedef enum /*< skip >*/
  GIMP_TOOL_CURSOR_RECT_SELECT,
  GIMP_TOOL_CURSOR_ELLIPSE_SELECT,
  GIMP_TOOL_CURSOR_FREE_SELECT,
+ GIMP_TOOL_CURSOR_POLYGON_SELECT,
  GIMP_TOOL_CURSOR_FUZZY_SELECT,
  GIMP_TOOL_CURSOR_PATHS,
  GIMP_TOOL_CURSOR_PATHS_ANCHOR,

diff --git a/cursors/Makefile.am b/cursors/Makefile.am
@@ -59,6 +59,7 @@ CURSOR_IMAGES = \
  tool-paths-segment.png \
  tool-pencil.png \
  tool-perspective.png \
+ tool-polygon-select.png \
  tool-rect-select.png \
  tool-resize.png \
  tool-rotate.png \
@@ -136,6 +137,8 @@ EXTRA_DIST = \
  xbm/tool-ellipse-select-mask.xbm \
  xbm/tool-free-select.xbm \
  xbm/tool-free-select-mask.xbm \
+ xbm/tool-polygon-select.xbm \
+ xbm/tool-polygon-select-mask.xbm \
  xbm/tool-fuzzy-select.xbm \
  xbm/tool-fuzzy-select-mask.xbm \
  xbm/tool-paths-anchor.xbm \

diff --git a/cursors/gimp-tool-cursors.xcf b/cursors/gimp-tool-cursors.xcf
diff --git a/cursors/tool-polygon-select.png b/cursors/tool-polygon-select.png
diff --git a/cursors/xbm/tool-polygon-select-mask.xbm b/cursors/xbm/tool-polygon-select-mask.xbm
@@ -0,0 +1,14 @@
+#define tool_polygon_select_mask_width 32
+#define tool_polygon_select_mask_height 32
+static unsigned char tool_polygon_select_mask_bits[] = {
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x80, 0x1f,
+ 0x00, 0x00, 0x80, 0x7f, 0x00, 0x00, 0x80, 0xff, 0x00, 0x00, 0x80, 0xe3,
+ 0x00, 0x00, 0xc0, 0xe1, 0x00, 0x00, 0xff, 0x71, 0x00, 0x80, 0xff, 0x71,
+ 0x00, 0x00, 0xff, 0x70, 0x00, 0x00, 0x07, 0x70, 0x00, 0x00, 0x0e, 0x70,
+ 0x00, 0x00, 0x3e, 0x38, 0x00, 0x00, 0xfc, 0x3b, 0x00, 0x00, 0xf8, 0x3f,
+ 0x00, 0x00, 0xc0, 0x3f, 0x00, 0x00, 0x00, 0x1c };
diff --git a/cursors/xbm/tool-polygon-select.xbm b/cursors/xbm/tool-polygon-select.xbm
@@ -0,0 +1,14 @@
+#define tool_polygon_select_width 32
+#define tool_polygon_select_height 32
+static unsigned char tool_polygon_select_bits[] = {
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,
+ 0x00, 0x00, 0x00, 0x1d, 0x00, 0x00, 0x00, 0x61, 0x00, 0x00, 0x00, 0x41,
+ 0x00, 0x00, 0x80, 0x40, 0x00, 0x00, 0x80, 0x20, 0x00, 0x00, 0xff, 0x20,
+ 0x00, 0x00, 0x02, 0x20, 0x00, 0x00, 0x02, 0x20, 0x00, 0x00, 0x04, 0x20,
+ 0x00, 0x00, 0x04, 0x10, 0x00, 0x00, 0x38, 0x10, 0x00, 0x00, 0xc0, 0x13,
+ 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x00 };