Commit 6c88e46d authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer

changed path tool cursor to actually show a path and added 3 new cursors

2005-08-09  Michael Natterer  <mitch@gimp.org>

	* cursors/gimp-tool-cursors.xcf: changed path tool cursor to
	actually show a path and added 3 new cursors which are supposed
	to show a path's anchor, handle and segments. Someone really
	needs to beautify these...

	* cursors/tool-paths.png
	* cursors/xbm/tool-paths-mask.xbm
	* cursors/xbm/tool-paths.xbm: changed accordingly.

	* cursors/Makefile.am
	* cursors/tool-paths-anchor.png
	* cursors/tool-paths-control.png
	* cursors/tool-paths-segment.png
	* cursors/xbm/tool-paths-anchor-mask.xbm
	* cursors/xbm/tool-paths-anchor.xbm
	* cursors/xbm/tool-paths-control-mask.xbm
	* cursors/xbm/tool-paths-control.xbm
	* cursors/xbm/tool-paths-segment-mask.xbm
	* cursors/xbm/tool-paths-segment.xbm: new files.

	* app/widgets/widgets-enums.h (enum GimpToolCursorType): added
	PATH_ANCHOR, PATH_CONTROL and PATH_SEGMENTS.

	* app/widgets/gimpcursor.c: added the new cursors.

	* app/tools/gimpvectortool.c (gimp_vector_tool_cursor_update):
	use them.
parent 6d124138
2005-08-09 Michael Natterer <mitch@gimp.org>
* cursors/gimp-tool-cursors.xcf: changed path tool cursor to
actually show a path and added 3 new cursors which are supposed
to show a path's anchor, handle and segments. Someone really
needs to beautify these...
* cursors/tool-paths.png
* cursors/xbm/tool-paths-mask.xbm
* cursors/xbm/tool-paths.xbm: changed accordingly.
* cursors/Makefile.am
* cursors/tool-paths-anchor.png
* cursors/tool-paths-control.png
* cursors/tool-paths-segment.png
* cursors/xbm/tool-paths-anchor-mask.xbm
* cursors/xbm/tool-paths-anchor.xbm
* cursors/xbm/tool-paths-control-mask.xbm
* cursors/xbm/tool-paths-control.xbm
* cursors/xbm/tool-paths-segment-mask.xbm
* cursors/xbm/tool-paths-segment.xbm: new files.
* app/widgets/widgets-enums.h (enum GimpToolCursorType): added
PATH_ANCHOR, PATH_CONTROL and PATH_SEGMENTS.
* app/widgets/gimpcursor.c: added the new cursors.
* app/tools/gimpvectortool.c (gimp_vector_tool_cursor_update):
use them.
2005-08-09 Michael Natterer <mitch@gimp.org>
* plug-ins/common/xbm.c: make sure the mask file has valid C
......
......@@ -1282,31 +1282,55 @@ gimp_vector_tool_cursor_update (GimpTool *tool,
case VECTORS_ADD_ANCHOR:
case VECTORS_INSERT_ANCHOR:
cmodifier = GIMP_CURSOR_MODIFIER_PLUS;
tool_cursor = GIMP_TOOL_CURSOR_PATHS_ANCHOR;
cmodifier = GIMP_CURSOR_MODIFIER_PLUS;
break;
case VECTORS_DELETE_ANCHOR:
tool_cursor = GIMP_TOOL_CURSOR_PATHS_ANCHOR;
cmodifier = GIMP_CURSOR_MODIFIER_MINUS;
break;
case VECTORS_DELETE_SEGMENT:
cmodifier = GIMP_CURSOR_MODIFIER_MINUS;
tool_cursor = GIMP_TOOL_CURSOR_PATHS_SEGMENT;
cmodifier = GIMP_CURSOR_MODIFIER_MINUS;
break;
case VECTORS_MOVE_HANDLE:
cursor = GDK_HAND2;
tool_cursor = GIMP_TOOL_CURSOR_PATHS_CONTROL;
cmodifier = GIMP_CURSOR_MODIFIER_MOVE;
break;
case VECTORS_CONVERT_EDGE:
cursor = GDK_HAND2;
tool_cursor = GIMP_TOOL_CURSOR_HAND;
tool_cursor = GIMP_TOOL_CURSOR_PATHS_CONTROL;
cmodifier = GIMP_CURSOR_MODIFIER_CONTROL;
break;
case VECTORS_MOVE_ANCHOR:
tool_cursor = GIMP_TOOL_CURSOR_PATHS_ANCHOR;
cmodifier = GIMP_CURSOR_MODIFIER_MOVE;
break;
case VECTORS_MOVE_CURVE:
tool_cursor = GIMP_TOOL_CURSOR_PATHS_SEGMENT;
cmodifier = GIMP_CURSOR_MODIFIER_MOVE;
break;
case VECTORS_MOVE_STROKE:
case VECTORS_MOVE_VECTORS:
case VECTORS_MOVE_ANCHORSET:
cmodifier = GIMP_CURSOR_MODIFIER_MOVE;
break;
case VECTORS_MOVE_ANCHORSET:
tool_cursor = GIMP_TOOL_CURSOR_PATHS_ANCHOR;
cmodifier = GIMP_CURSOR_MODIFIER_MOVE;
break;
case VECTORS_CONNECT_STROKES:
cmodifier = GIMP_CURSOR_MODIFIER_INTERSECT;
tool_cursor = GIMP_TOOL_CURSOR_PATHS_SEGMENT;
cmodifier = GIMP_CURSOR_MODIFIER_PLUS;
break;
default:
......
......@@ -52,6 +52,12 @@
#include "cursors/xbm/tool-fuzzy-select-mask.xbm"
#include "cursors/xbm/tool-paths.xbm"
#include "cursors/xbm/tool-paths-mask.xbm"
#include "cursors/xbm/tool-paths-anchor.xbm"
#include "cursors/xbm/tool-paths-anchor-mask.xbm"
#include "cursors/xbm/tool-paths-control.xbm"
#include "cursors/xbm/tool-paths-control-mask.xbm"
#include "cursors/xbm/tool-paths-segment.xbm"
#include "cursors/xbm/tool-paths-segment-mask.xbm"
#include "cursors/xbm/tool-iscissors.xbm"
#include "cursors/xbm/tool-iscissors-mask.xbm"
#include "cursors/xbm/tool-move.xbm"
......@@ -232,6 +238,24 @@ static GimpCursor gimp_tool_cursors[] =
0, 0,
tool_paths, NULL, NULL, NULL
},
{
tool_paths_anchor_bits, tool_paths_anchor_mask_bits,
tool_paths_anchor_width, tool_paths_anchor_height,
0, 0,
tool_paths_anchor, NULL, NULL, NULL
},
{
tool_paths_control_bits, tool_paths_control_mask_bits,
tool_paths_control_width, tool_paths_control_height,
0, 0,
tool_paths_control, NULL, NULL, NULL
},
{
tool_paths_segment_bits, tool_paths_segment_mask_bits,
tool_paths_segment_width, tool_paths_segment_height,
0, 0,
tool_paths_segment, NULL, NULL, NULL
},
{
tool_iscissors_bits, tool_iscissors_mask_bits,
tool_iscissors_width, tool_iscissors_height,
......
......@@ -244,6 +244,9 @@ typedef enum /*< skip >*/
GIMP_TOOL_CURSOR_FREE_SELECT,
GIMP_TOOL_CURSOR_FUZZY_SELECT,
GIMP_TOOL_CURSOR_PATHS,
GIMP_TOOL_CURSOR_PATHS_ANCHOR,
GIMP_TOOL_CURSOR_PATHS_CONTROL,
GIMP_TOOL_CURSOR_PATHS_SEGMENT,
GIMP_TOOL_CURSOR_ISCISSORS,
GIMP_TOOL_CURSOR_MOVE,
GIMP_TOOL_CURSOR_ZOOM,
......
......@@ -42,6 +42,9 @@ CURSOR_IMAGES = \
tool-move.png \
tool-paintbrush.png \
tool-paths.png \
tool-paths-anchor.png \
tool-paths-control.png \
tool-paths-segment.png \
tool-pencil.png \
tool-perspective.png \
tool-rect-select.png \
......@@ -101,6 +104,12 @@ EXTRA_DIST = \
xbm/tool-free-select-mask.xbm \
xbm/tool-fuzzy-select.xbm \
xbm/tool-fuzzy-select-mask.xbm \
xbm/tool-paths-anchor.xbm \
xbm/tool-paths-anchor-mask.xbm \
xbm/tool-paths-control.xbm \
xbm/tool-paths-control-mask.xbm \
xbm/tool-paths-segment.xbm \
xbm/tool-paths-segment-mask.xbm \
xbm/tool-paths.xbm \
xbm/tool-paths-mask.xbm \
xbm/tool-iscissors.xbm \
......
cursors/tool-paths.png

760 Bytes | W: | H:

cursors/tool-paths.png

228 Bytes | W: | H:

cursors/tool-paths.png
cursors/tool-paths.png
cursors/tool-paths.png
cursors/tool-paths.png
  • 2-up
  • Swipe
  • Onion skin
#define tool_paths_anchor_mask_width 32
#define tool_paths_anchor_mask_height 32
static unsigned char tool_paths_anchor_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, 0x02, 0x00, 0x00, 0x00, 0x07,
0x00, 0x00, 0x80, 0x0f, 0x00, 0x00, 0xc0, 0x1f, 0x00, 0x00, 0xe0, 0x3f,
0x00, 0x00, 0xc0, 0x1f, 0x08, 0x00, 0x80, 0x0f, 0x1c, 0x00, 0x00, 0x07,
0x1c, 0x00, 0x00, 0x07, 0x38, 0x00, 0x80, 0x03, 0x38, 0x00, 0x80, 0x03,
0x70, 0x40, 0xc0, 0x01, 0xe0, 0xe0, 0xe0, 0x00, 0xdc, 0xf3, 0x79, 0x1c,
0xfe, 0xff, 0x7f, 0x3f, 0xfe, 0xff, 0xff, 0x3f, 0x7e, 0xfd, 0x57, 0x3f,
0x1c, 0xf0, 0x01, 0x1c, 0x00, 0xe0, 0x00, 0x00 };
#define tool_paths_anchor_width 32
#define tool_paths_anchor_height 32
static unsigned char tool_paths_anchor_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, 0x02,
0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x80, 0x0f, 0x00, 0x00, 0xc0, 0x1d,
0x00, 0x00, 0x80, 0x0f, 0x00, 0x00, 0x00, 0x07, 0x08, 0x00, 0x00, 0x02,
0x08, 0x00, 0x00, 0x02, 0x10, 0x00, 0x00, 0x01, 0x10, 0x00, 0x00, 0x01,
0x20, 0x00, 0x80, 0x00, 0x40, 0x40, 0x40, 0x00, 0x80, 0xe0, 0x20, 0x00,
0x1c, 0xf3, 0x19, 0x1c, 0x54, 0xbd, 0x57, 0x15, 0x1c, 0xf0, 0x01, 0x1c,
0x00, 0xe0, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00 };
#define tool_paths_control_mask_width 32
#define tool_paths_control_mask_height 32
static unsigned char tool_paths_control_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, 0x02,
0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x80, 0x0f, 0x00, 0x00, 0xc0, 0x1d,
0x00, 0x00, 0x80, 0x0f, 0x08, 0x00, 0x00, 0x07, 0x1c, 0x00, 0x00, 0x07,
0x1c, 0x00, 0x00, 0x07, 0x38, 0x00, 0x80, 0x03, 0x38, 0x00, 0x80, 0x03,
0x70, 0x00, 0xc0, 0x01, 0xfc, 0x40, 0xe0, 0x1c, 0xfe, 0xe3, 0x78, 0x3e,
0xff, 0xff, 0x7f, 0x7f, 0xff, 0xbf, 0xff, 0x7f, 0x7f, 0xfd, 0x57, 0x7f,
0x3e, 0xe0, 0x00, 0x3e, 0x1c, 0x40, 0x00, 0x1c };
#define tool_paths_control_width 32
#define tool_paths_control_height 32
static unsigned char tool_paths_control_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, 0x02, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x80, 0x08,
0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x02, 0x08, 0x00, 0x00, 0x02,
0x08, 0x00, 0x00, 0x02, 0x10, 0x00, 0x00, 0x01, 0x10, 0x00, 0x00, 0x01,
0x20, 0x00, 0x80, 0x00, 0x40, 0x00, 0x40, 0x00, 0x9c, 0x40, 0x20, 0x1c,
0x3e, 0xa3, 0x18, 0x3e, 0x76, 0x1d, 0x57, 0x37, 0x3e, 0xa0, 0x00, 0x3e,
0x1c, 0x40, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x00 };
/* Created with The GIMP */
#define tool_paths_mask_width 32
#define tool_paths_mask_height 32
static unsigned char tool_paths_mask_bits[] = {
......@@ -6,10 +5,10 @@ static unsigned char tool_paths_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, 0xc0, 0x03,
0x00, 0x00, 0xe0, 0x07, 0x00, 0x00, 0xf0, 0x0f, 0x00, 0x00, 0x38, 0x0e,
0x00, 0x00, 0x38, 0x1f, 0x00, 0x00, 0x1c, 0x1f, 0x00, 0x00, 0xbe, 0x3f,
0x00, 0x00, 0xbe, 0x3f, 0x00, 0x00, 0xbe, 0x3f, 0x00, 0x00, 0xdc, 0x7f,
0x00, 0x00, 0xce, 0x7f, 0x00, 0x00, 0xce, 0x7f, 0x00, 0x00, 0xc7, 0x7f,
0x00, 0x80, 0x83, 0x3f, 0x00, 0x00, 0x81, 0x3f, 0x00, 0x00, 0x80, 0x3f,
0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x00, 0x1f };
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,
0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x80, 0x0f, 0x00, 0x00, 0xc0, 0x1d,
0x00, 0x00, 0x80, 0x0f, 0x08, 0x00, 0x00, 0x07, 0x1c, 0x00, 0x00, 0x07,
0x1c, 0x00, 0x00, 0x07, 0x38, 0x00, 0x80, 0x03, 0x38, 0x00, 0x80, 0x03,
0x70, 0x00, 0xc0, 0x01, 0xe0, 0x40, 0xe0, 0x00, 0xdc, 0xe3, 0x78, 0x1c,
0xfe, 0xff, 0x7f, 0x3f, 0xfe, 0xbf, 0xff, 0x3f, 0x7e, 0xfd, 0x57, 0x3f,
0x1c, 0xe0, 0x00, 0x1c, 0x00, 0x40, 0x00, 0x00 };
#define tool_paths_segment_mask_width 32
#define tool_paths_segment_mask_height 32
static unsigned char tool_paths_segment_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, 0x02,
0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x80, 0x0f, 0x00, 0x00, 0xc0, 0x1d,
0x08, 0x00, 0x80, 0x0f, 0x1c, 0x00, 0x80, 0x0f, 0x3e, 0x00, 0x80, 0x0f,
0x3e, 0x00, 0x80, 0x0f, 0x7c, 0x00, 0xc0, 0x07, 0x7c, 0x00, 0xc0, 0x07,
0xf8, 0x00, 0xe0, 0x03, 0xf0, 0x43, 0xf8, 0x01, 0xfc, 0xff, 0xff, 0x1c,
0xfe, 0xff, 0x7f, 0x3f, 0xfe, 0xbf, 0xff, 0x3f, 0x7e, 0xff, 0x5f, 0x3f,
0x1c, 0xfc, 0x07, 0x1c, 0x00, 0x40, 0x00, 0x00 };
#define tool_paths_segment_width 32
#define tool_paths_segment_height 32
static unsigned char tool_paths_segment_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, 0x02, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x80, 0x08,
0x00, 0x00, 0x00, 0x05, 0x08, 0x00, 0x00, 0x07, 0x14, 0x00, 0x00, 0x05,
0x14, 0x00, 0x00, 0x05, 0x28, 0x00, 0x80, 0x02, 0x28, 0x00, 0x80, 0x02,
0x50, 0x00, 0x40, 0x01, 0xa0, 0x00, 0xa0, 0x00, 0x40, 0x43, 0x58, 0x00,
0x9c, 0xbc, 0x27, 0x1c, 0x54, 0x13, 0x59, 0x15, 0x1c, 0xbc, 0x07, 0x1c,
0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
/* Created with The GIMP */
#define tool_paths_width 32
#define tool_paths_height 32
static unsigned char tool_paths_bits[] = {
......@@ -7,9 +6,9 @@ static unsigned char tool_paths_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, 0xc0, 0x03, 0x00, 0x00, 0x20, 0x04, 0x00, 0x00, 0x10, 0x04,
0x00, 0x00, 0x10, 0x0e, 0x00, 0x00, 0x08, 0x0e, 0x00, 0x00, 0x1c, 0x15,
0x00, 0x00, 0x14, 0x15, 0x00, 0x00, 0x1c, 0x15, 0x00, 0x00, 0x88, 0x24,
0x00, 0x00, 0x84, 0x2e, 0x00, 0x00, 0x84, 0x24, 0x00, 0x00, 0x82, 0x31,
0x00, 0x00, 0x01, 0x1f, 0x00, 0x00, 0x00, 0x1d, 0x00, 0x00, 0x00, 0x1d,
0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x00 };
0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x80, 0x08,
0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x02, 0x08, 0x00, 0x00, 0x02,
0x08, 0x00, 0x00, 0x02, 0x10, 0x00, 0x00, 0x01, 0x10, 0x00, 0x00, 0x01,
0x20, 0x00, 0x80, 0x00, 0x40, 0x00, 0x40, 0x00, 0x80, 0x40, 0x20, 0x00,
0x1c, 0xa3, 0x18, 0x1c, 0x54, 0x1d, 0x57, 0x15, 0x1c, 0xa0, 0x00, 0x1c,
0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
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