diff --git a/glabels/Cursors.cpp b/glabels/Cursors.cpp index d8c158d..ac343c3 100644 --- a/glabels/Cursors.cpp +++ b/glabels/Cursors.cpp @@ -26,6 +26,20 @@ namespace glabels { + Cursors::Crosshair::Crosshair() + : QCursor( QPixmap(":cursors/32x32/cursor_crosshair.png"), 15, 15 ) + { + // empty + } + + + Cursors::Move::Move() + : QCursor( QPixmap(":cursors/32x32/cursor_move.png"), 15, 15 ) + { + // empty + } + + Cursors::Barcode::Barcode() : QCursor( QPixmap(":cursors/32x32/cursor_barcode.png"), 7, 7 ) { diff --git a/glabels/Cursors.h b/glabels/Cursors.h index 8512c8c..42ccc84 100644 --- a/glabels/Cursors.h +++ b/glabels/Cursors.h @@ -35,6 +35,20 @@ namespace glabels { + class Crosshair : public QCursor + { + public: + Crosshair(); + }; + + + class Move : public QCursor + { + public: + Move(); + }; + + class Barcode : public QCursor { public: diff --git a/glabels/LabelEditor.cpp b/glabels/LabelEditor.cpp index f5b29fd..8c8db9d 100644 --- a/glabels/LabelEditor.cpp +++ b/glabels/LabelEditor.cpp @@ -635,11 +635,11 @@ namespace glabels if ( mModel->isSelectionAtomic() && !mModel->handleAt( mScale, xWorld, yWorld ).isNull() ) { - setCursor( Qt::CrossCursor ); + setCursor( Cursors::Crosshair() ); } else if ( mModel->objectAt( mScale, xWorld, yWorld ) ) { - setCursor( Qt::SizeAllCursor ); + setCursor( Cursors::Move() ); } else { diff --git a/glabels/cursors.qrc b/glabels/cursors.qrc index a940cac..26102e5 100644 --- a/glabels/cursors.qrc +++ b/glabels/cursors.qrc @@ -4,9 +4,11 @@ cursors/32x32/cursor_barcode.png cursors/32x32/cursor_box.png + cursors/32x32/cursor_crosshair.png cursors/32x32/cursor_ellipse.png cursors/32x32/cursor_image.png cursors/32x32/cursor_line.png + cursors/32x32/cursor_move.png cursors/32x32/cursor_text.png diff --git a/glabels/cursors/32x32/cursor_barcode.png b/glabels/cursors/32x32/cursor_barcode.png index 59ba928..107cb82 100644 Binary files a/glabels/cursors/32x32/cursor_barcode.png and b/glabels/cursors/32x32/cursor_barcode.png differ diff --git a/glabels/cursors/32x32/cursor_box.png b/glabels/cursors/32x32/cursor_box.png index c30c0d4..9e9198e 100644 Binary files a/glabels/cursors/32x32/cursor_box.png and b/glabels/cursors/32x32/cursor_box.png differ diff --git a/glabels/cursors/32x32/cursor_crosshair.png b/glabels/cursors/32x32/cursor_crosshair.png new file mode 100644 index 0000000..b54eba1 Binary files /dev/null and b/glabels/cursors/32x32/cursor_crosshair.png differ diff --git a/glabels/cursors/32x32/cursor_ellipse.png b/glabels/cursors/32x32/cursor_ellipse.png index 40924af..52275b7 100644 Binary files a/glabels/cursors/32x32/cursor_ellipse.png and b/glabels/cursors/32x32/cursor_ellipse.png differ diff --git a/glabels/cursors/32x32/cursor_image.png b/glabels/cursors/32x32/cursor_image.png index e5b4781..a56a208 100644 Binary files a/glabels/cursors/32x32/cursor_image.png and b/glabels/cursors/32x32/cursor_image.png differ diff --git a/glabels/cursors/32x32/cursor_line.png b/glabels/cursors/32x32/cursor_line.png index 31d8c6e..d62f1d3 100644 Binary files a/glabels/cursors/32x32/cursor_line.png and b/glabels/cursors/32x32/cursor_line.png differ diff --git a/glabels/cursors/32x32/cursor_move.png b/glabels/cursors/32x32/cursor_move.png new file mode 100644 index 0000000..04a2778 Binary files /dev/null and b/glabels/cursors/32x32/cursor_move.png differ diff --git a/glabels/cursors/32x32/cursor_text.png b/glabels/cursors/32x32/cursor_text.png index cda6b21..756bd2b 100644 Binary files a/glabels/cursors/32x32/cursor_text.png and b/glabels/cursors/32x32/cursor_text.png differ