summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChristoffer Holmstedt <christoffer.holmstedt@gmail.com>2013-04-18 04:53:04 +0000
committerChristoffer Holmstedt <christoffer.holmstedt@gmail.com>2013-04-18 04:53:04 +0000
commitcd07902bc8bc0583e25f1fdbbf9cda301a54d08f (patch)
tree22839500c86f08ba680141bb048e6c1acf16bf9c /src
parentFix for Bug #503712 (Personal default template not used) by Slagvi. (diff)
downloadinkscape-cd07902bc8bc0583e25f1fdbbf9cda301a54d08f.tar.gz
inkscape-cd07902bc8bc0583e25f1fdbbf9cda301a54d08f.zip
Added 9 cursors for the tweak tool.
Fixed bugs: - https://launchpad.net/bugs/587729 (bzr r12277.1.1)
Diffstat (limited to 'src')
-rw-r--r--src/pixmaps/cursor-tweak-less.xpm38
-rw-r--r--src/pixmaps/cursor-tweak-more.xpm38
-rw-r--r--src/pixmaps/cursor-tweak-move-in.xpm38
-rw-r--r--src/pixmaps/cursor-tweak-move-jitter.xpm38
-rw-r--r--src/pixmaps/cursor-tweak-move-out.xpm38
-rw-r--r--src/pixmaps/cursor-tweak-rotate-clockwise.xpm38
-rw-r--r--src/pixmaps/cursor-tweak-rotate-counterclockwise.xpm38
-rw-r--r--src/pixmaps/cursor-tweak-scale-down.xpm38
-rw-r--r--src/pixmaps/cursor-tweak-scale-up.xpm38
-rw-r--r--src/tweak-context.cpp35
10 files changed, 372 insertions, 5 deletions
diff --git a/src/pixmaps/cursor-tweak-less.xpm b/src/pixmaps/cursor-tweak-less.xpm
new file mode 100644
index 000000000..3a3694fba
--- /dev/null
+++ b/src/pixmaps/cursor-tweak-less.xpm
@@ -0,0 +1,38 @@
+/* XPM */
+static char * cursor_tweak_less_xpm[] = {
+"32 32 3 1",
+" c None",
+". c #FFFFFF",
+"+ c #000000",
+" ... ",
+" .+. ",
+" .+. ",
+"....+.... ",
+".+++ +++. ",
+"....+.... ",
+" .+. ",
+" .+. ",
+" ... ",
+" .. .. ",
+" .+. .+. ",
+" .+. .+. ",
+" .+. .+. ",
+" .+. ...... .+. ",
+" .+..++++..+. ",
+" .+++ +++. ",
+" ..+ . . +.. ",
+" .++.+..+.++. ",
+" .+ .++. +. ",
+" .+ .++. +. ",
+" .++.+..+.++. ",
+" ..+ . . +.. ",
+" .+++ +++. ",
+" .+..++++..+. ",
+" .+. ...... .+. ",
+" .+. .+. ",
+" .+. .+. ",
+" .+. .+. ",
+" .. .. ",
+" ",
+" ",
+" "};
diff --git a/src/pixmaps/cursor-tweak-more.xpm b/src/pixmaps/cursor-tweak-more.xpm
new file mode 100644
index 000000000..37ab75f9f
--- /dev/null
+++ b/src/pixmaps/cursor-tweak-more.xpm
@@ -0,0 +1,38 @@
+/* XPM */
+static char * cursor_tweak_more_xpm[] = {
+"32 32 3 1",
+" c None",
+". c #FFFFFF",
+"+ c #000000",
+" ... ",
+" .+. ...... ",
+" .+. ..++++.. ",
+"....+.... .+++..+++. ",
+".+++ +++. ..+.. ..+.. ",
+"....+.... .++. .++. ",
+" .+. .+. .+. ",
+" .+. .+. .+. ",
+" ... .++. .++. ",
+" ..+.. ..+.. ",
+" .+++..+++. ",
+" ..++++.. ",
+" ... .+ ...... .. ",
+" .+. .+. .+. ",
+" .+..+. +. .+. .+ ",
+" .+.+. .+..+..+. ",
+" .++.... .+.+.+. ",
+" .+++++. .+++. ",
+" ...... .+. ",
+" ...... . ",
+" ..++++.. ...... ",
+" .+++..+++. ..++++.. ",
+" ..+.. ..+.. .+++..+++. ",
+" .++. .++. ..+.. ..+..",
+" .+. .+. .++. .++.",
+" .+. .+. .+. .+.",
+" .++. .++. .+. .+.",
+" ..+.. ..+.. .++. .++.",
+" .+++..+++. ..+.. ..+..",
+" ..++++.. .+++..+++. ",
+" ...... ..++++.. ",
+" ...... "};
diff --git a/src/pixmaps/cursor-tweak-move-in.xpm b/src/pixmaps/cursor-tweak-move-in.xpm
new file mode 100644
index 000000000..b9ff033e7
--- /dev/null
+++ b/src/pixmaps/cursor-tweak-move-in.xpm
@@ -0,0 +1,38 @@
+/* XPM */
+static char * cursor_tweak_move_in_xpm[] = {
+"32 32 3 1",
+" c None",
+". c #FFFFFF",
+"+ c #000000",
+" ... ",
+" .+. ",
+" .+. ",
+"....+.... ",
+".+++ +++. ",
+"....+.... ",
+" .+. ",
+" .+. ",
+" ... ........ ",
+" .+++++++ ",
+" .+++ ",
+" .++++ ",
+" .+.+++ ",
+" .+..+++ ",
+" .+...+++ ",
+" .+. ..+++ ",
+" .. ..+++ ",
+" ..+++ ",
+" ..+++ ",
+" ..+++ ",
+" ..++ ",
+" ... ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" "};
diff --git a/src/pixmaps/cursor-tweak-move-jitter.xpm b/src/pixmaps/cursor-tweak-move-jitter.xpm
new file mode 100644
index 000000000..38808892f
--- /dev/null
+++ b/src/pixmaps/cursor-tweak-move-jitter.xpm
@@ -0,0 +1,38 @@
+/* XPM */
+static char * cursor_tweak_move_jitter_xpm[] = {
+"32 32 3 1",
+" c None",
+". c #FFFFFF",
+"+ c #000000",
+" ... ",
+" .+. ",
+" .+. ",
+"....+.... +++++++ ",
+".+++ +++. ....+++ ",
+"....+.... ++.+ ",
+" .+. ++..+ ",
+" .+. ++. .+ ",
+" ... ++. .+ ",
+" ++. .+ ",
+" ++ +. .. ",
+" .++ ",
+" ..++ ",
+" ..++ ",
+" ..++ ",
+" ..++ + ",
+" ..++ + ",
+" .. ..++ + ",
+" .. .++ ..++ + ",
+" +. ..++ ..+++ ",
+" +. .++ ..++ ",
+" +..++ .+++++++. ",
+" +.++ ......... ",
+" +++ ",
+" ++..... ",
+" +++++++ ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" "};
diff --git a/src/pixmaps/cursor-tweak-move-out.xpm b/src/pixmaps/cursor-tweak-move-out.xpm
new file mode 100644
index 000000000..eadfe5f7c
--- /dev/null
+++ b/src/pixmaps/cursor-tweak-move-out.xpm
@@ -0,0 +1,38 @@
+/* XPM */
+static char * cursor_tweak_move_out_xpm[] = {
+"32 32 3 1",
+" c None",
+". c #FFFFFF",
+"+ c #000000",
+" ... ",
+" .+. ",
+" .+. ",
+"....+.... ",
+".+++ +++. ",
+"....+.... ",
+" .+. ",
+" .+. ",
+" ... ",
+" ",
+" ++ ",
+" +++ ",
+" .+++ ",
+" ..+++ ",
+" ..+++ ",
+" ..+++ + ",
+" ..+++ + ",
+" ..+++ + ",
+" ..+++ + ",
+" ..++++ ",
+" ..+++ ",
+" .+++++++. ",
+" ......... ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" "};
diff --git a/src/pixmaps/cursor-tweak-rotate-clockwise.xpm b/src/pixmaps/cursor-tweak-rotate-clockwise.xpm
new file mode 100644
index 000000000..496500834
--- /dev/null
+++ b/src/pixmaps/cursor-tweak-rotate-clockwise.xpm
@@ -0,0 +1,38 @@
+/* XPM */
+static char * cursor_tweak_rotate_clockwise_xpm[] = {
+"32 32 3 1",
+" c None",
+". c #FFFFFF",
+"+ c #000000",
+" ... ",
+" .+. ",
+" .+. ",
+"....+.... ",
+".+++ +++. ",
+"....+.... ... ",
+" .+. .+. ",
+" .+. .+. ",
+" ... .+. ",
+" .+. ",
+" .+. ",
+" .+. ",
+" .+. ",
+" .. .++. ",
+" .+. .++.. ",
+" .+. .++. ",
+" .+. .++. ",
+" .+......++. ",
+" .+++++++++. ",
+" .+........ ",
+" .+. ",
+" .+. ",
+" .+. ",
+" .. ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" "};
diff --git a/src/pixmaps/cursor-tweak-rotate-counterclockwise.xpm b/src/pixmaps/cursor-tweak-rotate-counterclockwise.xpm
new file mode 100644
index 000000000..1512d84a6
--- /dev/null
+++ b/src/pixmaps/cursor-tweak-rotate-counterclockwise.xpm
@@ -0,0 +1,38 @@
+/* XPM */
+static char * cursor_tweak_rotate_counterclockwise_xpm[] = {
+"32 32 3 1",
+" c None",
+". c #FFFFFF",
+"+ c #000000",
+" ... ",
+" .+. ",
+" .+. ",
+"....+.... ",
+".+++ +++. . ",
+"....+.... .+. ",
+" .+. .+++. ",
+" .+. .+.+.+. ",
+" ... .+..+..+. ",
+" .+. .+. .+. ",
+" .. .+. .. ",
+" .+. ",
+" .+. ",
+" .++. ",
+" .++.. ",
+" .++. ",
+" .++. ",
+" .........++. ",
+" .+++++++++. ",
+" ........... ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" "};
diff --git a/src/pixmaps/cursor-tweak-scale-down.xpm b/src/pixmaps/cursor-tweak-scale-down.xpm
new file mode 100644
index 000000000..ef21bfd26
--- /dev/null
+++ b/src/pixmaps/cursor-tweak-scale-down.xpm
@@ -0,0 +1,38 @@
+/* XPM */
+static char * cursor_tweak_scale_down_xpm[] = {
+"32 32 3 1",
+" c None",
+". c #FFFFFF",
+"+ c #000000",
+" ... ",
+" .+. ",
+" .+. .++++++++++++ ",
+"....+.... .+. + ",
+".+++ +++. .+. + ",
+"....+.... .+. + ",
+" .+. .+. + ",
+" .+. .+. + ",
+" ... .+. + ",
+" .+. + ",
+" .+. + ",
+" .+. + ",
+" .+..........+ ",
+" .++++++++++++ ",
+" ............. ",
+" ",
+" +. ",
+" +. ",
+" .+ +. ",
+" .+ +. ",
+" .+ +. ",
+" .++. ",
+" .+++++ ",
+" ..... ",
+" .+++++ ",
+" .+. + ",
+" .+. + ",
+" .+...+ ",
+" .+++++ ",
+" ...... ",
+" ",
+" "};
diff --git a/src/pixmaps/cursor-tweak-scale-up.xpm b/src/pixmaps/cursor-tweak-scale-up.xpm
new file mode 100644
index 000000000..a72608b26
--- /dev/null
+++ b/src/pixmaps/cursor-tweak-scale-up.xpm
@@ -0,0 +1,38 @@
+/* XPM */
+static char * cursor_tweak_scale_up_xpm[] = {
+"32 32 3 1",
+" c None",
+". c #FFFFFF",
+"+ c #000000",
+" ... ",
+" .+. ",
+" .+. .++++++++++++ ",
+"....+.... .+. + ",
+".+++ +++. .+. + ",
+"....+.... .+. + ",
+" .+. .+. + ",
+" .+. .+. + ",
+" ... .+. + ",
+" .+. + ",
+" .+. + ",
+" .+. + ",
+" .+..........+ ",
+" .++++++++++++ ",
+" ............. ",
+" ",
+" +++++ ",
+" ++ ",
+" +.+ ",
+" +..+ ",
+" +. .+ ",
+" +. . ",
+" +. ",
+" ",
+" .+++++ ",
+" .+. + ",
+" .+. + ",
+" .+...+ ",
+" .+++++ ",
+" ...... ",
+" ",
+" "};
diff --git a/src/tweak-context.cpp b/src/tweak-context.cpp
index 28e4c1629..383be7ceb 100644
--- a/src/tweak-context.cpp
+++ b/src/tweak-context.cpp
@@ -32,6 +32,15 @@
#include "desktop-style.h"
#include "message-context.h"
#include "pixmaps/cursor-tweak-move.xpm"
+#include "pixmaps/cursor-tweak-move-in.xpm"
+#include "pixmaps/cursor-tweak-move-out.xpm"
+#include "pixmaps/cursor-tweak-move-jitter.xpm"
+#include "pixmaps/cursor-tweak-scale-up.xpm"
+#include "pixmaps/cursor-tweak-scale-down.xpm"
+#include "pixmaps/cursor-tweak-rotate-clockwise.xpm"
+#include "pixmaps/cursor-tweak-rotate-counterclockwise.xpm"
+#include "pixmaps/cursor-tweak-more.xpm"
+#include "pixmaps/cursor-tweak-less.xpm"
#include "pixmaps/cursor-thin.xpm"
#include "pixmaps/cursor-thicken.xpm"
#include "pixmaps/cursor-attract.xpm"
@@ -189,23 +198,39 @@ sp_tweak_update_cursor (SPTweakContext *tc, bool with_shift)
break;
case TWEAK_MODE_MOVE_IN_OUT:
tc->_message_context->setF(Inkscape::NORMAL_MESSAGE, _("%s. Drag or click to <b>move in</b>; with Shift to <b>move out</b>."), sel_message);
- event_context->cursor_shape = cursor_tweak_move_xpm;
+ if (with_shift) {
+ event_context->cursor_shape = cursor_tweak_move_out_xpm;
+ } else {
+ event_context->cursor_shape = cursor_tweak_move_in_xpm;
+ }
break;
case TWEAK_MODE_MOVE_JITTER:
tc->_message_context->setF(Inkscape::NORMAL_MESSAGE, _("%s. Drag or click to <b>move randomly</b>."), sel_message);
- event_context->cursor_shape = cursor_tweak_move_xpm;
+ event_context->cursor_shape = cursor_tweak_move_jitter_xpm;
break;
case TWEAK_MODE_SCALE:
tc->_message_context->setF(Inkscape::NORMAL_MESSAGE, _("%s. Drag or click to <b>scale down</b>; with Shift to <b>scale up</b>."), sel_message);
- event_context->cursor_shape = cursor_tweak_move_xpm;
+ if (with_shift) {
+ event_context->cursor_shape = cursor_tweak_scale_up_xpm;
+ } else {
+ event_context->cursor_shape = cursor_tweak_scale_down_xpm;
+ }
break;
case TWEAK_MODE_ROTATE:
tc->_message_context->setF(Inkscape::NORMAL_MESSAGE, _("%s. Drag or click to <b>rotate clockwise</b>; with Shift, <b>counterclockwise</b>."), sel_message);
- event_context->cursor_shape = cursor_tweak_move_xpm;
+ if (with_shift) {
+ event_context->cursor_shape = cursor_tweak_rotate_counterclockwise_xpm;
+ } else {
+ event_context->cursor_shape = cursor_tweak_rotate_clockwise_xpm;
+ }
break;
case TWEAK_MODE_MORELESS:
tc->_message_context->setF(Inkscape::NORMAL_MESSAGE, _("%s. Drag or click to <b>duplicate</b>; with Shift, <b>delete</b>."), sel_message);
- event_context->cursor_shape = cursor_tweak_move_xpm;
+ if (with_shift) {
+ event_context->cursor_shape = cursor_tweak_less_xpm;
+ } else {
+ event_context->cursor_shape = cursor_tweak_more_xpm;
+ }
break;
case TWEAK_MODE_PUSH:
tc->_message_context->setF(Inkscape::NORMAL_MESSAGE, _("%s. Drag to <b>push paths</b>."), sel_message);
generated by cgit v1.2.3 (git 2.25.1) at 2026-05-19 14:37:03 +0000