From d4bb09bb9d0acbda705a98fa784edccba6bc163f Mon Sep 17 00:00:00 2001 From: thomas_lucky13 Date: Wed, 15 Jun 2022 19:02:37 +0400 Subject: [PATCH] new stylusPalette --- resources/OpenBoard.qrc | 19 + resources/forms/mainWindow.ui | 38 +- resources/images/stylusPalette/arrow.svg | 154 ++++++++ resources/images/stylusPalette/arrowOn.svg | 184 +++++++++ .../images/stylusPalette/captureArea.svg | 225 +++++++++++ .../images/stylusPalette/captureAreaOn.svg | 232 +++++++++++ resources/images/stylusPalette/hand.svg | 128 ++++++ resources/images/stylusPalette/handOn.svg | 154 ++++++++ resources/images/stylusPalette/handPlay.svg | 143 +++++++ resources/images/stylusPalette/handPlayOn.svg | 169 ++++++++ resources/images/stylusPalette/laser.svg | 344 ++++++++++++++++ resources/images/stylusPalette/laserOn.svg | 370 ++++++++++++++++++ resources/images/stylusPalette/line.svg | 126 ++++++ resources/images/stylusPalette/lineOn.svg | 157 ++++++++ .../images/stylusPalette/restoreZoom.svg | 294 ++++++++++++++ resources/images/stylusPalette/text.svg | 186 +++++++++ resources/images/stylusPalette/textOn.svg | 216 ++++++++++ resources/images/stylusPalette/zoomIn.svg | 317 +++++++++++++++ resources/images/stylusPalette/zoomInOn.svg | 348 ++++++++++++++++ resources/images/stylusPalette/zoomOut.svg | 318 +++++++++++++++ resources/images/stylusPalette/zoomOutOn.svg | 349 +++++++++++++++++ src/gui/UBZoomPalette.cpp | 2 +- 22 files changed, 4453 insertions(+), 20 deletions(-) create mode 100644 resources/images/stylusPalette/arrow.svg create mode 100644 resources/images/stylusPalette/arrowOn.svg create mode 100644 resources/images/stylusPalette/captureArea.svg create mode 100644 resources/images/stylusPalette/captureAreaOn.svg create mode 100644 resources/images/stylusPalette/hand.svg create mode 100644 resources/images/stylusPalette/handOn.svg create mode 100644 resources/images/stylusPalette/handPlay.svg create mode 100644 resources/images/stylusPalette/handPlayOn.svg create mode 100644 resources/images/stylusPalette/laser.svg create mode 100644 resources/images/stylusPalette/laserOn.svg create mode 100644 resources/images/stylusPalette/line.svg create mode 100644 resources/images/stylusPalette/lineOn.svg create mode 100644 resources/images/stylusPalette/restoreZoom.svg create mode 100644 resources/images/stylusPalette/text.svg create mode 100644 resources/images/stylusPalette/textOn.svg create mode 100644 resources/images/stylusPalette/zoomIn.svg create mode 100644 resources/images/stylusPalette/zoomInOn.svg create mode 100644 resources/images/stylusPalette/zoomOut.svg create mode 100644 resources/images/stylusPalette/zoomOutOn.svg diff --git a/resources/OpenBoard.qrc b/resources/OpenBoard.qrc index d1a5661f..0de4f97c 100644 --- a/resources/OpenBoard.qrc +++ b/resources/OpenBoard.qrc @@ -378,6 +378,25 @@ images/stylusPalette/pen.svg images/stylusPalette/penOn.svg images/stylusPalette/penOnArrow.svg + images/stylusPalette/arrow.svg + images/stylusPalette/arrowOn.svg + images/stylusPalette/handPlay.svg + images/stylusPalette/handPlayOn.svg + images/stylusPalette/hand.svg + images/stylusPalette/handOn.svg + images/stylusPalette/laser.svg + images/stylusPalette/laserOn.svg + images/stylusPalette/line.svg + images/stylusPalette/lineOn.svg + images/stylusPalette/zoomOut.svg + images/stylusPalette/zoomOutOn.svg + images/stylusPalette/zoomIn.svg + images/stylusPalette/zoomInOn.svg + images/stylusPalette/restoreZoom.svg + images/stylusPalette/text.svg + images/stylusPalette/textOn.svg + images/stylusPalette/captureArea.svg + images/stylusPalette/captureAreaOn.svg images/trash-my-documents.png images/trash-empty.png images/trash-folder.png diff --git a/resources/forms/mainWindow.ui b/resources/forms/mainWindow.ui index a24810b4..5063bd35 100644 --- a/resources/forms/mainWindow.ui +++ b/resources/forms/mainWindow.ui @@ -7,7 +7,7 @@ 0 0 1342 - 223 + 268 @@ -1249,8 +1249,8 @@ - :/images/stylusPalette/arrow.png - :/images/stylusPalette/arrowOn.png:/images/stylusPalette/arrow.png + :/images/stylusPalette/arrow.svg + :/images/stylusPalette/arrowOn.svg:/images/stylusPalette/arrow.svg Selector @@ -1268,8 +1268,8 @@ - :/images/stylusPalette/hand.png - :/images/stylusPalette/handOn.png:/images/stylusPalette/hand.png + :/images/stylusPalette/hand.svg + :/images/stylusPalette/handOn.svg:/images/stylusPalette/hand.svg Hand @@ -1284,8 +1284,8 @@ - :/images/stylusPalette/zoomIn.png - :/images/stylusPalette/zoomInOn.png:/images/stylusPalette/zoomIn.png + :/images/stylusPalette/zoomIn.svg + :/images/stylusPalette/zoomInOn.svg:/images/stylusPalette/zoomIn.svg Zoom In @@ -1297,8 +1297,8 @@ - :/images/stylusPalette/zoomOut.png - :/images/stylusPalette/zoomOutOn.png:/images/stylusPalette/zoomOut.png + :/images/stylusPalette/zoomOut.svg + :/images/stylusPalette/zoomOutOn.svg:/images/stylusPalette/zoomOut.svg Zoom Out @@ -1310,8 +1310,8 @@ - :/images/stylusPalette/laser.png - :/images/stylusPalette/laserOn.png:/images/stylusPalette/laser.png + :/images/stylusPalette/laser.svg + :/images/stylusPalette/laserOn.svg:/images/stylusPalette/laser.svg Laser Pointer @@ -1329,8 +1329,8 @@ - :/images/stylusPalette/line.png - :/images/stylusPalette/lineOn.png:/images/stylusPalette/line.png + :/images/stylusPalette/line.svg + :/images/stylusPalette/lineOn.svg:/images/stylusPalette/line.svg Line @@ -1348,8 +1348,8 @@ - :/images/stylusPalette/text.png - :/images/stylusPalette/textOn.png:/images/stylusPalette/text.png + :/images/stylusPalette/text.svg + :/images/stylusPalette/textOn.svg:/images/stylusPalette/text.svg Text @@ -1367,8 +1367,8 @@ - :/images/stylusPalette/captureArea.png - :/images/stylusPalette/captureAreaOn.png:/images/stylusPalette/captureArea.png + :/images/stylusPalette/captureArea.svg + :/images/stylusPalette/captureAreaOn.svg:/images/stylusPalette/captureArea.svg Capture @@ -1640,8 +1640,8 @@ - :/images/stylusPalette/handPlay.png - :/images/stylusPalette/handPlayOn.png:/images/stylusPalette/handPlay.png + :/images/stylusPalette/handPlay.svg + :/images/stylusPalette/handPlayOn.svg:/images/stylusPalette/handPlay.svg Play diff --git a/resources/images/stylusPalette/arrow.svg b/resources/images/stylusPalette/arrow.svg new file mode 100644 index 00000000..addb4ab7 --- /dev/null +++ b/resources/images/stylusPalette/arrow.svg @@ -0,0 +1,154 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/stylusPalette/arrowOn.svg b/resources/images/stylusPalette/arrowOn.svg new file mode 100644 index 00000000..f0985a41 --- /dev/null +++ b/resources/images/stylusPalette/arrowOn.svg @@ -0,0 +1,184 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/stylusPalette/captureArea.svg b/resources/images/stylusPalette/captureArea.svg new file mode 100644 index 00000000..e14061e1 --- /dev/null +++ b/resources/images/stylusPalette/captureArea.svg @@ -0,0 +1,225 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/stylusPalette/captureAreaOn.svg b/resources/images/stylusPalette/captureAreaOn.svg new file mode 100644 index 00000000..82ca762a --- /dev/null +++ b/resources/images/stylusPalette/captureAreaOn.svg @@ -0,0 +1,232 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/stylusPalette/hand.svg b/resources/images/stylusPalette/hand.svg new file mode 100644 index 00000000..f2068cb8 --- /dev/null +++ b/resources/images/stylusPalette/hand.svg @@ -0,0 +1,128 @@ + + + + diff --git a/resources/images/stylusPalette/handOn.svg b/resources/images/stylusPalette/handOn.svg new file mode 100644 index 00000000..9fa0047b --- /dev/null +++ b/resources/images/stylusPalette/handOn.svg @@ -0,0 +1,154 @@ + + + + diff --git a/resources/images/stylusPalette/handPlay.svg b/resources/images/stylusPalette/handPlay.svg new file mode 100644 index 00000000..6ca6130c --- /dev/null +++ b/resources/images/stylusPalette/handPlay.svg @@ -0,0 +1,143 @@ + + + + diff --git a/resources/images/stylusPalette/handPlayOn.svg b/resources/images/stylusPalette/handPlayOn.svg new file mode 100644 index 00000000..9090f73c --- /dev/null +++ b/resources/images/stylusPalette/handPlayOn.svg @@ -0,0 +1,169 @@ + + + + diff --git a/resources/images/stylusPalette/laser.svg b/resources/images/stylusPalette/laser.svg new file mode 100644 index 00000000..99b6d10c --- /dev/null +++ b/resources/images/stylusPalette/laser.svg @@ -0,0 +1,344 @@ + + + + diff --git a/resources/images/stylusPalette/laserOn.svg b/resources/images/stylusPalette/laserOn.svg new file mode 100644 index 00000000..62e3907b --- /dev/null +++ b/resources/images/stylusPalette/laserOn.svg @@ -0,0 +1,370 @@ + + + + diff --git a/resources/images/stylusPalette/line.svg b/resources/images/stylusPalette/line.svg new file mode 100644 index 00000000..f711914d --- /dev/null +++ b/resources/images/stylusPalette/line.svg @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/stylusPalette/lineOn.svg b/resources/images/stylusPalette/lineOn.svg new file mode 100644 index 00000000..88c05503 --- /dev/null +++ b/resources/images/stylusPalette/lineOn.svg @@ -0,0 +1,157 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/stylusPalette/restoreZoom.svg b/resources/images/stylusPalette/restoreZoom.svg new file mode 100644 index 00000000..712a4526 --- /dev/null +++ b/resources/images/stylusPalette/restoreZoom.svg @@ -0,0 +1,294 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/stylusPalette/text.svg b/resources/images/stylusPalette/text.svg new file mode 100644 index 00000000..d659796e --- /dev/null +++ b/resources/images/stylusPalette/text.svg @@ -0,0 +1,186 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/stylusPalette/textOn.svg b/resources/images/stylusPalette/textOn.svg new file mode 100644 index 00000000..3c3248a6 --- /dev/null +++ b/resources/images/stylusPalette/textOn.svg @@ -0,0 +1,216 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/stylusPalette/zoomIn.svg b/resources/images/stylusPalette/zoomIn.svg new file mode 100644 index 00000000..8ba170dd --- /dev/null +++ b/resources/images/stylusPalette/zoomIn.svg @@ -0,0 +1,317 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/stylusPalette/zoomInOn.svg b/resources/images/stylusPalette/zoomInOn.svg new file mode 100644 index 00000000..8b3593b8 --- /dev/null +++ b/resources/images/stylusPalette/zoomInOn.svg @@ -0,0 +1,348 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/stylusPalette/zoomOut.svg b/resources/images/stylusPalette/zoomOut.svg new file mode 100644 index 00000000..f527b6f8 --- /dev/null +++ b/resources/images/stylusPalette/zoomOut.svg @@ -0,0 +1,318 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/stylusPalette/zoomOutOn.svg b/resources/images/stylusPalette/zoomOutOn.svg new file mode 100644 index 00000000..e31ae5bc --- /dev/null +++ b/resources/images/stylusPalette/zoomOutOn.svg @@ -0,0 +1,349 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/gui/UBZoomPalette.cpp b/src/gui/UBZoomPalette.cpp index 949d8e38..74a58b4c 100644 --- a/src/gui/UBZoomPalette.cpp +++ b/src/gui/UBZoomPalette.cpp @@ -56,7 +56,7 @@ UBZoomPalette::UBZoomPalette(QWidget* parent) mHundredButton = new QPushButton(parent); mHundredButton->setStyleSheet(QString("QPushButton { color: white; background-color: transparent; border: none; font-family: Arial; font-weight: bold; font-size: 20px }")); mHundredButton->setFocusPolicy(Qt::NoFocus); - mHundredButton->setIcon(QIcon(":/images/stylusPalette/restoreZoom.png")); + mHundredButton->setIcon(QIcon(":/images/stylusPalette/restoreZoom.svg")); mHundredButton->setIconSize(QSize(42,42)); connect(mHundredButton, SIGNAL(clicked(bool)), this, SLOT(goHundred()));