From cd07902bc8bc0583e25f1fdbbf9cda301a54d08f Mon Sep 17 00:00:00 2001 From: Christoffer Holmstedt Date: Thu, 18 Apr 2013 06:53:04 +0200 Subject: Added 9 cursors for the tweak tool. Fixed bugs: - https://launchpad.net/bugs/587729 (bzr r12277.1.1) --- src/pixmaps/cursor-tweak-less.xpm | 38 ++++++++++++++++++++++ src/pixmaps/cursor-tweak-more.xpm | 38 ++++++++++++++++++++++ src/pixmaps/cursor-tweak-move-in.xpm | 38 ++++++++++++++++++++++ src/pixmaps/cursor-tweak-move-jitter.xpm | 38 ++++++++++++++++++++++ src/pixmaps/cursor-tweak-move-out.xpm | 38 ++++++++++++++++++++++ src/pixmaps/cursor-tweak-rotate-clockwise.xpm | 38 ++++++++++++++++++++++ .../cursor-tweak-rotate-counterclockwise.xpm | 38 ++++++++++++++++++++++ src/pixmaps/cursor-tweak-scale-down.xpm | 38 ++++++++++++++++++++++ src/pixmaps/cursor-tweak-scale-up.xpm | 38 ++++++++++++++++++++++ src/tweak-context.cpp | 35 +++++++++++++++++--- 10 files changed, 372 insertions(+), 5 deletions(-) create mode 100644 src/pixmaps/cursor-tweak-less.xpm create mode 100644 src/pixmaps/cursor-tweak-more.xpm create mode 100644 src/pixmaps/cursor-tweak-move-in.xpm create mode 100644 src/pixmaps/cursor-tweak-move-jitter.xpm create mode 100644 src/pixmaps/cursor-tweak-move-out.xpm create mode 100644 src/pixmaps/cursor-tweak-rotate-clockwise.xpm create mode 100644 src/pixmaps/cursor-tweak-rotate-counterclockwise.xpm create mode 100644 src/pixmaps/cursor-tweak-scale-down.xpm create mode 100644 src/pixmaps/cursor-tweak-scale-up.xpm 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 move in; with Shift to move out."), 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 move randomly."), 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 scale down; with Shift to scale up."), 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 rotate clockwise; with Shift, counterclockwise."), 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 duplicate; with Shift, delete."), 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 push paths."), sel_message); -- cgit v1.2.3