diff --git a/resources/OpenBoard.qrc b/resources/OpenBoard.qrc
index 0de4f97c..6c1d2ad6 100644
--- a/resources/OpenBoard.qrc
+++ b/resources/OpenBoard.qrc
@@ -192,6 +192,18 @@
images/cursors/drawCompass.png
images/cursors/drawRulerLine.png
images/cursors/play.png
+ images/cursors/eraser.svg
+ images/cursors/laser.svg
+ images/cursors/marker.svg
+ images/cursors/zoomIn.svg
+ images/cursors/zoomOut.svg
+ images/cursors/rotate.svg
+ images/cursors/resize.svg
+ images/cursors/drawCompass.svg
+ images/cursors/drawRulerLine.svg
+ images/cursors/play.svg
+ images/cursors/scrollPage.svg
+ images/cursors/scrollPageOn.svg
images/print/onepage.png
images/print/thumbnails.png
images/print/twopages.png
diff --git a/resources/images/cursors/drawCompass.svg b/resources/images/cursors/drawCompass.svg
new file mode 100644
index 00000000..aa1a4f02
--- /dev/null
+++ b/resources/images/cursors/drawCompass.svg
@@ -0,0 +1,137 @@
+
+
+
+
diff --git a/resources/images/cursors/drawRulerLine.svg b/resources/images/cursors/drawRulerLine.svg
new file mode 100644
index 00000000..e4be1dd5
--- /dev/null
+++ b/resources/images/cursors/drawRulerLine.svg
@@ -0,0 +1,324 @@
+
+
+
+
diff --git a/resources/images/cursors/eraser.svg b/resources/images/cursors/eraser.svg
new file mode 100644
index 00000000..aba1b8b1
--- /dev/null
+++ b/resources/images/cursors/eraser.svg
@@ -0,0 +1,193 @@
+
+
+
+
diff --git a/resources/images/cursors/laser.svg b/resources/images/cursors/laser.svg
new file mode 100644
index 00000000..99b6d10c
--- /dev/null
+++ b/resources/images/cursors/laser.svg
@@ -0,0 +1,344 @@
+
+
+
+
diff --git a/resources/images/cursors/marker.svg b/resources/images/cursors/marker.svg
new file mode 100644
index 00000000..2d9a2c39
--- /dev/null
+++ b/resources/images/cursors/marker.svg
@@ -0,0 +1,224 @@
+
+
+
+
diff --git a/resources/images/cursors/play.svg b/resources/images/cursors/play.svg
new file mode 100644
index 00000000..a6d39a6a
--- /dev/null
+++ b/resources/images/cursors/play.svg
@@ -0,0 +1,132 @@
+
+
+
+
diff --git a/resources/images/cursors/resize.svg b/resources/images/cursors/resize.svg
new file mode 100644
index 00000000..1f0fee27
--- /dev/null
+++ b/resources/images/cursors/resize.svg
@@ -0,0 +1,142 @@
+
+
+
+
diff --git a/resources/images/cursors/rotate.svg b/resources/images/cursors/rotate.svg
new file mode 100644
index 00000000..1636033e
--- /dev/null
+++ b/resources/images/cursors/rotate.svg
@@ -0,0 +1,138 @@
+
+
+
+
diff --git a/resources/images/cursors/scrollPage.svg b/resources/images/cursors/scrollPage.svg
new file mode 100644
index 00000000..8438ad49
--- /dev/null
+++ b/resources/images/cursors/scrollPage.svg
@@ -0,0 +1,132 @@
+
+
+
+
diff --git a/resources/images/cursors/scrollPageOn.svg b/resources/images/cursors/scrollPageOn.svg
new file mode 100644
index 00000000..0268b46e
--- /dev/null
+++ b/resources/images/cursors/scrollPageOn.svg
@@ -0,0 +1,132 @@
+
+
+
+
diff --git a/resources/images/cursors/zoomIn.svg b/resources/images/cursors/zoomIn.svg
new file mode 100644
index 00000000..8ba170dd
--- /dev/null
+++ b/resources/images/cursors/zoomIn.svg
@@ -0,0 +1,317 @@
+
+
+
+
diff --git a/resources/images/cursors/zoomOut.svg b/resources/images/cursors/zoomOut.svg
new file mode 100644
index 00000000..f527b6f8
--- /dev/null
+++ b/resources/images/cursors/zoomOut.svg
@@ -0,0 +1,318 @@
+
+
+
+
diff --git a/src/board/UBBoardView.cpp b/src/board/UBBoardView.cpp
index 97c8e2af..3a78de8e 100644
--- a/src/board/UBBoardView.cpp
+++ b/src/board/UBBoardView.cpp
@@ -1037,7 +1037,7 @@ void UBBoardView::mousePressEvent (QMouseEvent *event)
break;
case UBStylusTool::Hand :
- viewport()->setCursor(QCursor (Qt::ClosedHandCursor));
+ viewport()->setCursor(QCursor (UBResources::resources ()->closedHandCursor));
mPreviousPoint = event->localPos();
event->accept();
break;
diff --git a/src/domain/UBGraphicsDelegateFrame.cpp b/src/domain/UBGraphicsDelegateFrame.cpp
index 8deb42b3..e00665c9 100644
--- a/src/domain/UBGraphicsDelegateFrame.cpp
+++ b/src/domain/UBGraphicsDelegateFrame.cpp
@@ -750,7 +750,7 @@ void UBGraphicsDelegateFrame::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
void UBGraphicsDelegateFrame::updateResizeCursors()
{
- QPixmap pix(":/images/cursors/resize.png");
+ QPixmap pix(":/images/cursors/resize.svg");
QTransform tr;
tr.rotate(-mAngle);
diff --git a/src/gui/UBFeaturesActionBar.cpp b/src/gui/UBFeaturesActionBar.cpp
index 3e5bbd1b..17cc2898 100644
--- a/src/gui/UBFeaturesActionBar.cpp
+++ b/src/gui/UBFeaturesActionBar.cpp
@@ -71,7 +71,7 @@ UBFeaturesActionBar::UBFeaturesActionBar( UBFeaturesController *controller, QWid
mpFavoriteAction = new QAction(QIcon(":/images/libpalette/miniFavorite.png"), tr("Add to favorites"), this);
mpSocialAction = new QAction(QIcon(":/images/libpalette/social.png"), tr("Share"), this);
mpSearchAction = new QAction(QIcon(":/images/libpalette/miniSearch.png"), tr("Search"), this);
- mpRescanModelAction = new QAction(QIcon(":/images/cursors/rotate.png"), tr("Rescan file system"), this);
+ mpRescanModelAction = new QAction(QIcon(":/images/cursors/rotate.svg"), tr("Rescan file system"), this);
mpDeleteAction = new QAction(QIcon(":/images/libpalette/miniTrash.png"), tr("Delete"), this);
mpCloseAction = new QAction(QIcon(":/images/close.svg"), tr("Back to folder"), this);
mpRemoveFavorite = new QAction(QIcon(":/images/libpalette/trash_favorite.svg"), tr("Remove from favorites"), this);
diff --git a/src/gui/UBMagnifer.cpp b/src/gui/UBMagnifer.cpp
index 90e9ad10..7233bec8 100644
--- a/src/gui/UBMagnifer.cpp
+++ b/src/gui/UBMagnifer.cpp
@@ -50,7 +50,7 @@ UBMagnifier::UBMagnifier(QWidget *parent, bool isInteractive)
//--------------------------------------------------//
- QPixmap pix(":/images/cursors/resize.png");
+ QPixmap pix(":/images/cursors/resize.svg");
QTransform tr;
tr.rotate(45);
mResizeCursor = QCursor(pix.transformed(tr, Qt::SmoothTransformation), pix.width() / 2, pix.height() / 2);
diff --git a/src/gui/UBResources.cpp b/src/gui/UBResources.cpp
index 10af5395..ee334806 100644
--- a/src/gui/UBResources.cpp
+++ b/src/gui/UBResources.cpp
@@ -67,17 +67,18 @@ void UBResources::init()
{
// Cursors
penCursor = QCursor(Qt::CrossCursor);
- eraserCursor = QCursor(QPixmap(":/images/cursors/eraser.png"), 5, 25);
- markerCursor = QCursor(QPixmap(":/images/cursors/marker.png"), 3, 30);
- pointerCursor = QCursor(QPixmap(":/images/cursors/laser.png"), 2, 1);
- handCursor = QCursor(Qt::OpenHandCursor);
- zoomInCursor = QCursor(QPixmap(":/images/cursors/zoomIn.png"), 9, 9);
- zoomOutCursor = QCursor(QPixmap(":/images/cursors/zoomOut.png"), 9, 9);
+ eraserCursor = QCursor(QPixmap(":/images/cursors/eraser.svg"), 5, 25);
+ markerCursor = QCursor(QPixmap(":/images/cursors/marker.svg"), 3, 30);
+ pointerCursor = QCursor(QPixmap(":/images/cursors/laser.svg"), 2, 1);
+ handCursor = QCursor(QPixmap(":/images/cursors/scrollPage.svg"), 6, 1);
+ closedHandCursor= QCursor(QPixmap(":/images/cursors/scrollPageOn.svg"), 6, 1);
+ zoomInCursor = QCursor(QPixmap(":/images/cursors/zoomIn.svg"), 9, 9);
+ zoomOutCursor = QCursor(QPixmap(":/images/cursors/zoomOut.svg"), 9, 9);
arrowCursor = QCursor(Qt::ArrowCursor);
- playCursor = QCursor(QPixmap(":/images/cursors/play.png"), 6, 1);
+ playCursor = QCursor(QPixmap(":/images/cursors/play.svg"), 6, 1);
textCursor = QCursor(Qt::ArrowCursor);
- rotateCursor = QCursor(QPixmap(":/images/cursors/rotate.png"), 16, 16);
- drawLineRulerCursor = QCursor(QPixmap(":/images/cursors/drawRulerLine.png"), 3, 12);
+ rotateCursor = QCursor(QPixmap(":/images/cursors/rotate.svg"), 16, 16);
+ drawLineRulerCursor = QCursor(QPixmap(":/images/cursors/drawRulerLine.svg"), 3, 12);
}
void UBResources::buildFontList()
diff --git a/src/gui/UBResources.h b/src/gui/UBResources.h
index 662ea796..b3c35f59 100644
--- a/src/gui/UBResources.h
+++ b/src/gui/UBResources.h
@@ -58,6 +58,7 @@ class UBResources : public QObject
QCursor markerCursor;
QCursor pointerCursor;
QCursor handCursor;
+ QCursor closedHandCursor;
QCursor zoomInCursor;
QCursor zoomOutCursor;
QCursor arrowCursor;
diff --git a/src/gui/UBRubberBand.cpp b/src/gui/UBRubberBand.cpp
index 348c2c0c..fd3aa3b0 100644
--- a/src/gui/UBRubberBand.cpp
+++ b/src/gui/UBRubberBand.cpp
@@ -138,7 +138,7 @@ UBRubberBand::enm_resizingMode UBRubberBand::determineResizingMode(QPoint pos)
if (None != resizingMode)
{
- QPixmap pix(":/images/cursors/resize.png");
+ QPixmap pix(":/images/cursors/resize.svg");
QCursor resizeCursor = QCursor(pix.transformed(cursorTransrofm, Qt::SmoothTransformation), pix.width() / 2, pix.height() / 2);
setCursor(resizeCursor);
}
diff --git a/src/tools/UBGraphicsAxes.cpp b/src/tools/UBGraphicsAxes.cpp
index c75744fd..530d7140 100644
--- a/src/tools/UBGraphicsAxes.cpp
+++ b/src/tools/UBGraphicsAxes.cpp
@@ -434,7 +434,7 @@ void UBGraphicsAxes::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
void UBGraphicsAxes::updateResizeCursor()
{
- QPixmap pix(":/images/cursors/resize.png");
+ QPixmap pix(":/images/cursors/resize.svg");
QTransform tr;
tr.rotate(-90);
mResizeCursorH = QCursor(pix, pix.width() / 2, pix.height() / 2);
diff --git a/src/tools/UBGraphicsCompass.cpp b/src/tools/UBGraphicsCompass.cpp
index 058d079e..1f9a59e2 100644
--- a/src/tools/UBGraphicsCompass.cpp
+++ b/src/tools/UBGraphicsCompass.cpp
@@ -561,7 +561,7 @@ void UBGraphicsCompass::drawArc()
void UBGraphicsCompass::updateResizeCursor()
{
- QPixmap pix(":/images/cursors/resize.png");
+ QPixmap pix(":/images/cursors/resize.svg");
qreal angle = angleInDegrees();
QTransform tr;
@@ -571,7 +571,7 @@ void UBGraphicsCompass::updateResizeCursor()
void UBGraphicsCompass::updateDrawCursor()
{
- QPixmap pix(":/images/cursors/drawCompass.png");
+ QPixmap pix(":/images/cursors/drawCompass.svg");
qreal angle = angleInDegrees();
QTransform tr;
diff --git a/src/tools/UBGraphicsRuler.cpp b/src/tools/UBGraphicsRuler.cpp
index a0b97951..4aecda4f 100644
--- a/src/tools/UBGraphicsRuler.cpp
+++ b/src/tools/UBGraphicsRuler.cpp
@@ -66,7 +66,7 @@ UBGraphicsRuler::UBGraphicsRuler()
void UBGraphicsRuler::updateResizeCursor()
{
- QPixmap pix(":/images/cursors/resize.png");
+ QPixmap pix(":/images/cursors/resize.svg");
QTransform itemTransform = sceneTransform();
QRectF itemRect = boundingRect();
QPointF topLeft = itemTransform.map(itemRect.topLeft());
diff --git a/src/tools/UBGraphicsTriangle.cpp b/src/tools/UBGraphicsTriangle.cpp
index c93fdedc..0ebe7a9f 100644
--- a/src/tools/UBGraphicsTriangle.cpp
+++ b/src/tools/UBGraphicsTriangle.cpp
@@ -78,7 +78,7 @@ UBGraphicsTriangle::UBGraphicsTriangle()
void UBGraphicsTriangle::updateResizeCursor()
{
- QPixmap pix(":/images/cursors/resize.png");
+ QPixmap pix(":/images/cursors/resize.svg");
QTransform itemTransform = sceneTransform();
QRectF itemRect = boundingRect();