From d4bb09bb9d0acbda705a98fa784edccba6bc163f Mon Sep 17 00:00:00 2001 From: thomas_lucky13 Date: Wed, 15 Jun 2022 19:02:37 +0400 Subject: [PATCH 01/12] 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())); From a6ba17dbc700cbce23c3c5092873db31148b4bab Mon Sep 17 00:00:00 2001 From: thomas_lucky13 Date: Wed, 15 Jun 2022 20:46:43 +0400 Subject: [PATCH 02/12] New cursors --- resources/OpenBoard.qrc | 12 + resources/images/cursors/drawCompass.svg | 137 ++++++++ resources/images/cursors/drawRulerLine.svg | 324 +++++++++++++++++++ resources/images/cursors/eraser.svg | 193 ++++++++++++ resources/images/cursors/laser.svg | 344 +++++++++++++++++++++ resources/images/cursors/marker.svg | 224 ++++++++++++++ resources/images/cursors/play.svg | 132 ++++++++ resources/images/cursors/resize.svg | 142 +++++++++ resources/images/cursors/rotate.svg | 138 +++++++++ resources/images/cursors/scrollPage.svg | 132 ++++++++ resources/images/cursors/scrollPageOn.svg | 132 ++++++++ resources/images/cursors/zoomIn.svg | 317 +++++++++++++++++++ resources/images/cursors/zoomOut.svg | 318 +++++++++++++++++++ src/board/UBBoardView.cpp | 2 +- src/domain/UBGraphicsDelegateFrame.cpp | 2 +- src/gui/UBFeaturesActionBar.cpp | 2 +- src/gui/UBMagnifer.cpp | 2 +- src/gui/UBResources.cpp | 19 +- src/gui/UBResources.h | 1 + src/gui/UBRubberBand.cpp | 2 +- src/tools/UBGraphicsAxes.cpp | 2 +- src/tools/UBGraphicsCompass.cpp | 4 +- src/tools/UBGraphicsRuler.cpp | 2 +- src/tools/UBGraphicsTriangle.cpp | 2 +- 24 files changed, 2566 insertions(+), 19 deletions(-) create mode 100644 resources/images/cursors/drawCompass.svg create mode 100644 resources/images/cursors/drawRulerLine.svg create mode 100644 resources/images/cursors/eraser.svg create mode 100644 resources/images/cursors/laser.svg create mode 100644 resources/images/cursors/marker.svg create mode 100644 resources/images/cursors/play.svg create mode 100644 resources/images/cursors/resize.svg create mode 100644 resources/images/cursors/rotate.svg create mode 100644 resources/images/cursors/scrollPage.svg create mode 100644 resources/images/cursors/scrollPageOn.svg create mode 100644 resources/images/cursors/zoomIn.svg create mode 100644 resources/images/cursors/zoomOut.svg 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(); From c42433e4005fadb2a48a8b158b9ba55ff514877f Mon Sep 17 00:00:00 2001 From: thomas_lucky13 Date: Wed, 15 Jun 2022 21:39:16 +0400 Subject: [PATCH 03/12] New libpalette --- resources/OpenBoard.qrc | 8 + .../images/libpalette/FavoritesCategory.svg | 392 +++++-- resources/images/libpalette/TrashCategory.svg | 1011 +++++------------ resources/images/libpalette/back.svg | 88 ++ resources/images/libpalette/folder.svg | 268 ++++- resources/images/libpalette/home.svg | 189 +++ resources/images/libpalette/loading.svg | 125 ++ resources/images/libpalette/miniFavorite.svg | 212 ++++ resources/images/libpalette/miniNewFolder.svg | 232 ++++ resources/images/libpalette/miniSearch.svg | 274 +++++ resources/images/libpalette/miniTrash.svg | 225 ++++ resources/images/libpalette/notFound.svg | 66 ++ resources/images/libpalette/social.svg | 144 +++ .../images/libpalette/trash_favorite.svg | 410 +++++-- src/board/UBFeaturesController.cpp | 8 +- src/domain/UBDragableThumbnail.h | 2 +- src/gui/UBFeaturesActionBar.cpp | 10 +- src/gui/UBFeaturesWidget.cpp | 6 +- 18 files changed, 2702 insertions(+), 968 deletions(-) create mode 100644 resources/images/libpalette/back.svg create mode 100644 resources/images/libpalette/home.svg create mode 100644 resources/images/libpalette/loading.svg create mode 100644 resources/images/libpalette/miniFavorite.svg create mode 100644 resources/images/libpalette/miniNewFolder.svg create mode 100644 resources/images/libpalette/miniSearch.svg create mode 100644 resources/images/libpalette/miniTrash.svg create mode 100644 resources/images/libpalette/notFound.svg create mode 100644 resources/images/libpalette/social.svg diff --git a/resources/OpenBoard.qrc b/resources/OpenBoard.qrc index 6c1d2ad6..9c861cab 100644 --- a/resources/OpenBoard.qrc +++ b/resources/OpenBoard.qrc @@ -286,6 +286,9 @@ images/libpalette/trash_favorite.svg images/libpalette/back.png images/libpalette/loading.png + images/libpalette/notFound.svg + images/libpalette/back.svg + images/libpalette/loading.svg images/stylusPalette/eraserArrow.png images/stylusPalette/eraserOnArrow.png images/stylusPalette/markerArrow.png @@ -307,6 +310,11 @@ images/libpalette/miniNewFolder.png images/libpalette/miniFavorite.png images/libpalette/home.png + images/libpalette/miniSearch.svg + images/libpalette/miniTrash.svg + images/libpalette/miniNewFolder.svg + images/libpalette/miniFavorite.svg + images/libpalette/home.svg images/toolbar/updates.png images/paletteLibrary.png images/paletteNavigator.png diff --git a/resources/images/libpalette/FavoritesCategory.svg b/resources/images/libpalette/FavoritesCategory.svg index 319b913e..4218e5f7 100644 --- a/resources/images/libpalette/FavoritesCategory.svg +++ b/resources/images/libpalette/FavoritesCategory.svg @@ -1,91 +1,301 @@ - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/libpalette/TrashCategory.svg b/resources/images/libpalette/TrashCategory.svg index d740f9c5..9e68d2ef 100644 --- a/resources/images/libpalette/TrashCategory.svg +++ b/resources/images/libpalette/TrashCategory.svg @@ -1,712 +1,299 @@ - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/libpalette/back.svg b/resources/images/libpalette/back.svg new file mode 100644 index 00000000..e1d84be7 --- /dev/null +++ b/resources/images/libpalette/back.svg @@ -0,0 +1,88 @@ + + + + diff --git a/resources/images/libpalette/folder.svg b/resources/images/libpalette/folder.svg index 8899505e..810fa0ad 100644 --- a/resources/images/libpalette/folder.svg +++ b/resources/images/libpalette/folder.svg @@ -1,60 +1,208 @@ - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/libpalette/home.svg b/resources/images/libpalette/home.svg new file mode 100644 index 00000000..8092ffc0 --- /dev/null +++ b/resources/images/libpalette/home.svg @@ -0,0 +1,189 @@ + + + + diff --git a/resources/images/libpalette/loading.svg b/resources/images/libpalette/loading.svg new file mode 100644 index 00000000..4ec0a392 --- /dev/null +++ b/resources/images/libpalette/loading.svg @@ -0,0 +1,125 @@ + + + + diff --git a/resources/images/libpalette/miniFavorite.svg b/resources/images/libpalette/miniFavorite.svg new file mode 100644 index 00000000..5f9d28f9 --- /dev/null +++ b/resources/images/libpalette/miniFavorite.svg @@ -0,0 +1,212 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/libpalette/miniNewFolder.svg b/resources/images/libpalette/miniNewFolder.svg new file mode 100644 index 00000000..4d992376 --- /dev/null +++ b/resources/images/libpalette/miniNewFolder.svg @@ -0,0 +1,232 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/libpalette/miniSearch.svg b/resources/images/libpalette/miniSearch.svg new file mode 100644 index 00000000..8f23129a --- /dev/null +++ b/resources/images/libpalette/miniSearch.svg @@ -0,0 +1,274 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/libpalette/miniTrash.svg b/resources/images/libpalette/miniTrash.svg new file mode 100644 index 00000000..acf44450 --- /dev/null +++ b/resources/images/libpalette/miniTrash.svg @@ -0,0 +1,225 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/libpalette/notFound.svg b/resources/images/libpalette/notFound.svg new file mode 100644 index 00000000..de14491f --- /dev/null +++ b/resources/images/libpalette/notFound.svg @@ -0,0 +1,66 @@ + + + + diff --git a/resources/images/libpalette/social.svg b/resources/images/libpalette/social.svg new file mode 100644 index 00000000..05776c6e --- /dev/null +++ b/resources/images/libpalette/social.svg @@ -0,0 +1,144 @@ + + + + diff --git a/resources/images/libpalette/trash_favorite.svg b/resources/images/libpalette/trash_favorite.svg index bfdead1c..5bffdd1d 100644 --- a/resources/images/libpalette/trash_favorite.svg +++ b/resources/images/libpalette/trash_favorite.svg @@ -1,96 +1,322 @@ - + - - - - image/svg+xml - - - - - - - - - + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/board/UBFeaturesController.cpp b/src/board/UBFeaturesController.cpp index 0ca973b2..256db233 100644 --- a/src/board/UBFeaturesController.cpp +++ b/src/board/UBFeaturesController.cpp @@ -330,7 +330,7 @@ UBFeaturesController::UBFeaturesController(QWidget *pParentWidget) : mLibSearchDirectoryPath =QUrl::fromLocalFile(UBSettings::settings()->userSearchDirectory()); trashDirectoryPath = QUrl::fromLocalFile(UBSettings::userTrashDirPath()); - rootElement = UBFeature(rootPath, QImage( ":images/libpalette/home.png" ), "root", QUrl()); + rootElement = UBFeature(rootPath, QImage( ":images/libpalette/home.svg" ), "root", QUrl()); audiosElement = UBFeature( audiosPath, QImage(":images/libpalette/AudiosCategory.svg"), tr("Audios") , mUserAudioDirectoryPath, FEATURE_CATEGORY); moviesElement = UBFeature( moviesPath, QImage(":images/libpalette/MoviesCategory.svg"), tr("Movies") , mUserVideoDirectoryPath, FEATURE_CATEGORY); picturesElement = UBFeature( picturesPath, QImage(":images/libpalette/PicturesCategory.svg"), tr("Pictures") , mUserPicturesDirectoryPath, FEATURE_CATEGORY); @@ -683,14 +683,14 @@ QImage UBFeaturesController::getIcon(const QString &path, UBFeatureElementType p } else if (pFType == FEATURE_IMAGE) { QImage pix(path); if (pix.isNull()) { - pix = QImage(":images/libpalette/notFound.png"); + pix = QImage(":images/libpalette/notFound.svg"); } else { pix = pix.scaledToWidth(qMin(UBSettings::maxThumbnailWidth, pix.width())); } return pix; } - return QImage(":images/libpalette/notFound.png"); + return QImage(":images/libpalette/notFound.svg"); } bool UBFeaturesController::isDeletable( const QUrl &url ) @@ -728,7 +728,7 @@ QImage UBFeaturesController::createThumbnail(const QString &path) return pix; } else { - thumbnailPath = ":images/libpalette/notFound.png"; + thumbnailPath = ":images/libpalette/notFound.svg"; } } diff --git a/src/domain/UBDragableThumbnail.h b/src/domain/UBDragableThumbnail.h index fe25c2c5..720d7308 100644 --- a/src/domain/UBDragableThumbnail.h +++ b/src/domain/UBDragableThumbnail.h @@ -12,7 +12,7 @@ class UBDraggableThumbnail : public QFrame { public: - UBDraggableThumbnail(QWidget* parent =0, const QPixmap& pixmap = QPixmap(":images/libpalette/notFound.png")); + UBDraggableThumbnail(QWidget* parent =0, const QPixmap& pixmap = QPixmap(":images/libpalette/notFound.svg")); void setThumbnail(const QPixmap &pixmap); void setPixmap(const QPixmap & pixmap); diff --git a/src/gui/UBFeaturesActionBar.cpp b/src/gui/UBFeaturesActionBar.cpp index 17cc2898..f1a7e88f 100644 --- a/src/gui/UBFeaturesActionBar.cpp +++ b/src/gui/UBFeaturesActionBar.cpp @@ -68,14 +68,14 @@ UBFeaturesActionBar::UBFeaturesActionBar( UBFeaturesController *controller, QWid setMaximumHeight(ACTIONBAR_HEIGHT); // Create the actions - 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); + mpFavoriteAction = new QAction(QIcon(":/images/libpalette/miniFavorite.svg"), tr("Add to favorites"), this); + mpSocialAction = new QAction(QIcon(":/images/libpalette/social.svg"), tr("Share"), this); + mpSearchAction = new QAction(QIcon(":/images/libpalette/miniSearch.svg"), tr("Search"), 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); + mpDeleteAction = new QAction(QIcon(":/images/libpalette/miniTrash.svg"), 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); - mpNewFolderAction = new QAction(QIcon(":/images/libpalette/miniNewFolder.png"), tr("Create new folder"), this); + mpNewFolderAction = new QAction(QIcon(":/images/libpalette/miniNewFolder.svg"), tr("Create new folder"), this); // Create the buttons mpFavoriteBtn = new UBActionButton(this, mpFavoriteAction); diff --git a/src/gui/UBFeaturesWidget.cpp b/src/gui/UBFeaturesWidget.cpp index 81dfed6d..b3d84807 100644 --- a/src/gui/UBFeaturesWidget.cpp +++ b/src/gui/UBFeaturesWidget.cpp @@ -271,7 +271,7 @@ void UBFeaturesWidget::removeFromFavorite( const UBFeaturesMimeData * mimeData ) void UBFeaturesWidget::onDisplayMetadata( QMap metadata ) { - QString previewImageUrl = ":images/libpalette/notFound.png"; + QString previewImageUrl = ":images/libpalette/notFound.svg"; QString widgetsUrl = QUrl::fromEncoded(metadata["Url"].toLatin1()).toString()/*metadata.value("Url", QString())*/; QString widgetsThumbsUrl = QUrl::fromEncoded(metadata["thumbnailUrl"].toLatin1()).toString(); @@ -299,7 +299,7 @@ void UBFeaturesWidget::onDisplayMetadata( QMap metadata ) } if (!widgetsThumbsUrl.isNull()) { - previewImageUrl = ":/images/libpalette/loading.png"; + previewImageUrl = ":/images/libpalette/loading.svg"; if (!imageGatherer) imageGatherer = new UBDownloadHttpFile(0, this); @@ -882,7 +882,7 @@ UBFeatureProperties::UBFeatureProperties( QWidget *parent, const char *name ) : maxThumbHeight = height() / 4; mpThumbnail = new QLabel(); - QPixmap icon(":images/libpalette/notFound.png"); + QPixmap icon(":images/libpalette/notFound.svg"); icon.scaledToWidth(THUMBNAIL_WIDTH); mpThumbnail->setPixmap(icon); From a6b5668c581d1fd2f02f28c8b67cd6cd9365439e Mon Sep 17 00:00:00 2001 From: thomas_lucky13 Date: Thu, 16 Jun 2022 20:10:47 +0400 Subject: [PATCH 04/12] New extraPalette --- resources/OpenBoard.qrc | 9 + resources/forms/mainWindow.ui | 14 +- resources/images/extraPalette/blackout.svg | 164 ++++ resources/images/extraPalette/blackoutOn.svg | 194 +++++ resources/images/extraPalette/compass.svg | 205 +++++ resources/images/extraPalette/compassOn.svg | 229 ++++++ resources/images/extraPalette/keyboard.svg | 707 +++++++++++++++++ resources/images/extraPalette/keyboardOn.svg | 732 ++++++++++++++++++ resources/images/extraPalette/mask.svg | 106 +++ resources/images/extraPalette/maskOn.svg | 130 ++++ resources/images/extraPalette/oEmbed.svg | 221 ++++++ resources/images/extraPalette/podcast.svg | 128 +++ resources/images/extraPalette/podcastOn.svg | 172 ++++ resources/images/extraPalette/protractor.svg | 245 ++++++ .../images/extraPalette/protractorOn.svg | 281 +++++++ resources/images/extraPalette/ruler.svg | 279 +++++++ resources/images/extraPalette/rulerOn.svg | 310 ++++++++ resources/images/extraPalette/trapFlash.svg | 179 +++++ resources/images/extraPalette/webTrap.svg | 106 +++ .../images/extraPalette/webTrapEnabled.svg | 120 +++ 20 files changed, 4524 insertions(+), 7 deletions(-) create mode 100644 resources/images/extraPalette/blackout.svg create mode 100644 resources/images/extraPalette/blackoutOn.svg create mode 100644 resources/images/extraPalette/compass.svg create mode 100644 resources/images/extraPalette/compassOn.svg create mode 100644 resources/images/extraPalette/keyboard.svg create mode 100644 resources/images/extraPalette/keyboardOn.svg create mode 100644 resources/images/extraPalette/mask.svg create mode 100644 resources/images/extraPalette/maskOn.svg create mode 100644 resources/images/extraPalette/oEmbed.svg create mode 100644 resources/images/extraPalette/podcast.svg create mode 100644 resources/images/extraPalette/podcastOn.svg create mode 100644 resources/images/extraPalette/protractor.svg create mode 100644 resources/images/extraPalette/protractorOn.svg create mode 100644 resources/images/extraPalette/ruler.svg create mode 100644 resources/images/extraPalette/rulerOn.svg create mode 100644 resources/images/extraPalette/trapFlash.svg create mode 100644 resources/images/extraPalette/webTrap.svg create mode 100644 resources/images/extraPalette/webTrapEnabled.svg diff --git a/resources/OpenBoard.qrc b/resources/OpenBoard.qrc index 9c861cab..fe437a3f 100644 --- a/resources/OpenBoard.qrc +++ b/resources/OpenBoard.qrc @@ -178,6 +178,14 @@ images/extraPalette/webTrap.png images/extraPalette/webTrapEnabled.png images/extraPalette/oEmbed.png + images/extraPalette/blackout.svg + images/extraPalette/blackoutOn.svg + images/extraPalette/keyboard.svg + images/extraPalette/keyboardOn.svg + images/extraPalette/trapFlash.svg + images/extraPalette/webTrap.svg + images/extraPalette/webTrapEnabled.svg + images/extraPalette/oEmbed.svg images/erasePalette/eraseAll.svg images/erasePalette/eraseItem.svg images/erasePalette/eraseAnnotation.svg @@ -230,6 +238,7 @@ images/edit-mode.svg images/save.svg images/libpalette/social.png + images/libpalette/social.svg images/navig_arrow.png images/flags/ar.png images/flags/bg.png diff --git a/resources/forms/mainWindow.ui b/resources/forms/mainWindow.ui index 5063bd35..a2380054 100644 --- a/resources/forms/mainWindow.ui +++ b/resources/forms/mainWindow.ui @@ -967,8 +967,8 @@ - :/images/extraPalette/blackout.png - :/images/extraPalette/blackoutOn.png:/images/extraPalette/blackout.png + :/images/extraPalette/blackout.svg + :/images/extraPalette/blackoutOn.svg:/images/extraPalette/blackout.svg Sleep @@ -983,8 +983,8 @@ - :/images/extraPalette/keyboard.png - :/images/extraPalette/keyboardOn.png:/images/extraPalette/keyboard.png + :/images/extraPalette/keyboard.svg + :/images/extraPalette/keyboardOn.svg:/images/extraPalette/keyboard.svg Virtual Keyboard @@ -1515,8 +1515,8 @@ - :/images/extraPalette/webTrap.png - :/images/extraPalette/webTrapEnabled.png:/images/extraPalette/webTrap.png + :/images/extraPalette/webTrap.svg + :/images/extraPalette/webTrapEnabled.svg:/images/extraPalette/webTrap.svg Web Trap @@ -1555,7 +1555,7 @@ - :/images/extraPalette/oEmbed.png:/images/extraPalette/oEmbed.png + :/images/extraPalette/oEmbed.svg:/images/extraPalette/oEmbed.svg Embed Web Content diff --git a/resources/images/extraPalette/blackout.svg b/resources/images/extraPalette/blackout.svg new file mode 100644 index 00000000..da96d1c8 --- /dev/null +++ b/resources/images/extraPalette/blackout.svg @@ -0,0 +1,164 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/extraPalette/blackoutOn.svg b/resources/images/extraPalette/blackoutOn.svg new file mode 100644 index 00000000..661d2e6f --- /dev/null +++ b/resources/images/extraPalette/blackoutOn.svg @@ -0,0 +1,194 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/extraPalette/compass.svg b/resources/images/extraPalette/compass.svg new file mode 100644 index 00000000..3169eafb --- /dev/null +++ b/resources/images/extraPalette/compass.svg @@ -0,0 +1,205 @@ + +image/svg+xml diff --git a/resources/images/extraPalette/compassOn.svg b/resources/images/extraPalette/compassOn.svg new file mode 100644 index 00000000..fab7662a --- /dev/null +++ b/resources/images/extraPalette/compassOn.svg @@ -0,0 +1,229 @@ + +image/svg+xml diff --git a/resources/images/extraPalette/keyboard.svg b/resources/images/extraPalette/keyboard.svg new file mode 100644 index 00000000..f9dd51cc --- /dev/null +++ b/resources/images/extraPalette/keyboard.svg @@ -0,0 +1,707 @@ + +image/svg+xml diff --git a/resources/images/extraPalette/keyboardOn.svg b/resources/images/extraPalette/keyboardOn.svg new file mode 100644 index 00000000..0fe6a6a9 --- /dev/null +++ b/resources/images/extraPalette/keyboardOn.svg @@ -0,0 +1,732 @@ + +image/svg+xml diff --git a/resources/images/extraPalette/mask.svg b/resources/images/extraPalette/mask.svg new file mode 100644 index 00000000..f968dc92 --- /dev/null +++ b/resources/images/extraPalette/mask.svg @@ -0,0 +1,106 @@ + +image/svg+xml diff --git a/resources/images/extraPalette/maskOn.svg b/resources/images/extraPalette/maskOn.svg new file mode 100644 index 00000000..0e7b724c --- /dev/null +++ b/resources/images/extraPalette/maskOn.svg @@ -0,0 +1,130 @@ + +image/svg+xml diff --git a/resources/images/extraPalette/oEmbed.svg b/resources/images/extraPalette/oEmbed.svg new file mode 100644 index 00000000..4c18cbe8 --- /dev/null +++ b/resources/images/extraPalette/oEmbed.svg @@ -0,0 +1,221 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/extraPalette/podcast.svg b/resources/images/extraPalette/podcast.svg new file mode 100644 index 00000000..c8f90176 --- /dev/null +++ b/resources/images/extraPalette/podcast.svg @@ -0,0 +1,128 @@ + +image/svg+xml diff --git a/resources/images/extraPalette/podcastOn.svg b/resources/images/extraPalette/podcastOn.svg new file mode 100644 index 00000000..925bce1c --- /dev/null +++ b/resources/images/extraPalette/podcastOn.svg @@ -0,0 +1,172 @@ + +image/svg+xml diff --git a/resources/images/extraPalette/protractor.svg b/resources/images/extraPalette/protractor.svg new file mode 100644 index 00000000..a52327b1 --- /dev/null +++ b/resources/images/extraPalette/protractor.svg @@ -0,0 +1,245 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/extraPalette/protractorOn.svg b/resources/images/extraPalette/protractorOn.svg new file mode 100644 index 00000000..f15278f0 --- /dev/null +++ b/resources/images/extraPalette/protractorOn.svg @@ -0,0 +1,281 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/extraPalette/ruler.svg b/resources/images/extraPalette/ruler.svg new file mode 100644 index 00000000..a417c1d8 --- /dev/null +++ b/resources/images/extraPalette/ruler.svg @@ -0,0 +1,279 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/extraPalette/rulerOn.svg b/resources/images/extraPalette/rulerOn.svg new file mode 100644 index 00000000..c316cc56 --- /dev/null +++ b/resources/images/extraPalette/rulerOn.svg @@ -0,0 +1,310 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/extraPalette/trapFlash.svg b/resources/images/extraPalette/trapFlash.svg new file mode 100644 index 00000000..86274ca6 --- /dev/null +++ b/resources/images/extraPalette/trapFlash.svg @@ -0,0 +1,179 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/extraPalette/webTrap.svg b/resources/images/extraPalette/webTrap.svg new file mode 100644 index 00000000..13df14ae --- /dev/null +++ b/resources/images/extraPalette/webTrap.svg @@ -0,0 +1,106 @@ + +image/svg+xml diff --git a/resources/images/extraPalette/webTrapEnabled.svg b/resources/images/extraPalette/webTrapEnabled.svg new file mode 100644 index 00000000..301efafd --- /dev/null +++ b/resources/images/extraPalette/webTrapEnabled.svg @@ -0,0 +1,120 @@ + +image/svg+xml From 2910ead71900cb8bc709cc892330e02a0370e0b2 Mon Sep 17 00:00:00 2001 From: thomas_lucky13 Date: Thu, 16 Jun 2022 20:53:36 +0400 Subject: [PATCH 05/12] New flags --- resources/OpenBoard.qrc | 59 + resources/images/flags/ar.svg | 108 ++ resources/images/flags/bg.svg | 117 ++ resources/images/flags/ca.svg | 101 ++ resources/images/flags/cs.svg | 118 ++ resources/images/flags/da.svg | 116 ++ resources/images/flags/de.svg | 117 ++ resources/images/flags/el.svg | 117 ++ resources/images/flags/en.svg | 113 ++ resources/images/flags/eo.svg | 134 ++ resources/images/flags/es.svg | 1691 ++++++++++++++++++++++ resources/images/flags/et.svg | 116 ++ resources/images/flags/eu.svg | 124 ++ resources/images/flags/fa.svg | 122 ++ resources/images/flags/fi.svg | 116 ++ resources/images/flags/fo.svg | 130 ++ resources/images/flags/fr.svg | 116 ++ resources/images/flags/ga.svg | 116 ++ resources/images/flags/gl.svg | 836 +++++++++++ resources/images/flags/he.svg | 128 ++ resources/images/flags/hr.svg | 809 +++++++++++ resources/images/flags/hu.svg | 116 ++ resources/images/flags/id.svg | 108 ++ resources/images/flags/is.svg | 130 ++ resources/images/flags/it.svg | 116 ++ resources/images/flags/ja.svg | 108 ++ resources/images/flags/km.svg | 317 ++++ resources/images/flags/lb.svg | 116 ++ resources/images/flags/lt.svg | 116 ++ resources/images/flags/lv.svg | 110 ++ resources/images/flags/nb.svg | 130 ++ resources/images/flags/nl.svg | 116 ++ resources/images/flags/nn.svg | 130 ++ resources/images/flags/pl.svg | 108 ++ resources/images/flags/pt-br.svg | 130 ++ resources/images/flags/pt-pt.svg | 364 +++++ resources/images/flags/ro.svg | 116 ++ resources/images/flags/ru.svg | 116 ++ resources/images/flags/sco.svg | 109 ++ resources/images/flags/se.svg | 138 ++ resources/images/flags/sk.svg | 134 ++ resources/images/flags/sl.svg | 190 +++ resources/images/flags/sq.svg | 109 ++ resources/images/flags/sv.svg | 116 ++ resources/images/flags/tg.svg | 277 ++++ resources/images/flags/th.svg | 124 ++ resources/images/flags/tl.svg | 181 +++ resources/images/flags/tr.svg | 128 ++ resources/images/flags/uk.svg | 108 ++ resources/images/flags/vi.svg | 122 ++ resources/images/flags/zh-hans.svg | 196 +++ resources/images/flags/zh-hant.svg | 112 ++ src/frameworks/UBPlatformUtils_linux.cpp | 10 +- src/frameworks/UBPlatformUtils_win.cpp | 10 +- 54 files changed, 9905 insertions(+), 10 deletions(-) create mode 100644 resources/images/flags/ar.svg create mode 100644 resources/images/flags/bg.svg create mode 100644 resources/images/flags/ca.svg create mode 100644 resources/images/flags/cs.svg create mode 100644 resources/images/flags/da.svg create mode 100644 resources/images/flags/de.svg create mode 100644 resources/images/flags/el.svg create mode 100644 resources/images/flags/en.svg create mode 100644 resources/images/flags/eo.svg create mode 100644 resources/images/flags/es.svg create mode 100644 resources/images/flags/et.svg create mode 100644 resources/images/flags/eu.svg create mode 100644 resources/images/flags/fa.svg create mode 100644 resources/images/flags/fi.svg create mode 100644 resources/images/flags/fo.svg create mode 100644 resources/images/flags/fr.svg create mode 100644 resources/images/flags/ga.svg create mode 100644 resources/images/flags/gl.svg create mode 100644 resources/images/flags/he.svg create mode 100644 resources/images/flags/hr.svg create mode 100644 resources/images/flags/hu.svg create mode 100644 resources/images/flags/id.svg create mode 100644 resources/images/flags/is.svg create mode 100644 resources/images/flags/it.svg create mode 100644 resources/images/flags/ja.svg create mode 100644 resources/images/flags/km.svg create mode 100644 resources/images/flags/lb.svg create mode 100644 resources/images/flags/lt.svg create mode 100644 resources/images/flags/lv.svg create mode 100644 resources/images/flags/nb.svg create mode 100644 resources/images/flags/nl.svg create mode 100644 resources/images/flags/nn.svg create mode 100644 resources/images/flags/pl.svg create mode 100644 resources/images/flags/pt-br.svg create mode 100644 resources/images/flags/pt-pt.svg create mode 100644 resources/images/flags/ro.svg create mode 100644 resources/images/flags/ru.svg create mode 100644 resources/images/flags/sco.svg create mode 100644 resources/images/flags/se.svg create mode 100644 resources/images/flags/sk.svg create mode 100644 resources/images/flags/sl.svg create mode 100644 resources/images/flags/sq.svg create mode 100644 resources/images/flags/sv.svg create mode 100644 resources/images/flags/tg.svg create mode 100644 resources/images/flags/th.svg create mode 100644 resources/images/flags/tl.svg create mode 100644 resources/images/flags/tr.svg create mode 100644 resources/images/flags/uk.svg create mode 100644 resources/images/flags/vi.svg create mode 100644 resources/images/flags/zh-hans.svg create mode 100644 resources/images/flags/zh-hant.svg diff --git a/resources/OpenBoard.qrc b/resources/OpenBoard.qrc index fe437a3f..51ff69a3 100644 --- a/resources/OpenBoard.qrc +++ b/resources/OpenBoard.qrc @@ -291,6 +291,65 @@ images/flags/vi.png images/flags/zh-hans.png images/flags/zh-hant.png + + + + + + + + images/flags/ar.svg + images/flags/bg.svg + images/flags/ca.svg + images/flags/cs.svg + images/flags/da.svg + images/flags/de.svg + images/flags/el.svg + images/flags/en.svg + images/flags/eo.svg + images/flags/es.svg + images/flags/et.svg + images/flags/eu.svg + images/flags/fa.svg + images/flags/fi.svg + images/flags/fo.svg + images/flags/fr.svg + images/flags/ga.svg + images/flags/gl.svg + images/flags/he.svg + images/flags/hr.svg + images/flags/hu.svg + images/flags/id.svg + images/flags/is.svg + images/flags/it.svg + images/flags/ja.svg + images/flags/km.svg + images/flags/lb.svg + images/flags/lt.svg + images/flags/lv.svg + images/flags/nb.svg + images/flags/nl.svg + images/flags/nn.svg + images/flags/pl.svg + images/flags/pt-br.svg + images/flags/pt-pt.svg + images/flags/ro.svg + images/flags/ru.svg + images/flags/sco.svg + images/flags/se.svg + images/flags/sk.svg + images/flags/sl.svg + images/flags/sq.svg + images/flags/sv.svg + images/flags/tg.svg + images/flags/th.svg + images/flags/tl.svg + images/flags/tr.svg + images/flags/uk.svg + images/flags/vi.svg + images/flags/zh-hans.svg + images/flags/zh-hant.svg + images/libpalette/notFound.png images/libpalette/trash_favorite.svg images/libpalette/back.png diff --git a/resources/images/flags/ar.svg b/resources/images/flags/ar.svg new file mode 100644 index 00000000..9df9fb79 --- /dev/null +++ b/resources/images/flags/ar.svg @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/flags/bg.svg b/resources/images/flags/bg.svg new file mode 100644 index 00000000..1b7fb2c0 --- /dev/null +++ b/resources/images/flags/bg.svg @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/flags/ca.svg b/resources/images/flags/ca.svg new file mode 100644 index 00000000..467c23ae --- /dev/null +++ b/resources/images/flags/ca.svg @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/flags/cs.svg b/resources/images/flags/cs.svg new file mode 100644 index 00000000..9d40df25 --- /dev/null +++ b/resources/images/flags/cs.svg @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/flags/da.svg b/resources/images/flags/da.svg new file mode 100644 index 00000000..5302c3a4 --- /dev/null +++ b/resources/images/flags/da.svg @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/flags/de.svg b/resources/images/flags/de.svg new file mode 100644 index 00000000..c965831a --- /dev/null +++ b/resources/images/flags/de.svg @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/flags/el.svg b/resources/images/flags/el.svg new file mode 100644 index 00000000..9d0d4c30 --- /dev/null +++ b/resources/images/flags/el.svg @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/flags/en.svg b/resources/images/flags/en.svg new file mode 100644 index 00000000..b725be89 --- /dev/null +++ b/resources/images/flags/en.svg @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/flags/eo.svg b/resources/images/flags/eo.svg new file mode 100644 index 00000000..f7e9698f --- /dev/null +++ b/resources/images/flags/eo.svg @@ -0,0 +1,134 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/flags/es.svg b/resources/images/flags/es.svg new file mode 100644 index 00000000..7d2daab8 --- /dev/null +++ b/resources/images/flags/es.svg @@ -0,0 +1,1691 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/flags/et.svg b/resources/images/flags/et.svg new file mode 100644 index 00000000..8e9ab953 --- /dev/null +++ b/resources/images/flags/et.svg @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/flags/eu.svg b/resources/images/flags/eu.svg new file mode 100644 index 00000000..b064b2ed --- /dev/null +++ b/resources/images/flags/eu.svg @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/flags/fa.svg b/resources/images/flags/fa.svg new file mode 100644 index 00000000..162912d4 --- /dev/null +++ b/resources/images/flags/fa.svg @@ -0,0 +1,122 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/flags/fi.svg b/resources/images/flags/fi.svg new file mode 100644 index 00000000..565877a2 --- /dev/null +++ b/resources/images/flags/fi.svg @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/flags/fo.svg b/resources/images/flags/fo.svg new file mode 100644 index 00000000..8d617b4e --- /dev/null +++ b/resources/images/flags/fo.svg @@ -0,0 +1,130 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/flags/fr.svg b/resources/images/flags/fr.svg new file mode 100644 index 00000000..fbe78f9c --- /dev/null +++ b/resources/images/flags/fr.svg @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/flags/ga.svg b/resources/images/flags/ga.svg new file mode 100644 index 00000000..05406647 --- /dev/null +++ b/resources/images/flags/ga.svg @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/flags/gl.svg b/resources/images/flags/gl.svg new file mode 100644 index 00000000..fab254e9 --- /dev/null +++ b/resources/images/flags/gl.svg @@ -0,0 +1,836 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/flags/he.svg b/resources/images/flags/he.svg new file mode 100644 index 00000000..c21f69b8 --- /dev/null +++ b/resources/images/flags/he.svg @@ -0,0 +1,128 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/flags/hr.svg b/resources/images/flags/hr.svg new file mode 100644 index 00000000..a136a7a3 --- /dev/null +++ b/resources/images/flags/hr.svg @@ -0,0 +1,809 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/flags/hu.svg b/resources/images/flags/hu.svg new file mode 100644 index 00000000..afbcd3ce --- /dev/null +++ b/resources/images/flags/hu.svg @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/flags/id.svg b/resources/images/flags/id.svg new file mode 100644 index 00000000..ebcfc727 --- /dev/null +++ b/resources/images/flags/id.svg @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/flags/is.svg b/resources/images/flags/is.svg new file mode 100644 index 00000000..1b4333ce --- /dev/null +++ b/resources/images/flags/is.svg @@ -0,0 +1,130 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/flags/it.svg b/resources/images/flags/it.svg new file mode 100644 index 00000000..c6e9b590 --- /dev/null +++ b/resources/images/flags/it.svg @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/flags/ja.svg b/resources/images/flags/ja.svg new file mode 100644 index 00000000..2367b4fc --- /dev/null +++ b/resources/images/flags/ja.svg @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/flags/km.svg b/resources/images/flags/km.svg new file mode 100644 index 00000000..ddcb488d --- /dev/null +++ b/resources/images/flags/km.svg @@ -0,0 +1,317 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/flags/lb.svg b/resources/images/flags/lb.svg new file mode 100644 index 00000000..bb1ced55 --- /dev/null +++ b/resources/images/flags/lb.svg @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/flags/lt.svg b/resources/images/flags/lt.svg new file mode 100644 index 00000000..1579d368 --- /dev/null +++ b/resources/images/flags/lt.svg @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/flags/lv.svg b/resources/images/flags/lv.svg new file mode 100644 index 00000000..457d066b --- /dev/null +++ b/resources/images/flags/lv.svg @@ -0,0 +1,110 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/flags/nb.svg b/resources/images/flags/nb.svg new file mode 100644 index 00000000..d47f4f58 --- /dev/null +++ b/resources/images/flags/nb.svg @@ -0,0 +1,130 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/flags/nl.svg b/resources/images/flags/nl.svg new file mode 100644 index 00000000..a79646f6 --- /dev/null +++ b/resources/images/flags/nl.svg @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/flags/nn.svg b/resources/images/flags/nn.svg new file mode 100644 index 00000000..d47f4f58 --- /dev/null +++ b/resources/images/flags/nn.svg @@ -0,0 +1,130 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/flags/pl.svg b/resources/images/flags/pl.svg new file mode 100644 index 00000000..61eadd78 --- /dev/null +++ b/resources/images/flags/pl.svg @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/flags/pt-br.svg b/resources/images/flags/pt-br.svg new file mode 100644 index 00000000..04b03269 --- /dev/null +++ b/resources/images/flags/pt-br.svg @@ -0,0 +1,130 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/flags/pt-pt.svg b/resources/images/flags/pt-pt.svg new file mode 100644 index 00000000..bab1c71d --- /dev/null +++ b/resources/images/flags/pt-pt.svg @@ -0,0 +1,364 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/flags/ro.svg b/resources/images/flags/ro.svg new file mode 100644 index 00000000..547e3606 --- /dev/null +++ b/resources/images/flags/ro.svg @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/flags/ru.svg b/resources/images/flags/ru.svg new file mode 100644 index 00000000..9701ee1c --- /dev/null +++ b/resources/images/flags/ru.svg @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/flags/sco.svg b/resources/images/flags/sco.svg new file mode 100644 index 00000000..8578c8e8 --- /dev/null +++ b/resources/images/flags/sco.svg @@ -0,0 +1,109 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/flags/se.svg b/resources/images/flags/se.svg new file mode 100644 index 00000000..c09551dc --- /dev/null +++ b/resources/images/flags/se.svg @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/flags/sk.svg b/resources/images/flags/sk.svg new file mode 100644 index 00000000..e48b37b1 --- /dev/null +++ b/resources/images/flags/sk.svg @@ -0,0 +1,134 @@ + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/flags/sl.svg b/resources/images/flags/sl.svg new file mode 100644 index 00000000..649a45a3 --- /dev/null +++ b/resources/images/flags/sl.svg @@ -0,0 +1,190 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/flags/sq.svg b/resources/images/flags/sq.svg new file mode 100644 index 00000000..6b0f6b72 --- /dev/null +++ b/resources/images/flags/sq.svg @@ -0,0 +1,109 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/flags/sv.svg b/resources/images/flags/sv.svg new file mode 100644 index 00000000..73d9f219 --- /dev/null +++ b/resources/images/flags/sv.svg @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/flags/tg.svg b/resources/images/flags/tg.svg new file mode 100644 index 00000000..f0e26e9e --- /dev/null +++ b/resources/images/flags/tg.svg @@ -0,0 +1,277 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/flags/th.svg b/resources/images/flags/th.svg new file mode 100644 index 00000000..699bea58 --- /dev/null +++ b/resources/images/flags/th.svg @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/flags/tl.svg b/resources/images/flags/tl.svg new file mode 100644 index 00000000..d32e16d8 --- /dev/null +++ b/resources/images/flags/tl.svg @@ -0,0 +1,181 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/flags/tr.svg b/resources/images/flags/tr.svg new file mode 100644 index 00000000..e97ef5ed --- /dev/null +++ b/resources/images/flags/tr.svg @@ -0,0 +1,128 @@ + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/flags/uk.svg b/resources/images/flags/uk.svg new file mode 100644 index 00000000..b23868ec --- /dev/null +++ b/resources/images/flags/uk.svg @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/flags/vi.svg b/resources/images/flags/vi.svg new file mode 100644 index 00000000..43df3720 --- /dev/null +++ b/resources/images/flags/vi.svg @@ -0,0 +1,122 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/flags/zh-hans.svg b/resources/images/flags/zh-hans.svg new file mode 100644 index 00000000..bf5fe094 --- /dev/null +++ b/resources/images/flags/zh-hans.svg @@ -0,0 +1,196 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/flags/zh-hant.svg b/resources/images/flags/zh-hant.svg new file mode 100644 index 00000000..d39326f1 --- /dev/null +++ b/resources/images/flags/zh-hant.svg @@ -0,0 +1,112 @@ + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/src/frameworks/UBPlatformUtils_linux.cpp b/src/frameworks/UBPlatformUtils_linux.cpp index 641cda9e..d3693ced 100644 --- a/src/frameworks/UBPlatformUtils_linux.cpp +++ b/src/frameworks/UBPlatformUtils_linux.cpp @@ -407,11 +407,11 @@ void UBPlatformUtils::initializeKeyboardLayouts() { nKeyboardLayouts = 5; keyboardLayouts = new UBKeyboardLocale*[nKeyboardLayouts]; - keyboardLayouts[0] = new UBKeyboardLocale(tr("English"), "en", "", new QIcon(":/images/flags/en.png"), ENGLISH_LOCALE); - keyboardLayouts[1] = new UBKeyboardLocale(tr("Russian"), "ru", "", new QIcon(":/images/flags/ru.png"),RUSSIAN_LOCALE); - keyboardLayouts[2] = new UBKeyboardLocale(tr("German"), "de", "", new QIcon(":/images/flags/de.png"), GERMAN_LOCALE); - keyboardLayouts[3] = new UBKeyboardLocale(tr("French"), "fr", "", new QIcon(":/images/flags/fr.png"), FRENCH_LOCALE); - keyboardLayouts[4] = new UBKeyboardLocale(tr("Swiss French"), "fr-CH", "", new QIcon(":/images/flags/fr.png"), SWISS_FRENCH_LOCALE); + keyboardLayouts[0] = new UBKeyboardLocale(tr("English"), "en", "", new QIcon(":/images/flags/en.svg"), ENGLISH_LOCALE); + keyboardLayouts[1] = new UBKeyboardLocale(tr("Russian"), "ru", "", new QIcon(":/images/flags/ru.svg"),RUSSIAN_LOCALE); + keyboardLayouts[2] = new UBKeyboardLocale(tr("German"), "de", "", new QIcon(":/images/flags/de.svg"), GERMAN_LOCALE); + keyboardLayouts[3] = new UBKeyboardLocale(tr("French"), "fr", "", new QIcon(":/images/flags/fr.svg"), FRENCH_LOCALE); + keyboardLayouts[4] = new UBKeyboardLocale(tr("Swiss French"), "fr-CH", "", new QIcon(":/images/flags/fr.svg"), SWISS_FRENCH_LOCALE); } void UBPlatformUtils::destroyKeyboardLayouts() diff --git a/src/frameworks/UBPlatformUtils_win.cpp b/src/frameworks/UBPlatformUtils_win.cpp index 523376d1..da8ee123 100644 --- a/src/frameworks/UBPlatformUtils_win.cpp +++ b/src/frameworks/UBPlatformUtils_win.cpp @@ -406,11 +406,11 @@ void UBPlatformUtils::initializeKeyboardLayouts() { nKeyboardLayouts = 5; keyboardLayouts = new UBKeyboardLocale*[nKeyboardLayouts]; - keyboardLayouts[0] = new UBKeyboardLocale(tr("English"), "en", "", new QIcon(":/images/flags/en.png"), ENGLISH_LOCALE); - keyboardLayouts[1] = new UBKeyboardLocale(tr("Russian"), "ru", "", new QIcon(":/images/flags/ru.png"),RUSSIAN_LOCALE); - keyboardLayouts[2] = new UBKeyboardLocale(tr("French"), "fr", "", new QIcon(":/images/flags/fr.png"), FRENCH_LOCALE); - keyboardLayouts[3] = new UBKeyboardLocale(tr("Swiss French"), "fr-CH", "", new QIcon(":/images/flags/fr.png"), SWISS_FRENCH_LOCALE); - keyboardLayouts[4] = new UBKeyboardLocale(tr("German"), "de", "", new QIcon(":/images/flags/de.png"), GERMAN_LOCALE); + keyboardLayouts[0] = new UBKeyboardLocale(tr("English"), "en", "", new QIcon(":/images/flags/en.svg"), ENGLISH_LOCALE); + keyboardLayouts[1] = new UBKeyboardLocale(tr("Russian"), "ru", "", new QIcon(":/images/flags/ru.svg"),RUSSIAN_LOCALE); + keyboardLayouts[2] = new UBKeyboardLocale(tr("French"), "fr", "", new QIcon(":/images/flags/fr.svg"), FRENCH_LOCALE); + keyboardLayouts[3] = new UBKeyboardLocale(tr("Swiss French"), "fr-CH", "", new QIcon(":/images/flags/fr.svg"), SWISS_FRENCH_LOCALE); + keyboardLayouts[4] = new UBKeyboardLocale(tr("German"), "de", "", new QIcon(":/images/flags/de.svg"), GERMAN_LOCALE); } void UBPlatformUtils::destroyKeyboardLayouts() From 9b70a1c1dfa3a8d6e6a398f56f5700cdf10d9507 Mon Sep 17 00:00:00 2001 From: thomas_lucky13 Date: Thu, 16 Jun 2022 21:01:05 +0400 Subject: [PATCH 06/12] New print --- resources/OpenBoard.qrc | 10 +- resources/images/print/onepage.svg | 88 +++++++++++++ resources/images/print/thumbnails.svg | 180 ++++++++++++++++++++++++++ resources/images/print/twopages.svg | 119 +++++++++++++++++ 4 files changed, 390 insertions(+), 7 deletions(-) create mode 100644 resources/images/print/onepage.svg create mode 100644 resources/images/print/thumbnails.svg create mode 100644 resources/images/print/twopages.svg diff --git a/resources/OpenBoard.qrc b/resources/OpenBoard.qrc index 51ff69a3..2f687df0 100644 --- a/resources/OpenBoard.qrc +++ b/resources/OpenBoard.qrc @@ -215,6 +215,9 @@ images/print/onepage.png images/print/thumbnails.png images/print/twopages.png + images/print/onepage.svg + images/print/thumbnails.svg + images/print/twopages.svg images/defaultWidgetIcon.png images/favorites.png images/myContent.png @@ -291,13 +294,6 @@ images/flags/vi.png images/flags/zh-hans.png images/flags/zh-hant.png - - - - - - - images/flags/ar.svg images/flags/bg.svg images/flags/ca.svg diff --git a/resources/images/print/onepage.svg b/resources/images/print/onepage.svg new file mode 100644 index 00000000..08e7d75e --- /dev/null +++ b/resources/images/print/onepage.svg @@ -0,0 +1,88 @@ + + + +Page 1 diff --git a/resources/images/print/thumbnails.svg b/resources/images/print/thumbnails.svg new file mode 100644 index 00000000..07d2dc39 --- /dev/null +++ b/resources/images/print/thumbnails.svg @@ -0,0 +1,180 @@ + + + + diff --git a/resources/images/print/twopages.svg b/resources/images/print/twopages.svg new file mode 100644 index 00000000..3df3a7df --- /dev/null +++ b/resources/images/print/twopages.svg @@ -0,0 +1,119 @@ + + + +Page 2Page 1 From 2737e1c4ce5c1127f189e0b0f391cf53cc5e4bb0 Mon Sep 17 00:00:00 2001 From: thomas_lucky13 Date: Thu, 21 Jul 2022 11:34:56 +0400 Subject: [PATCH 07/12] toolPalette --- resources/OpenBoard.qrc | 7 + resources/images/toolPalette/aristoTool.svg | 245 ++++++++++++++++++ resources/images/toolPalette/axesTool.svg | 121 +++++++++ resources/images/toolPalette/cacheTool.svg | 87 +++++++ .../images/toolPalette/magnifierTool.svg | 173 +++++++++++++ resources/images/toolPalette/maskTool.svg | 187 +++++++++++++ .../images/toolPalette/protractorTool.svg | 245 ++++++++++++++++++ resources/images/toolPalette/rulerTool.svg | 245 ++++++++++++++++++ resources/images/toolPalette/triangleTool.svg | 125 +++++++++ src/tools/UBToolsManager.cpp | 28 +- 10 files changed, 1449 insertions(+), 14 deletions(-) create mode 100644 resources/images/toolPalette/aristoTool.svg create mode 100644 resources/images/toolPalette/axesTool.svg create mode 100644 resources/images/toolPalette/cacheTool.svg create mode 100644 resources/images/toolPalette/magnifierTool.svg create mode 100644 resources/images/toolPalette/maskTool.svg create mode 100644 resources/images/toolPalette/protractorTool.svg create mode 100644 resources/images/toolPalette/rulerTool.svg create mode 100644 resources/images/toolPalette/triangleTool.svg diff --git a/resources/OpenBoard.qrc b/resources/OpenBoard.qrc index 2f687df0..faafe96b 100644 --- a/resources/OpenBoard.qrc +++ b/resources/OpenBoard.qrc @@ -172,6 +172,13 @@ images/toolPalette/aristoTool.png images/toolPalette/maskTool.png images/toolPalette/magnifierTool.png + images/toolPalette/maskTool.svg + images/toolPalette/protractorTool.svg + images/toolPalette/axesTool.svg + images/toolPalette/rulerTool.svg + images/toolPalette/cacheTool.svg + images/toolPalette/magnifierTool.svg + images/toolPalette/triangleTool.svg images/extraPalette/blackout.png images/extraPalette/keyboard.png images/extraPalette/trapFlash.png diff --git a/resources/images/toolPalette/aristoTool.svg b/resources/images/toolPalette/aristoTool.svg new file mode 100644 index 00000000..65c703cc --- /dev/null +++ b/resources/images/toolPalette/aristoTool.svg @@ -0,0 +1,245 @@ + + + + + + + + + + diff --git a/resources/images/toolPalette/axesTool.svg b/resources/images/toolPalette/axesTool.svg new file mode 100644 index 00000000..af0f3c79 --- /dev/null +++ b/resources/images/toolPalette/axesTool.svg @@ -0,0 +1,121 @@ + + + + + + + + + + diff --git a/resources/images/toolPalette/cacheTool.svg b/resources/images/toolPalette/cacheTool.svg new file mode 100644 index 00000000..06108895 --- /dev/null +++ b/resources/images/toolPalette/cacheTool.svg @@ -0,0 +1,87 @@ + + + + + + + + + + diff --git a/resources/images/toolPalette/magnifierTool.svg b/resources/images/toolPalette/magnifierTool.svg new file mode 100644 index 00000000..be4a1f75 --- /dev/null +++ b/resources/images/toolPalette/magnifierTool.svg @@ -0,0 +1,173 @@ + + + + + + + + + + diff --git a/resources/images/toolPalette/maskTool.svg b/resources/images/toolPalette/maskTool.svg new file mode 100644 index 00000000..e9cf6a75 --- /dev/null +++ b/resources/images/toolPalette/maskTool.svg @@ -0,0 +1,187 @@ + + + + + + + + + + diff --git a/resources/images/toolPalette/protractorTool.svg b/resources/images/toolPalette/protractorTool.svg new file mode 100644 index 00000000..5cd1e313 --- /dev/null +++ b/resources/images/toolPalette/protractorTool.svg @@ -0,0 +1,245 @@ + + + + + + + + + + diff --git a/resources/images/toolPalette/rulerTool.svg b/resources/images/toolPalette/rulerTool.svg new file mode 100644 index 00000000..14775e6c --- /dev/null +++ b/resources/images/toolPalette/rulerTool.svg @@ -0,0 +1,245 @@ + + + + + + + + + + diff --git a/resources/images/toolPalette/triangleTool.svg b/resources/images/toolPalette/triangleTool.svg new file mode 100644 index 00000000..c6254654 --- /dev/null +++ b/resources/images/toolPalette/triangleTool.svg @@ -0,0 +1,125 @@ + + + + + + + + + + diff --git a/src/tools/UBToolsManager.cpp b/src/tools/UBToolsManager.cpp index b1704413..e749f5f4 100644 --- a/src/tools/UBToolsManager.cpp +++ b/src/tools/UBToolsManager.cpp @@ -53,26 +53,26 @@ UBToolsManager::UBToolsManager(QObject *parent) { mask.id = "openboardtool://openboard/mask"; - mask.icon = QPixmap(":/images/toolPalette/maskTool.png"); + mask.icon = QPixmap(":/images/toolPalette/maskTool.svg"); mask.label = tr("Mask"); mask.version = "1.0"; - mToolsIcon.insert(mask.id, ":/images/toolPalette/maskTool.png"); + mToolsIcon.insert(mask.id, ":/images/toolPalette/maskTool.svg"); mDescriptors << mask; ruler.id = "openboardtool://ruler"; - ruler.icon = QPixmap(":/images/toolPalette/rulerTool.png"); + ruler.icon = QPixmap(":/images/toolPalette/rulerTool.svg"); ruler.label = tr("Ruler"); ruler.version = "1.0"; - mToolsIcon.insert(ruler.id, ":/images/toolPalette/rulerTool.png"); + mToolsIcon.insert(ruler.id, ":/images/toolPalette/rulerTool.svg"); mDescriptors << ruler; axes.id = "openboardtool://axes"; - axes.icon = QPixmap(":/images/toolPalette/axesTool.png"); + axes.icon = QPixmap(":/images/toolPalette/axesTool.svg"); axes.label = tr("Axes"); axes.version = "1.0"; - mToolsIcon.insert(axes.id, ":/images/toolPalette/axesTool.png"); + mToolsIcon.insert(axes.id, ":/images/toolPalette/axesTool.svg"); // disabled by default, added later in UBSettings:init if enabled // mDescriptors << axes; @@ -86,34 +86,34 @@ UBToolsManager::UBToolsManager(QObject *parent) protractor.id = "openboardtool://protractor"; - protractor.icon = QPixmap(":/images/toolPalette/protractorTool.png"); + protractor.icon = QPixmap(":/images/toolPalette/protractorTool.svg"); protractor.label = tr("Protractor"); protractor.version = "1.0"; - mToolsIcon.insert(protractor.id,":/images/toolPalette/protractorTool.png"); + mToolsIcon.insert(protractor.id,":/images/toolPalette/protractorTool.svg"); mDescriptors << protractor; triangle.id = "openboardtool://triangle"; - triangle.icon = QPixmap(":/images/toolPalette/triangleTool.png"); + triangle.icon = QPixmap(":/images/toolPalette/triangleTool.svg"); triangle.label = tr("Triangle"); triangle.version = "1.0"; - mToolsIcon.insert(triangle.id,":/images/toolPalette/triangleTool.png"); + mToolsIcon.insert(triangle.id,":/images/toolPalette/triangleTool.svg"); mDescriptors << triangle; magnifier.id = "openboardtool://magnifier"; - magnifier.icon = QPixmap(":/images/toolPalette/magnifierTool.png"); + magnifier.icon = QPixmap(":/images/toolPalette/magnifierTool.svg"); magnifier.label = tr("Magnifier"); magnifier.version = "1.0"; - mToolsIcon.insert(magnifier.id,":/images/toolPalette/magnifierTool.png"); + mToolsIcon.insert(magnifier.id,":/images/toolPalette/magnifierTool.svg"); mDescriptors << magnifier; cache.id = "openboardtool://cache"; - cache.icon = QPixmap(":/images/toolPalette/cacheTool.png"); + cache.icon = QPixmap(":/images/toolPalette/cacheTool.svg"); cache.label = tr("Cache"); cache.version = "1.0"; - mToolsIcon.insert(cache.id, ":/images/toolPalette/cacheTool.png"); + mToolsIcon.insert(cache.id, ":/images/toolPalette/cacheTool.svg"); mDescriptors << cache; } From 4828bd2229135494960afff32d7d7310f4b66715 Mon Sep 17 00:00:00 2001 From: thomas_lucky13 Date: Thu, 21 Jul 2022 17:47:06 +0400 Subject: [PATCH 08/12] virtual keyboard --- resources/OpenBoard.qrc | 20 ++ .../images/virtual.keyboard/29/backspace.svg | 129 +++++++++++++ .../images/virtual.keyboard/29/capslock.svg | 134 ++++++++++++++ .../virtual.keyboard/29/centre-active.svg | 101 +++++++++++ .../virtual.keyboard/29/centre-passive.svg | 171 ++++++++++++++++++ .../virtual.keyboard/29/left-active.svg | 160 ++++++++++++++++ .../virtual.keyboard/29/left-passive.svg | 171 ++++++++++++++++++ .../virtual.keyboard/29/right-active.svg | 160 ++++++++++++++++ .../virtual.keyboard/29/right-passive.svg | 171 ++++++++++++++++++ .../images/virtual.keyboard/29/shift.svg | 122 +++++++++++++ resources/images/virtual.keyboard/29/tab.svg | 163 +++++++++++++++++ .../images/virtual.keyboard/41/backspace.svg | 129 +++++++++++++ .../images/virtual.keyboard/41/capslock.svg | 134 ++++++++++++++ .../virtual.keyboard/41/centre-active.svg | 101 +++++++++++ .../virtual.keyboard/41/centre-passive.svg | 171 ++++++++++++++++++ .../virtual.keyboard/41/left-active.svg | 160 ++++++++++++++++ .../virtual.keyboard/41/left-passive.svg | 171 ++++++++++++++++++ .../virtual.keyboard/41/right-active.svg | 160 ++++++++++++++++ .../virtual.keyboard/41/right-passive.svg | 171 ++++++++++++++++++ .../images/virtual.keyboard/41/shift.svg | 122 +++++++++++++ resources/images/virtual.keyboard/41/tab.svg | 163 +++++++++++++++++ src/gui/UBKeyboardPalette.cpp | 12 +- 22 files changed, 2990 insertions(+), 6 deletions(-) create mode 100644 resources/images/virtual.keyboard/29/backspace.svg create mode 100644 resources/images/virtual.keyboard/29/capslock.svg create mode 100644 resources/images/virtual.keyboard/29/centre-active.svg create mode 100644 resources/images/virtual.keyboard/29/centre-passive.svg create mode 100644 resources/images/virtual.keyboard/29/left-active.svg create mode 100644 resources/images/virtual.keyboard/29/left-passive.svg create mode 100644 resources/images/virtual.keyboard/29/right-active.svg create mode 100644 resources/images/virtual.keyboard/29/right-passive.svg create mode 100644 resources/images/virtual.keyboard/29/shift.svg create mode 100644 resources/images/virtual.keyboard/29/tab.svg create mode 100644 resources/images/virtual.keyboard/41/backspace.svg create mode 100644 resources/images/virtual.keyboard/41/capslock.svg create mode 100644 resources/images/virtual.keyboard/41/centre-active.svg create mode 100644 resources/images/virtual.keyboard/41/centre-passive.svg create mode 100644 resources/images/virtual.keyboard/41/left-active.svg create mode 100644 resources/images/virtual.keyboard/41/left-passive.svg create mode 100644 resources/images/virtual.keyboard/41/right-active.svg create mode 100644 resources/images/virtual.keyboard/41/right-passive.svg create mode 100644 resources/images/virtual.keyboard/41/shift.svg create mode 100644 resources/images/virtual.keyboard/41/tab.svg diff --git a/resources/OpenBoard.qrc b/resources/OpenBoard.qrc index faafe96b..6f3624f7 100644 --- a/resources/OpenBoard.qrc +++ b/resources/OpenBoard.qrc @@ -413,6 +413,26 @@ images/virtual.keyboard/29/capslock.png images/virtual.keyboard/29/shift.png images/virtual.keyboard/29/tab.png + images/virtual.keyboard/29/backspace.svg + images/virtual.keyboard/29/capslock.svg + images/virtual.keyboard/29/shift.svg + images/virtual.keyboard/29/tab.svg + images/virtual.keyboard/29/centre-active.svg + images/virtual.keyboard/29/left-active.svg + images/virtual.keyboard/29/right-active.svg + images/virtual.keyboard/29/centre-passive.svg + images/virtual.keyboard/29/left-passive.svg + images/virtual.keyboard/29/right-passive.svg + images/virtual.keyboard/41/backspace.svg + images/virtual.keyboard/41/capslock.svg + images/virtual.keyboard/41/shift.svg + images/virtual.keyboard/41/tab.svg + images/virtual.keyboard/41/centre-active.svg + images/virtual.keyboard/41/left-active.svg + images/virtual.keyboard/41/right-active.svg + images/virtual.keyboard/41/centre-passive.svg + images/virtual.keyboard/41/left-passive.svg + images/virtual.keyboard/41/right-passive.svg images/toolPalette/cacheTool.png images/libpalette/FlashCategory.svg images/libpalette/FlashIcon.svg diff --git a/resources/images/virtual.keyboard/29/backspace.svg b/resources/images/virtual.keyboard/29/backspace.svg new file mode 100644 index 00000000..f082dd3a --- /dev/null +++ b/resources/images/virtual.keyboard/29/backspace.svg @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/virtual.keyboard/29/capslock.svg b/resources/images/virtual.keyboard/29/capslock.svg new file mode 100644 index 00000000..c611aa2a --- /dev/null +++ b/resources/images/virtual.keyboard/29/capslock.svg @@ -0,0 +1,134 @@ + + + + + + + + + + + + + + + + + + A + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/virtual.keyboard/29/centre-active.svg b/resources/images/virtual.keyboard/29/centre-active.svg new file mode 100644 index 00000000..2c865884 --- /dev/null +++ b/resources/images/virtual.keyboard/29/centre-active.svg @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/virtual.keyboard/29/centre-passive.svg b/resources/images/virtual.keyboard/29/centre-passive.svg new file mode 100644 index 00000000..155edaea --- /dev/null +++ b/resources/images/virtual.keyboard/29/centre-passive.svg @@ -0,0 +1,171 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/virtual.keyboard/29/left-active.svg b/resources/images/virtual.keyboard/29/left-active.svg new file mode 100644 index 00000000..6b2e87c4 --- /dev/null +++ b/resources/images/virtual.keyboard/29/left-active.svg @@ -0,0 +1,160 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/virtual.keyboard/29/left-passive.svg b/resources/images/virtual.keyboard/29/left-passive.svg new file mode 100644 index 00000000..71148950 --- /dev/null +++ b/resources/images/virtual.keyboard/29/left-passive.svg @@ -0,0 +1,171 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/virtual.keyboard/29/right-active.svg b/resources/images/virtual.keyboard/29/right-active.svg new file mode 100644 index 00000000..76b59c35 --- /dev/null +++ b/resources/images/virtual.keyboard/29/right-active.svg @@ -0,0 +1,160 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/virtual.keyboard/29/right-passive.svg b/resources/images/virtual.keyboard/29/right-passive.svg new file mode 100644 index 00000000..f9506252 --- /dev/null +++ b/resources/images/virtual.keyboard/29/right-passive.svg @@ -0,0 +1,171 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/virtual.keyboard/29/shift.svg b/resources/images/virtual.keyboard/29/shift.svg new file mode 100644 index 00000000..fa6cb6d7 --- /dev/null +++ b/resources/images/virtual.keyboard/29/shift.svg @@ -0,0 +1,122 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/virtual.keyboard/29/tab.svg b/resources/images/virtual.keyboard/29/tab.svg new file mode 100644 index 00000000..b070f3fd --- /dev/null +++ b/resources/images/virtual.keyboard/29/tab.svg @@ -0,0 +1,163 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/virtual.keyboard/41/backspace.svg b/resources/images/virtual.keyboard/41/backspace.svg new file mode 100644 index 00000000..f082dd3a --- /dev/null +++ b/resources/images/virtual.keyboard/41/backspace.svg @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/virtual.keyboard/41/capslock.svg b/resources/images/virtual.keyboard/41/capslock.svg new file mode 100644 index 00000000..c611aa2a --- /dev/null +++ b/resources/images/virtual.keyboard/41/capslock.svg @@ -0,0 +1,134 @@ + + + + + + + + + + + + + + + + + + A + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/virtual.keyboard/41/centre-active.svg b/resources/images/virtual.keyboard/41/centre-active.svg new file mode 100644 index 00000000..2c865884 --- /dev/null +++ b/resources/images/virtual.keyboard/41/centre-active.svg @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/virtual.keyboard/41/centre-passive.svg b/resources/images/virtual.keyboard/41/centre-passive.svg new file mode 100644 index 00000000..155edaea --- /dev/null +++ b/resources/images/virtual.keyboard/41/centre-passive.svg @@ -0,0 +1,171 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/virtual.keyboard/41/left-active.svg b/resources/images/virtual.keyboard/41/left-active.svg new file mode 100644 index 00000000..6b2e87c4 --- /dev/null +++ b/resources/images/virtual.keyboard/41/left-active.svg @@ -0,0 +1,160 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/virtual.keyboard/41/left-passive.svg b/resources/images/virtual.keyboard/41/left-passive.svg new file mode 100644 index 00000000..71148950 --- /dev/null +++ b/resources/images/virtual.keyboard/41/left-passive.svg @@ -0,0 +1,171 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/virtual.keyboard/41/right-active.svg b/resources/images/virtual.keyboard/41/right-active.svg new file mode 100644 index 00000000..76b59c35 --- /dev/null +++ b/resources/images/virtual.keyboard/41/right-active.svg @@ -0,0 +1,160 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/virtual.keyboard/41/right-passive.svg b/resources/images/virtual.keyboard/41/right-passive.svg new file mode 100644 index 00000000..f9506252 --- /dev/null +++ b/resources/images/virtual.keyboard/41/right-passive.svg @@ -0,0 +1,171 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/virtual.keyboard/41/shift.svg b/resources/images/virtual.keyboard/41/shift.svg new file mode 100644 index 00000000..fa6cb6d7 --- /dev/null +++ b/resources/images/virtual.keyboard/41/shift.svg @@ -0,0 +1,122 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/virtual.keyboard/41/tab.svg b/resources/images/virtual.keyboard/41/tab.svg new file mode 100644 index 00000000..b070f3fd --- /dev/null +++ b/resources/images/virtual.keyboard/41/tab.svg @@ -0,0 +1,163 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/src/gui/UBKeyboardPalette.cpp b/src/gui/UBKeyboardPalette.cpp index 3f21909f..25b525de 100644 --- a/src/gui/UBKeyboardPalette.cpp +++ b/src/gui/UBKeyboardPalette.cpp @@ -405,12 +405,12 @@ BTNImages::BTNImages(QString strHeight, int width, int height) m_width = width; m_height = height; - m_strLeftPassive = ":/images/virtual.keyboard/" + strHeight + "/left-passive.png"; - m_strCenterPassive = ":/images/virtual.keyboard/" + strHeight + "/centre-passive.png"; - m_strRightPassive = ":/images/virtual.keyboard/" + strHeight + "/right-passive.png"; - m_strLeftActive = ":/images/virtual.keyboard/" + strHeight + "/left-active.png"; - m_strCenterActive = ":/images/virtual.keyboard/" + strHeight + "/centre-active.png"; - m_strRightActive = ":/images/virtual.keyboard/" + strHeight + "/right-active.png"; + m_strLeftPassive = ":/images/virtual.keyboard/" + strHeight + "/left-passive.svg"; + m_strCenterPassive = ":/images/virtual.keyboard/" + strHeight + "/centre-passive.svg"; + m_strRightPassive = ":/images/virtual.keyboard/" + strHeight + "/right-passive.svg"; + m_strLeftActive = ":/images/virtual.keyboard/" + strHeight + "/left-active.svg"; + m_strCenterActive = ":/images/virtual.keyboard/" + strHeight + "/centre-active.svg"; + m_strRightActive = ":/images/virtual.keyboard/" + strHeight + "/right-active.svg"; m_btnLeftPassive = QImage(m_strLeftPassive); m_btnCenterPassive = QImage(m_strCenterPassive); From 0eab8cd019873aeb97ef2d1772ed75aa1e67cf96 Mon Sep 17 00:00:00 2001 From: thomas_lucky13 Date: Wed, 27 Jul 2022 13:26:51 +0400 Subject: [PATCH 09/12] images --- resources/OpenBoard.qrc | 31 + resources/forms/blackoutWidget.ui | 6 +- resources/forms/documents.ui | 4 +- resources/forms/mainWindow.ui | 2 +- resources/images/OpenBoard.svg | 76 +++ resources/images/asc.svg | 143 ++++ resources/images/bigOpenBoard.svg | 76 +++ resources/images/cache_circle.svg | 122 ++++ resources/images/cache_close.svg | 93 +++ resources/images/cache_open.svg | 93 +++ resources/images/cache_square.svg | 122 ++++ resources/images/currentDocument.svg | 93 +++ resources/images/defaultWidgetIcon.svg | 133 ++++ resources/images/desc.svg | 143 ++++ resources/images/down_arrow.svg | 62 ++ resources/images/download_close.svg | 90 +++ resources/images/download_open.svg | 89 +++ resources/images/folder.svg | 226 +++++++ resources/images/left_arrow.svg | 62 ++ resources/images/library_close.svg | 90 +++ resources/images/library_open.svg | 89 +++ resources/images/myFolder.svg | 226 +++++++ resources/images/navig_arrow.svg | 124 ++++ resources/images/pages_close.svg | 101 +++ resources/images/pages_open.svg | 97 +++ resources/images/right_arrow.svg | 62 ++ resources/images/tab_mask.svg | 64 ++ resources/images/trash-delete-document.svg | 502 ++++++++++++++ resources/images/trash-delete-folder.svg | 475 ++++++++++++++ resources/images/trash-document-page.svg | 405 ++++++++++++ resources/images/trash-document.svg | 504 +++++++++++++++ resources/images/trash-empty.svg | 271 ++++++++ resources/images/trash-folder.svg | 479 ++++++++++++++ resources/images/trash-my-documents.svg | 719 +++++++++++++++++++++ resources/images/trash.svg | 251 +++++++ resources/images/up_arrow.svg | 62 ++ resources/style.qss | 10 +- src/core/UBApplication.cpp | 2 +- src/document/UBDocumentController.cpp | 32 +- src/domain/UBGraphicsWidgetItem.cpp | 2 +- src/gui/UBCachePropertiesWidget.cpp | 8 +- src/gui/UBDockDownloadWidget.cpp | 4 +- src/gui/UBFeaturesWidget.cpp | 6 +- src/gui/UBPageNavigationWidget.cpp | 4 +- 44 files changed, 6214 insertions(+), 41 deletions(-) create mode 100644 resources/images/OpenBoard.svg create mode 100644 resources/images/asc.svg create mode 100644 resources/images/bigOpenBoard.svg create mode 100644 resources/images/cache_circle.svg create mode 100644 resources/images/cache_close.svg create mode 100644 resources/images/cache_open.svg create mode 100644 resources/images/cache_square.svg create mode 100644 resources/images/currentDocument.svg create mode 100644 resources/images/defaultWidgetIcon.svg create mode 100644 resources/images/desc.svg create mode 100644 resources/images/down_arrow.svg create mode 100644 resources/images/download_close.svg create mode 100644 resources/images/download_open.svg create mode 100644 resources/images/folder.svg create mode 100644 resources/images/left_arrow.svg create mode 100644 resources/images/library_close.svg create mode 100644 resources/images/library_open.svg create mode 100644 resources/images/myFolder.svg create mode 100644 resources/images/navig_arrow.svg create mode 100644 resources/images/pages_close.svg create mode 100644 resources/images/pages_open.svg create mode 100644 resources/images/right_arrow.svg create mode 100644 resources/images/tab_mask.svg create mode 100644 resources/images/trash-delete-document.svg create mode 100644 resources/images/trash-delete-folder.svg create mode 100644 resources/images/trash-document-page.svg create mode 100644 resources/images/trash-document.svg create mode 100644 resources/images/trash-empty.svg create mode 100644 resources/images/trash-folder.svg create mode 100644 resources/images/trash-my-documents.svg create mode 100644 resources/images/trash.svg create mode 100644 resources/images/up_arrow.svg diff --git a/resources/OpenBoard.qrc b/resources/OpenBoard.qrc index 6f3624f7..3524fe7d 100644 --- a/resources/OpenBoard.qrc +++ b/resources/OpenBoard.qrc @@ -515,5 +515,36 @@ images/trash-delete-folder.png images/trash-document.png images/trash-document-page.png + images/navig_arrow.svg + images/asc.svg + images/pages_close.svg + images/pages_open.svg + images/tab_mask.svg + images/bigOpenBoard.svg + images/folder.svg + images/cache_circle.svg + images/cache_close.svg + images/trash-delete-document.svg + images/cache_open.svg + images/trash-delete-folder.svg + images/cache_square.svg + images/trash-document-page.svg + images/trash-document.svg + images/trash-empty.svg + images/trash-folder.svg + images/left_arrow.svg + images/trash-my-documents.svg + images/trash.svg + images/library_close.svg + images/library_open.svg + images/currentDocument.svg + images/up_arrow.svg + images/defaultWidgetIcon.svg + images/desc.svg + images/down_arrow.svg + images/right_arrow.svg + images/OpenBoard.svg + images/download_close.svg + images/download_open.svg diff --git a/resources/forms/blackoutWidget.ui b/resources/forms/blackoutWidget.ui index 372d5c90..75cc129b 100644 --- a/resources/forms/blackoutWidget.ui +++ b/resources/forms/blackoutWidget.ui @@ -82,7 +82,7 @@ - background: url(:/images/bigOpenBoard.png); border: none; + background: url(:/images/bigOpenBoard.svg); border: none; @@ -188,8 +188,6 @@ - - - + diff --git a/resources/forms/documents.ui b/resources/forms/documents.ui index efec7a6a..29ee51ab 100644 --- a/resources/forms/documents.ui +++ b/resources/forms/documents.ui @@ -140,8 +140,8 @@ - :/images/asc.png - :/images/desc.png:/images/asc.png + :/images/asc.svg + :/images/desc.svg:/images/asc.svg true diff --git a/resources/forms/mainWindow.ui b/resources/forms/mainWindow.ui index a2380054..f4fdd0af 100644 --- a/resources/forms/mainWindow.ui +++ b/resources/forms/mainWindow.ui @@ -15,7 +15,7 @@ - :/images/OpenBoard.png:/images/OpenBoard.png + :/images/OpenBoard.svg:/images/OpenBoard.svg diff --git a/resources/images/OpenBoard.svg b/resources/images/OpenBoard.svg new file mode 100644 index 00000000..e222c278 --- /dev/null +++ b/resources/images/OpenBoard.svg @@ -0,0 +1,76 @@ + + + +image/svg+xml diff --git a/resources/images/asc.svg b/resources/images/asc.svg new file mode 100644 index 00000000..12bd5703 --- /dev/null +++ b/resources/images/asc.svg @@ -0,0 +1,143 @@ + + + + diff --git a/resources/images/bigOpenBoard.svg b/resources/images/bigOpenBoard.svg new file mode 100644 index 00000000..3b83d1b2 --- /dev/null +++ b/resources/images/bigOpenBoard.svg @@ -0,0 +1,76 @@ + + + +image/svg+xml diff --git a/resources/images/cache_circle.svg b/resources/images/cache_circle.svg new file mode 100644 index 00000000..739864fa --- /dev/null +++ b/resources/images/cache_circle.svg @@ -0,0 +1,122 @@ + + + + diff --git a/resources/images/cache_close.svg b/resources/images/cache_close.svg new file mode 100644 index 00000000..eea2af4d --- /dev/null +++ b/resources/images/cache_close.svg @@ -0,0 +1,93 @@ + + + + diff --git a/resources/images/cache_open.svg b/resources/images/cache_open.svg new file mode 100644 index 00000000..01334a35 --- /dev/null +++ b/resources/images/cache_open.svg @@ -0,0 +1,93 @@ + + + + diff --git a/resources/images/cache_square.svg b/resources/images/cache_square.svg new file mode 100644 index 00000000..8c296001 --- /dev/null +++ b/resources/images/cache_square.svg @@ -0,0 +1,122 @@ + + + + diff --git a/resources/images/currentDocument.svg b/resources/images/currentDocument.svg new file mode 100644 index 00000000..cd5b715d --- /dev/null +++ b/resources/images/currentDocument.svg @@ -0,0 +1,93 @@ + + + + diff --git a/resources/images/defaultWidgetIcon.svg b/resources/images/defaultWidgetIcon.svg new file mode 100644 index 00000000..3e272f01 --- /dev/null +++ b/resources/images/defaultWidgetIcon.svg @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/desc.svg b/resources/images/desc.svg new file mode 100644 index 00000000..3adaaedf --- /dev/null +++ b/resources/images/desc.svg @@ -0,0 +1,143 @@ + + + + diff --git a/resources/images/down_arrow.svg b/resources/images/down_arrow.svg new file mode 100644 index 00000000..8f45a3af --- /dev/null +++ b/resources/images/down_arrow.svg @@ -0,0 +1,62 @@ + + + + diff --git a/resources/images/download_close.svg b/resources/images/download_close.svg new file mode 100644 index 00000000..65827edf --- /dev/null +++ b/resources/images/download_close.svg @@ -0,0 +1,90 @@ + + + + diff --git a/resources/images/download_open.svg b/resources/images/download_open.svg new file mode 100644 index 00000000..379d5289 --- /dev/null +++ b/resources/images/download_open.svg @@ -0,0 +1,89 @@ + + + + diff --git a/resources/images/folder.svg b/resources/images/folder.svg new file mode 100644 index 00000000..cbfa3721 --- /dev/null +++ b/resources/images/folder.svg @@ -0,0 +1,226 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/left_arrow.svg b/resources/images/left_arrow.svg new file mode 100644 index 00000000..818e00c7 --- /dev/null +++ b/resources/images/left_arrow.svg @@ -0,0 +1,62 @@ + + + + diff --git a/resources/images/library_close.svg b/resources/images/library_close.svg new file mode 100644 index 00000000..9c982d33 --- /dev/null +++ b/resources/images/library_close.svg @@ -0,0 +1,90 @@ + + + + diff --git a/resources/images/library_open.svg b/resources/images/library_open.svg new file mode 100644 index 00000000..118c4476 --- /dev/null +++ b/resources/images/library_open.svg @@ -0,0 +1,89 @@ + + + + diff --git a/resources/images/myFolder.svg b/resources/images/myFolder.svg new file mode 100644 index 00000000..cbfa3721 --- /dev/null +++ b/resources/images/myFolder.svg @@ -0,0 +1,226 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/navig_arrow.svg b/resources/images/navig_arrow.svg new file mode 100644 index 00000000..f3a3383a --- /dev/null +++ b/resources/images/navig_arrow.svg @@ -0,0 +1,124 @@ + + + + diff --git a/resources/images/pages_close.svg b/resources/images/pages_close.svg new file mode 100644 index 00000000..8cf4b748 --- /dev/null +++ b/resources/images/pages_close.svg @@ -0,0 +1,101 @@ + + + + diff --git a/resources/images/pages_open.svg b/resources/images/pages_open.svg new file mode 100644 index 00000000..076f9521 --- /dev/null +++ b/resources/images/pages_open.svg @@ -0,0 +1,97 @@ + + + + diff --git a/resources/images/right_arrow.svg b/resources/images/right_arrow.svg new file mode 100644 index 00000000..f66ea2ef --- /dev/null +++ b/resources/images/right_arrow.svg @@ -0,0 +1,62 @@ + + + + diff --git a/resources/images/tab_mask.svg b/resources/images/tab_mask.svg new file mode 100644 index 00000000..b9a37f2c --- /dev/null +++ b/resources/images/tab_mask.svg @@ -0,0 +1,64 @@ + + + + diff --git a/resources/images/trash-delete-document.svg b/resources/images/trash-delete-document.svg new file mode 100644 index 00000000..88753419 --- /dev/null +++ b/resources/images/trash-delete-document.svg @@ -0,0 +1,502 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/trash-delete-folder.svg b/resources/images/trash-delete-folder.svg new file mode 100644 index 00000000..c8c8cf31 --- /dev/null +++ b/resources/images/trash-delete-folder.svg @@ -0,0 +1,475 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/trash-document-page.svg b/resources/images/trash-document-page.svg new file mode 100644 index 00000000..54a44a68 --- /dev/null +++ b/resources/images/trash-document-page.svg @@ -0,0 +1,405 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/trash-document.svg b/resources/images/trash-document.svg new file mode 100644 index 00000000..e61b29be --- /dev/null +++ b/resources/images/trash-document.svg @@ -0,0 +1,504 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/trash-empty.svg b/resources/images/trash-empty.svg new file mode 100644 index 00000000..9b20f012 --- /dev/null +++ b/resources/images/trash-empty.svg @@ -0,0 +1,271 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/trash-folder.svg b/resources/images/trash-folder.svg new file mode 100644 index 00000000..d7536637 --- /dev/null +++ b/resources/images/trash-folder.svg @@ -0,0 +1,479 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/trash-my-documents.svg b/resources/images/trash-my-documents.svg new file mode 100644 index 00000000..d15a8e3b --- /dev/null +++ b/resources/images/trash-my-documents.svg @@ -0,0 +1,719 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/trash.svg b/resources/images/trash.svg new file mode 100644 index 00000000..17554256 --- /dev/null +++ b/resources/images/trash.svg @@ -0,0 +1,251 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/up_arrow.svg b/resources/images/up_arrow.svg new file mode 100644 index 00000000..587d85f7 --- /dev/null +++ b/resources/images/up_arrow.svg @@ -0,0 +1,62 @@ + + + + diff --git a/resources/style.qss b/resources/style.qss index a877c11b..3987d479 100644 --- a/resources/style.qss +++ b/resources/style.qss @@ -97,7 +97,7 @@ QComboBox#DockPaletteWidgetComboBox:drop-down QComboBox#DockPaletteWidgetComboBox::down-arrow { - image:url(:/images/down_arrow.png); + image:url(:/images/down_arrow.svg); background:#BBBBBB; border: 2px solid #999999; height:16px; @@ -145,7 +145,7 @@ QScrollBar::handle:vertical QScrollBar::add-line:vertical { - image:url(:/images/down_arrow.png); + image:url(:/images/down_arrow.svg); height:16px; background:#BBBBBB; border:2px solid #999999; @@ -157,7 +157,7 @@ QScrollBar::add-line:vertical QScrollBar::sub-line:vertical { - image:url(:/images/up_arrow.png); + image:url(:/images/up_arrow.svg); height:16px; background:#BBBBBB; border:2px solid #999999; @@ -188,7 +188,7 @@ QScrollBar::handle:horizontal QScrollBar::add-line:horizontal { - image:url(:/images/right_arrow.png); + image:url(:/images/right_arrow.svg); width:16px; background:#BBBBBB; border:2px solid #999999; @@ -200,7 +200,7 @@ QScrollBar::add-line:horizontal QScrollBar::sub-line:horizontal { - image:url(:/images/left_arrow.png); + image:url(:/images/left_arrow.svg); width:16px; background:#BBBBBB; border:2px solid #999999; diff --git a/src/core/UBApplication.cpp b/src/core/UBApplication.cpp index a2c1c7cb..089448bd 100644 --- a/src/core/UBApplication.cpp +++ b/src/core/UBApplication.cpp @@ -132,7 +132,7 @@ UBApplication::UBApplication(const QString &id, int &argc, char **argv) : Single updateProtoActionsState(); #ifndef Q_OS_OSX - setWindowIcon(QIcon(":/images/OpenBoard.png")); + setWindowIcon(QIcon(":/images/OpenBoard.svg")); #endif setStyle("fusion"); diff --git a/src/document/UBDocumentController.cpp b/src/document/UBDocumentController.cpp index 1645bf0b..c049c95f 100644 --- a/src/document/UBDocumentController.cpp +++ b/src/document/UBDocumentController.cpp @@ -499,17 +499,17 @@ QVariant UBDocumentTreeModel::data(const QModelIndex &index, int role) const switch (role) { case (Qt::DecorationRole) : if (mCurrentNode && mCurrentNode == dataNode) { - return QIcon(":images/currentDocument.png"); + return QIcon(":images/currentDocument.svg"); } else { if (index == trashIndex()) { - return QIcon(":images/trash.png"); + return QIcon(":images/trash.svg"); } else if (isConstant(index)) { return QIcon(":images/libpalette/ApplicationsCategory.svg"); } switch (static_cast(dataNode->nodeType())) { case UBDocumentTreeNode::Catalog : - return QIcon(":images/folder.png"); + return QIcon(":images/folder.svg"); case UBDocumentTreeNode::Document : return QIcon(":images/toolbar/board.png"); } @@ -3521,72 +3521,72 @@ void UBDocumentController::updateActions() case MoveToTrash : if (mSelectionType == Folder) { - mMainWindow->actionDelete->setIcon(QIcon(":/images/trash-folder.png")); + mMainWindow->actionDelete->setIcon(QIcon(":/images/trash-folder.svg")); mMainWindow->actionDelete->setText(tr("Delete")); } else if (mSelectionType == Document) { - mMainWindow->actionDelete->setIcon(QIcon(":/images/trash-document.png")); + mMainWindow->actionDelete->setIcon(QIcon(":/images/trash-document.svg")); mMainWindow->actionDelete->setText(tr("Trash")); } else if (mSelectionType == Page) { - mMainWindow->actionDelete->setIcon(QIcon(":/images/trash-document-page.png")); + mMainWindow->actionDelete->setIcon(QIcon(":/images/trash-document-page.svg")); mMainWindow->actionDelete->setText(tr("Trash")); } else {//can happen ? - mMainWindow->actionDelete->setIcon(QIcon(":/images/trash.png")); + mMainWindow->actionDelete->setIcon(QIcon(":/images/trash.svg")); mMainWindow->actionDelete->setText(tr("Trash")); } break; case DeletePage : - mMainWindow->actionDelete->setIcon(QIcon(":/images/trash-document-page.png")); + mMainWindow->actionDelete->setIcon(QIcon(":/images/trash-document-page.svg")); mMainWindow->actionDelete->setText(tr("Trash")); break; case CompleteDelete : if (mSelectionType == Folder) { - mMainWindow->actionDelete->setIcon(QIcon(":/images/trash-delete-folder.png")); + mMainWindow->actionDelete->setIcon(QIcon(":/images/trash-delete-folder.svg")); mMainWindow->actionDelete->setText(tr("Delete")); } else { - mMainWindow->actionDelete->setIcon(QIcon(":/images/trash-delete-document.png")); + mMainWindow->actionDelete->setIcon(QIcon(":/images/trash-delete-document.svg")); mMainWindow->actionDelete->setText(tr("Delete")); } break; case EmptyFolder : if (firstSelectedTreeIndex() == docModel->myDocumentsIndex()) { - mMainWindow->actionDelete->setIcon(QIcon(":/images/trash-my-documents.png")); + mMainWindow->actionDelete->setIcon(QIcon(":/images/trash-my-documents.svg")); mMainWindow->actionDelete->setText(tr("Empty")); } else { - mMainWindow->actionDelete->setIcon(QIcon(":/images/trash-folder.png")); + mMainWindow->actionDelete->setIcon(QIcon(":/images/trash-folder.svg")); mMainWindow->actionDelete->setText(tr("Delete")); } break; case EmptyTrash : - mMainWindow->actionDelete->setIcon(QIcon(":/images/trash-empty.png")); + mMainWindow->actionDelete->setIcon(QIcon(":/images/trash-empty.svg")); mMainWindow->actionDelete->setText(tr("Empty")); break; case NoDeletion : default: if (mSelectionType == Folder) { - mMainWindow->actionDelete->setIcon(QIcon(":/images/trash-delete-folder.png")); + mMainWindow->actionDelete->setIcon(QIcon(":/images/trash-delete-folder.svg")); mMainWindow->actionDelete->setText(tr("Delete")); } else if (mSelectionType == Document) { - mMainWindow->actionDelete->setIcon(QIcon(":/images/trash-delete-document.png")); + mMainWindow->actionDelete->setIcon(QIcon(":/images/trash-delete-document.svg")); mMainWindow->actionDelete->setText(tr("Delete")); } else if (mSelectionType == Page) { - mMainWindow->actionDelete->setIcon(QIcon(":/images/trash-document-page.png")); + mMainWindow->actionDelete->setIcon(QIcon(":/images/trash-document-page.svg")); mMainWindow->actionDelete->setText(tr("Delete")); } break; diff --git a/src/domain/UBGraphicsWidgetItem.cpp b/src/domain/UBGraphicsWidgetItem.cpp index 90f4865b..e610eeab 100644 --- a/src/domain/UBGraphicsWidgetItem.cpp +++ b/src/domain/UBGraphicsWidgetItem.cpp @@ -471,7 +471,7 @@ QString UBGraphicsWidgetItem::iconFilePath(const QUrl& pUrl) /* default */ if (file.length() == 0) { - file = QString(":/images/defaultWidgetIcon.png"); + file = QString(":/images/defaultWidgetIcon.svg"); } return file; } diff --git a/src/gui/UBCachePropertiesWidget.cpp b/src/gui/UBCachePropertiesWidget.cpp index da06b931..4032ffc6 100644 --- a/src/gui/UBCachePropertiesWidget.cpp +++ b/src/gui/UBCachePropertiesWidget.cpp @@ -69,8 +69,8 @@ UBCachePropertiesWidget::UBCachePropertiesWidget(QWidget *parent, const char *na mName = "CachePropWidget"; mVisibleState = false; - mIconToLeft = QPixmap(":images/cache_open.png"); - mIconToRight = QPixmap(":images/cache_close.png"); + mIconToLeft = QPixmap(":images/cache_open.svg"); + mIconToRight = QPixmap(":images/cache_close.svg"); setContentsMargins(10, 10, 10, 10); // Build the UI @@ -105,11 +105,11 @@ UBCachePropertiesWidget::UBCachePropertiesWidget(QWidget *parent, const char *na mpShapeLayout = new QHBoxLayout(); mpShapeLabel = new QLabel(tr("Shape:"), mpProperties); mpSquareButton = new QPushButton(mpProperties); - mpSquareButton->setIcon(QIcon(":images/cache_square.png")); + mpSquareButton->setIcon(QIcon(":images/cache_square.svg")); mpSquareButton->setObjectName("DockPaletteWidgetButton"); mpSquareButton->setCheckable(true); mpCircleButton = new QPushButton(mpProperties); - mpCircleButton->setIcon(QIcon(":images/cache_circle.png")); + mpCircleButton->setIcon(QIcon(":images/cache_circle.svg")); mpCircleButton->setObjectName("DockPaletteWidgetButton"); mpCircleButton->setCheckable(true); mpShapeLayout->addWidget(mpShapeLabel, 0); diff --git a/src/gui/UBDockDownloadWidget.cpp b/src/gui/UBDockDownloadWidget.cpp index 60c03f74..264a7d5b 100644 --- a/src/gui/UBDockDownloadWidget.cpp +++ b/src/gui/UBDockDownloadWidget.cpp @@ -43,8 +43,8 @@ UBDockDownloadWidget::UBDockDownloadWidget(QWidget *parent, const char *name):UB SET_STYLE_SHEET(); - mIconToLeft = QPixmap(":images/download_open.png"); - mIconToRight = QPixmap(":images/download_close.png"); + mIconToLeft = QPixmap(":images/download_open.svg"); + mIconToRight = QPixmap(":images/download_close.svg"); mpLayout = new QVBoxLayout(this); setLayout(mpLayout); diff --git a/src/gui/UBFeaturesWidget.cpp b/src/gui/UBFeaturesWidget.cpp index b3d84807..069e4b18 100644 --- a/src/gui/UBFeaturesWidget.cpp +++ b/src/gui/UBFeaturesWidget.cpp @@ -58,8 +58,8 @@ UBFeaturesWidget::UBFeaturesWidget(QWidget *parent, const char *name) SET_STYLE_SHEET(); - mIconToLeft = QPixmap(":images/library_open.png"); - mIconToRight = QPixmap(":images/library_close.png"); + mIconToLeft = QPixmap(":images/library_open.svg"); + mIconToRight = QPixmap(":images/library_close.svg"); setAcceptDrops(true); //Main UBFeature functionality @@ -1466,7 +1466,7 @@ QString UBFeaturesItemDelegate::displayText ( const QVariant & value, const Q UBFeaturesPathItemDelegate::UBFeaturesPathItemDelegate(QObject *parent) : QStyledItemDelegate(parent) { - arrowPixmap = new QPixmap(":images/navig_arrow.png"); + arrowPixmap = new QPixmap(":images/navig_arrow.svg"); } QString UBFeaturesPathItemDelegate::displayText ( const QVariant & value, const QLocale & locale ) const diff --git a/src/gui/UBPageNavigationWidget.cpp b/src/gui/UBPageNavigationWidget.cpp index 32bd233b..df156166 100644 --- a/src/gui/UBPageNavigationWidget.cpp +++ b/src/gui/UBPageNavigationWidget.cpp @@ -53,8 +53,8 @@ UBPageNavigationWidget::UBPageNavigationWidget(QWidget *parent, const char *name SET_STYLE_SHEET(); - mIconToRight = QPixmap(":images/pages_open.png"); - mIconToLeft = QPixmap(":images/pages_close.png"); + mIconToRight = QPixmap(":images/pages_open.svg"); + mIconToLeft = QPixmap(":images/pages_close.svg"); // Build the gui mLayout = new QVBoxLayout(this); From 1cc23f183f2ad0061939250e3e6a2640ddc56001 Mon Sep 17 00:00:00 2001 From: thomas_lucky13 Date: Wed, 27 Jul 2022 14:59:53 +0400 Subject: [PATCH 10/12] extraPalette libPalette changes --- resources/images/extraPalette/compass.svg | 14 +- resources/images/extraPalette/ruler.svg | 37 +- .../libpalette/ApplicationsCategory.svg | 595 ++++++++++++++---- .../images/libpalette/WebSearchCategory.svg | 542 ++++++++++------ 4 files changed, 851 insertions(+), 337 deletions(-) diff --git a/resources/images/extraPalette/compass.svg b/resources/images/extraPalette/compass.svg index 3169eafb..e0aa8e7b 100644 --- a/resources/images/extraPalette/compass.svg +++ b/resources/images/extraPalette/compass.svg @@ -5,7 +5,7 @@ viewBox="0 0 42 42" version="1.1" id="svg38508" - inkscape:version="1.2 (1:1.2+202205241504+da316b6974)" + inkscape:version="1.2 (dc2aedaf03, 2022-05-15)" sodipodi:docname="compass.svg" inkscape:export-filename="../../../../OpenBoard/resources/images/stylusPalette/arrow_svg.png" inkscape:export-xdpi="96" @@ -33,11 +33,11 @@ fit-margin-right="0" fit-margin-bottom="0" units="px" - inkscape:zoom="11.313709" - inkscape:cx="9.5017473" - inkscape:cy="25.455844" - inkscape:window-width="1920" - inkscape:window-height="1007" + inkscape:zoom="5.6568545" + inkscape:cx="-4.7729706" + inkscape:cy="27.842328" + inkscape:window-width="1366" + inkscape:window-height="695" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" @@ -131,7 +131,7 @@ transform="translate(-152.84748,-194.2822)"> + inkscape:guide-bbox="true" + inkscape:showpageshadow="0" + inkscape:deskcolor="#d1d1d1"> + id="guide51709" + inkscape:locked="false" /> + id="guide55391" + inkscape:locked="false" /> @@ -219,6 +223,16 @@ y="229.2822" ry="3.1640657e-06" inkscape:label="division" /> + - diff --git a/resources/images/libpalette/ApplicationsCategory.svg b/resources/images/libpalette/ApplicationsCategory.svg index 00b1b922..90ce90aa 100644 --- a/resources/images/libpalette/ApplicationsCategory.svg +++ b/resources/images/libpalette/ApplicationsCategory.svg @@ -1,132 +1,463 @@ - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/libpalette/WebSearchCategory.svg b/resources/images/libpalette/WebSearchCategory.svg index fb68bb93..dc559111 100644 --- a/resources/images/libpalette/WebSearchCategory.svg +++ b/resources/images/libpalette/WebSearchCategory.svg @@ -1,182 +1,360 @@ - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 5530f917448e5bfda626c9d072e2c3b3abc09519 Mon Sep 17 00:00:00 2001 From: thomas_lucky13 Date: Wed, 27 Jul 2022 17:37:52 +0400 Subject: [PATCH 11/12] toolbar --- resources/OpenBoard.qrc | 82 +++ resources/forms/mainWindow.ui | 140 ++-- resources/images/toolbar/addBookmark.svg | 175 +++++ .../toolbar/addInteractiveToLibrary.svg | 221 +++++++ resources/images/toolbar/addToDocument.svg | 120 ++++ resources/images/toolbar/addToLibrary.svg | 184 ++++++ resources/images/toolbar/addToPage.svg | 284 ++++++++ resources/images/toolbar/addToWorkingDoc.svg | 250 ++++++++ resources/images/toolbar/addToolToLibrary.svg | 275 ++++++++ resources/images/toolbar/background.svg | 141 ++++ resources/images/toolbar/board.svg | 311 +++++++++ resources/images/toolbar/bookmarks.svg | 156 +++++ resources/images/toolbar/captureArea.svg | 227 +++++++ resources/images/toolbar/captureScreen.svg | 215 +++++++ resources/images/toolbar/captureWindow.svg | 267 ++++++++ resources/images/toolbar/clearPage.svg | 167 +++++ resources/images/toolbar/color.svg | 145 +++++ resources/images/toolbar/copy.svg | 307 +++++++++ resources/images/toolbar/cut.svg | 162 +++++ resources/images/toolbar/deleteDocument.svg | 173 +++++ resources/images/toolbar/deleteFolder.svg | 271 ++++++++ resources/images/toolbar/display.svg | 255 ++++++++ resources/images/toolbar/documents.svg | 294 +++++++++ resources/images/toolbar/duplicate.svg | 243 +++++++ resources/images/toolbar/eraserTool.svg | 81 +++ resources/images/toolbar/export.svg | 173 +++++ resources/images/toolbar/extraTool.svg | 559 ++++++++++++++++ resources/images/toolbar/eyeClosed.svg | 159 +++++ resources/images/toolbar/eyeOpened.svg | 166 +++++ resources/images/toolbar/group.svg | 157 +++++ resources/images/toolbar/hide.svg | 178 +++++ resources/images/toolbar/home.svg | 190 ++++++ resources/images/toolbar/import.svg | 164 +++++ resources/images/toolbar/largeEraser.svg | 67 ++ resources/images/toolbar/largePen.svg | 67 ++ resources/images/toolbar/library.svg | 180 ++++++ resources/images/toolbar/lineTool.svg | 81 +++ resources/images/toolbar/mediumEraser.svg | 67 ++ resources/images/toolbar/mediumPen.svg | 67 ++ resources/images/toolbar/menu.svg | 116 ++++ resources/images/toolbar/mic.svg | 461 +++++++++++++ resources/images/toolbar/micOff.svg | 517 +++++++++++++++ resources/images/toolbar/newDocument.svg | 147 +++++ resources/images/toolbar/newFolder.svg | 235 +++++++ resources/images/toolbar/newPage.svg | 181 ++++++ resources/images/toolbar/next.svg | 93 +++ resources/images/toolbar/nextPageOn.svg | 183 ++++++ resources/images/toolbar/open.svg | 490 ++++++++++++++ resources/images/toolbar/pageSize.svg | 280 ++++++++ resources/images/toolbar/paste.svg | 307 +++++++++ resources/images/toolbar/pause.svg | 107 ++++ resources/images/toolbar/pdf.svg | 122 ++++ resources/images/toolbar/plusBlack.svg | 63 ++ resources/images/toolbar/plusBlackOn.svg | 96 +++ resources/images/toolbar/previous.svg | 93 +++ resources/images/toolbar/previousPageOn.svg | 183 ++++++ resources/images/toolbar/print.svg | 606 ++++++++++++++++++ resources/images/toolbar/profile.svg | 111 ++++ resources/images/toolbar/proto.svg | 112 ++++ resources/images/toolbar/quit.svg | 116 ++++ resources/images/toolbar/quitOn.svg | 116 ++++ resources/images/toolbar/record.svg | 128 ++++ resources/images/toolbar/redo.svg | 90 +++ resources/images/toolbar/redoOn.svg | 90 +++ resources/images/toolbar/reload.svg | 126 ++++ resources/images/toolbar/remove.svg | 89 +++ resources/images/toolbar/removeBackground.svg | 188 ++++++ resources/images/toolbar/rename.svg | 275 ++++++++ resources/images/toolbar/setBackground.svg | 170 +++++ resources/images/toolbar/settings.svg | 143 +++++ resources/images/toolbar/smallEraser.svg | 67 ++ resources/images/toolbar/smallPen.svg | 67 ++ resources/images/toolbar/smallerText.svg | 183 ++++++ resources/images/toolbar/softwareUpdate.svg | 329 ++++++++++ resources/images/toolbar/stop.svg | 81 +++ resources/images/toolbar/stylus.svg | 385 +++++++++++ resources/images/toolbar/stylusTab.svg | 385 +++++++++++ resources/images/toolbar/tools.svg | 177 +++++ resources/images/toolbar/tutorial.svg | 140 ++++ resources/images/toolbar/undo.svg | 90 +++ resources/images/toolbar/undoOn.svg | 90 +++ resources/images/toolbar/ungroup.svg | 210 ++++++ resources/images/toolbar/updates.svg | 136 ++++ resources/images/toolbar/web.svg | 321 ++++++++++ resources/images/toolbar/webTrap.svg | 106 +++ resources/images/toolbar/webTrapEnabled.svg | 120 ++++ resources/images/toolbar/webUpload.svg | 355 ++++++++++ resources/images/toolbar/window.svg | 465 ++++++++++++++ src/core/UBApplication.cpp | 2 +- src/desktop/UBDesktopPalette.cpp | 12 +- src/document/UBDocumentController.cpp | 2 +- .../UBGraphicsGroupContainerItemDelegate.cpp | 8 +- src/domain/UBGraphicsItemDelegate.cpp | 12 +- src/domain/UBGraphicsWidgetItemDelegate.cpp | 8 +- src/web/browser/WBTabWidget.cpp | 2 +- 95 files changed, 17115 insertions(+), 93 deletions(-) create mode 100644 resources/images/toolbar/addBookmark.svg create mode 100644 resources/images/toolbar/addInteractiveToLibrary.svg create mode 100644 resources/images/toolbar/addToDocument.svg create mode 100644 resources/images/toolbar/addToLibrary.svg create mode 100644 resources/images/toolbar/addToPage.svg create mode 100644 resources/images/toolbar/addToWorkingDoc.svg create mode 100644 resources/images/toolbar/addToolToLibrary.svg create mode 100644 resources/images/toolbar/background.svg create mode 100644 resources/images/toolbar/board.svg create mode 100644 resources/images/toolbar/bookmarks.svg create mode 100644 resources/images/toolbar/captureArea.svg create mode 100644 resources/images/toolbar/captureScreen.svg create mode 100644 resources/images/toolbar/captureWindow.svg create mode 100644 resources/images/toolbar/clearPage.svg create mode 100644 resources/images/toolbar/color.svg create mode 100644 resources/images/toolbar/copy.svg create mode 100644 resources/images/toolbar/cut.svg create mode 100644 resources/images/toolbar/deleteDocument.svg create mode 100644 resources/images/toolbar/deleteFolder.svg create mode 100644 resources/images/toolbar/display.svg create mode 100644 resources/images/toolbar/documents.svg create mode 100644 resources/images/toolbar/duplicate.svg create mode 100644 resources/images/toolbar/eraserTool.svg create mode 100644 resources/images/toolbar/export.svg create mode 100644 resources/images/toolbar/extraTool.svg create mode 100644 resources/images/toolbar/eyeClosed.svg create mode 100644 resources/images/toolbar/eyeOpened.svg create mode 100644 resources/images/toolbar/group.svg create mode 100644 resources/images/toolbar/hide.svg create mode 100644 resources/images/toolbar/home.svg create mode 100644 resources/images/toolbar/import.svg create mode 100644 resources/images/toolbar/largeEraser.svg create mode 100644 resources/images/toolbar/largePen.svg create mode 100644 resources/images/toolbar/library.svg create mode 100644 resources/images/toolbar/lineTool.svg create mode 100644 resources/images/toolbar/mediumEraser.svg create mode 100644 resources/images/toolbar/mediumPen.svg create mode 100644 resources/images/toolbar/menu.svg create mode 100644 resources/images/toolbar/mic.svg create mode 100644 resources/images/toolbar/micOff.svg create mode 100644 resources/images/toolbar/newDocument.svg create mode 100644 resources/images/toolbar/newFolder.svg create mode 100644 resources/images/toolbar/newPage.svg create mode 100644 resources/images/toolbar/next.svg create mode 100644 resources/images/toolbar/nextPageOn.svg create mode 100644 resources/images/toolbar/open.svg create mode 100644 resources/images/toolbar/pageSize.svg create mode 100644 resources/images/toolbar/paste.svg create mode 100644 resources/images/toolbar/pause.svg create mode 100644 resources/images/toolbar/pdf.svg create mode 100644 resources/images/toolbar/plusBlack.svg create mode 100644 resources/images/toolbar/plusBlackOn.svg create mode 100644 resources/images/toolbar/previous.svg create mode 100644 resources/images/toolbar/previousPageOn.svg create mode 100644 resources/images/toolbar/print.svg create mode 100644 resources/images/toolbar/profile.svg create mode 100644 resources/images/toolbar/proto.svg create mode 100644 resources/images/toolbar/quit.svg create mode 100644 resources/images/toolbar/quitOn.svg create mode 100644 resources/images/toolbar/record.svg create mode 100644 resources/images/toolbar/redo.svg create mode 100644 resources/images/toolbar/redoOn.svg create mode 100644 resources/images/toolbar/reload.svg create mode 100644 resources/images/toolbar/remove.svg create mode 100644 resources/images/toolbar/removeBackground.svg create mode 100644 resources/images/toolbar/rename.svg create mode 100644 resources/images/toolbar/setBackground.svg create mode 100644 resources/images/toolbar/settings.svg create mode 100644 resources/images/toolbar/smallEraser.svg create mode 100644 resources/images/toolbar/smallPen.svg create mode 100644 resources/images/toolbar/smallerText.svg create mode 100644 resources/images/toolbar/softwareUpdate.svg create mode 100644 resources/images/toolbar/stop.svg create mode 100644 resources/images/toolbar/stylus.svg create mode 100644 resources/images/toolbar/stylusTab.svg create mode 100644 resources/images/toolbar/tools.svg create mode 100644 resources/images/toolbar/tutorial.svg create mode 100644 resources/images/toolbar/undo.svg create mode 100644 resources/images/toolbar/undoOn.svg create mode 100644 resources/images/toolbar/ungroup.svg create mode 100644 resources/images/toolbar/updates.svg create mode 100644 resources/images/toolbar/web.svg create mode 100644 resources/images/toolbar/webTrap.svg create mode 100644 resources/images/toolbar/webTrapEnabled.svg create mode 100644 resources/images/toolbar/webUpload.svg create mode 100644 resources/images/toolbar/window.svg diff --git a/resources/OpenBoard.qrc b/resources/OpenBoard.qrc index 3524fe7d..647410d3 100644 --- a/resources/OpenBoard.qrc +++ b/resources/OpenBoard.qrc @@ -546,5 +546,87 @@ images/OpenBoard.svg images/download_close.svg images/download_open.svg + images/toolbar/group.svg + images/toolbar/ungroup.svg + images/toolbar/window.svg + images/toolbar/plusBlack.svg + images/toolbar/plusBlackOn.svg + images/toolbar/quit.svg + images/toolbar/quitOn.svg + images/toolbar/background.svg + images/toolbar/documents.svg + images/toolbar/newPage.svg + images/toolbar/next.svg + images/toolbar/nextPageOn.svg + images/toolbar/previous.svg + images/toolbar/previousPageOn.svg + images/toolbar/redo.svg + images/toolbar/redoOn.svg + images/toolbar/stylus.svg + images/toolbar/undo.svg + images/toolbar/undoOn.svg + images/toolbar/smallPen.svg + images/toolbar/mediumPen.svg + images/toolbar/largePen.svg + images/toolbar/color.svg + images/toolbar/smallEraser.svg + images/toolbar/mediumEraser.svg + images/toolbar/largeEraser.svg + images/toolbar/web.svg + images/toolbar/board.svg + images/toolbar/home.svg + images/toolbar/profile.svg + images/toolbar/library.svg + images/toolbar/clearPage.svg + images/toolbar/reload.svg + images/toolbar/addBookmark.svg + images/toolbar/bookmarks.svg + images/toolbar/settings.svg + images/toolbar/eyeClosed.svg + images/toolbar/eyeOpened.svg + images/toolbar/pdf.svg + images/toolbar/deleteDocument.svg + images/toolbar/deleteFolder.svg + images/toolbar/newDocument.svg + images/toolbar/newFolder.svg + images/toolbar/addToLibrary.svg + images/toolbar/addInteractiveToLibrary.svg + images/toolbar/addToolToLibrary.svg + images/toolbar/duplicate.svg + images/toolbar/export.svg + images/toolbar/import.svg + images/toolbar/setBackground.svg + images/toolbar/removeBackground.svg + images/toolbar/open.svg + images/toolbar/addToPage.svg + images/toolbar/menu.svg + images/toolbar/addToDocument.svg + images/toolbar/print.svg + images/toolbar/addToWorkingDoc.svg + images/toolbar/rename.svg + images/toolbar/captureArea.svg + images/toolbar/captureScreen.svg + images/toolbar/captureWindow.svg + images/toolbar/extraTool.svg + images/toolbar/webUpload.svg + images/toolbar/stop.svg + images/toolbar/pause.svg + images/toolbar/cut.svg + images/toolbar/copy.svg + images/toolbar/paste.svg + images/toolbar/proto.svg + images/toolbar/mic.svg + images/toolbar/micOff.svg + images/toolbar/remove.svg + images/toolbar/pageSize.svg + images/toolbar/eraserTool.svg + images/toolbar/lineTool.svg + images/toolbar/tools.svg + images/toolbar/stylusTab.svg + images/toolbar/display.svg + images/toolbar/hide.svg + images/toolbar/record.svg + images/toolbar/updates.svg + images/toolbar/tutorial.svg diff --git a/resources/forms/mainWindow.ui b/resources/forms/mainWindow.ui index f4fdd0af..c073fe2e 100644 --- a/resources/forms/mainWindow.ui +++ b/resources/forms/mainWindow.ui @@ -178,7 +178,7 @@ - :/images/toolbar/stylus.png:/images/toolbar/stylus.png + :/images/toolbar/stylus.svg:/images/toolbar/stylus.svg Stylus @@ -196,7 +196,7 @@ - :/images/toolbar/background.png:/images/toolbar/background.png + :/images/toolbar/background.svg:/images/toolbar/background.svg Backgrounds @@ -208,7 +208,7 @@ - :/images/toolbar/undoOn.png:/images/toolbar/undoOn.png + :/images/toolbar/undoOn.svg:/images/toolbar/undoOn.svg Undo @@ -220,7 +220,7 @@ - :/images/toolbar/redoOn.png:/images/toolbar/redoOn.png + :/images/toolbar/redoOn.svg:/images/toolbar/redoOn.svg Redo @@ -232,7 +232,7 @@ - :/images/toolbar/previousPageOn.png:/images/toolbar/previousPageOn.png + :/images/toolbar/nextPageOn.svg:/images/toolbar/nextPageOn.svg Previous @@ -247,7 +247,7 @@ - :/images/toolbar/nextPageOn.png:/images/toolbar/nextPageOn.png + :/images/toolbar/previousPageOn.svg:/images/toolbar/previousPageOn.svg Next @@ -265,7 +265,7 @@ - :/images/toolbar/documents.png:/images/toolbar/documents.png + :/images/toolbar/documents.svg:/images/toolbar/documents.svg Documents @@ -280,7 +280,7 @@ - :/images/toolbar/web.png:/images/toolbar/web.png + :/images/toolbar/web.svg:/images/toolbar/web.svg Web @@ -301,7 +301,7 @@ - :/images/toolbar/smallPen.png:/images/toolbar/smallPen.png + :/images/toolbar/smallPen.svg:/images/toolbar/smallPen.svg Line @@ -316,7 +316,7 @@ - :/images/toolbar/mediumPen.png:/images/toolbar/mediumPen.png + :/images/toolbar/mediumPen.svg:/images/toolbar/mediumPen.svg Line @@ -331,7 +331,7 @@ - :/images/toolbar/largePen.png:/images/toolbar/largePen.png + :/images/toolbar/largePen.svg:/images/toolbar/largePen.svg Line @@ -343,7 +343,7 @@ - :/images/toolbar/quitOn.png:/images/toolbar/quitOn.png + :/images/toolbar/quitOn.svg:/images/toolbar/quitOn.svg Quit @@ -364,7 +364,7 @@ - :/images/toolbar/smallEraser.png:/images/toolbar/smallEraser.png + :/images/toolbar/smallEraser.svg:/images/toolbar/smallEraser.svg Eraser @@ -382,7 +382,7 @@ - :/images/toolbar/mediumEraser.png:/images/toolbar/mediumEraser.png + :/images/toolbar/mediumEraser.svg:/images/toolbar/mediumEraser.svg Eraser @@ -397,7 +397,7 @@ - :/images/toolbar/largeEraser.png:/images/toolbar/largeEraser.png + :/images/toolbar/largeEraser.svg:/images/toolbar/largeEraser.svg Eraser @@ -412,7 +412,7 @@ - :/images/toolbar/color.png:/images/toolbar/color.png + :/images/toolbar/color.svg:/images/toolbar/color.svg Color 1 @@ -427,7 +427,7 @@ - :/images/toolbar/color.png:/images/toolbar/color.png + :/images/toolbar/color.svg:/images/toolbar/color.svg Color 2 @@ -442,7 +442,7 @@ - :/images/toolbar/color.png:/images/toolbar/color.png + :/images/toolbar/color.svg:/images/toolbar/color.svg Color 3 @@ -457,7 +457,7 @@ - :/images/toolbar/color.png:/images/toolbar/color.png + :/images/toolbar/color.svg:/images/toolbar/color.svg Color 4 @@ -472,7 +472,7 @@ - :/images/toolbar/color.png:/images/toolbar/color.png + :/images/toolbar/color.svg:/images/toolbar/color.svg Color 5 @@ -484,7 +484,7 @@ - :/images/toolbar/previous.png:/images/toolbar/previous.png + :/images/toolbar/previous.svg:/images/toolbar/previous.svg Back @@ -499,7 +499,7 @@ - :/images/toolbar/next.png:/images/toolbar/next.png + :/images/toolbar/next.svg:/images/toolbar/next.svg Forward @@ -514,7 +514,7 @@ - :/images/toolbar/reload.png:/images/toolbar/reload.png + :/images/toolbar/reload.svg:/images/toolbar/reload.svg Reload @@ -526,7 +526,7 @@ - :/images/toolbar/home.png:/images/toolbar/home.png + :/images/toolbar/home.svg:/images/toolbar/home.svg Home @@ -538,7 +538,7 @@ - :/images/toolbar/bookmarks.png:/images/toolbar/bookmarks.png + :/images/toolbar/bookmarks.svg:/images/toolbar/bookmarks.svg Bookmarks @@ -550,7 +550,7 @@ - :/images/toolbar/addBookmark.png:/images/toolbar/addBookmark.png + :/images/toolbar/addBookmark.svg:/images/toolbar/addBookmark.svg Bookmark @@ -562,7 +562,7 @@ - :/images/toolbar/board.png:/images/toolbar/board.png + :/images/toolbar/board.svg:/images/toolbar/board.svg Board @@ -580,7 +580,7 @@ - :/images/toolbar/clearPage.png:/images/toolbar/clearPage.png + :/images/toolbar/clearPage.svg:/images/toolbar/clearPage.svg Erase @@ -592,7 +592,7 @@ - :/images/toolbar/settings.png:/images/toolbar/settings.png + :/images/toolbar/settings.svg:/images/toolbar/settings.svg Preferences @@ -607,7 +607,7 @@ - :/images/toolbar/library.png:/images/toolbar/library.png + :/images/toolbar/library.svg:/images/toolbar/library.svg Library @@ -622,7 +622,7 @@ - :/images/toolbar/menu.png:/images/toolbar/menu.png + :/images/toolbar/menu.svg:/images/toolbar/menu.svg OpenBoard @@ -634,7 +634,7 @@ - :/images/toolbar/display.png:/images/toolbar/display.png + :/images/toolbar/display.svg:/images/toolbar/display.svg Show Desktop @@ -649,7 +649,7 @@ - :/images/stylusPalette/zoomIn.png:/images/stylusPalette/zoomIn.png + :/images/stylusPalette/zoomIn.svg:/images/stylusPalette/zoomIn.svg Bigger @@ -664,7 +664,7 @@ - :/images/stylusPalette/zoomOut.png:/images/stylusPalette/zoomOut.png + :/images/stylusPalette/zoomOut.svg:/images/stylusPalette/zoomOut.svg Smaller @@ -679,7 +679,7 @@ - :/images/toolbar/newFolder.png:/images/toolbar/newFolder.png + :/images/toolbar/newFolder.svg:/images/toolbar/newFolder.svg New Folder @@ -691,7 +691,7 @@ - :/images/toolbar/newDocument.png:/images/toolbar/newDocument.png + :/images/toolbar/newDocument.svg:/images/toolbar/newDocument.svg New Document @@ -703,7 +703,7 @@ - :/images/toolbar/import.png:/images/toolbar/import.png + :/images/toolbar/import.svg:/images/toolbar/import.svg Import @@ -715,7 +715,7 @@ - :/images/toolbar/export.png:/images/toolbar/export.png + :/images/toolbar/export.svg:/images/toolbar/export.svg Export @@ -727,7 +727,7 @@ - :/images/toolbar/open.png:/images/toolbar/open.png + :/images/toolbar/open.svg:/images/toolbar/open.svg Open in Board @@ -742,7 +742,7 @@ - :/images/toolbar/duplicate.png:/images/toolbar/duplicate.png + :/images/toolbar/duplicate.svg:/images/toolbar/duplicate.svg Duplicate @@ -754,7 +754,7 @@ - :/images/toolbar/deleteDocument.png:/images/toolbar/deleteDocument.png + :/images/toolbar/deleteDocument.svg:/images/toolbar/deleteDocument.svg Delete @@ -769,7 +769,7 @@ - :/images/toolbar/addToWorkingDoc.png:/images/toolbar/addToWorkingDoc.png + :/images/toolbar/addToWorkingDoc.svg:/images/toolbar/addToWorkingDoc.svg Add to Working Document @@ -781,7 +781,7 @@ - :/images/toolbar/addToPage.png:/images/toolbar/addToPage.png + :/images/toolbar/addToPage.svg:/images/toolbar/addToPage.svg Add @@ -793,7 +793,7 @@ - :/images/toolbar/rename.png:/images/toolbar/rename.png + :/images/toolbar/rename.svg:/images/toolbar/rename.svg Rename @@ -808,7 +808,7 @@ - :/images/toolbar/tools.png:/images/toolbar/tools.png + :/images/toolbar/tools.svg:/images/toolbar/tools.svg Tools @@ -823,7 +823,7 @@ - :/images/toolbar/tools.png:/images/toolbar/tools.png + :/images/toolbar/tools.svg:/images/toolbar/tools.svg Tools @@ -841,7 +841,7 @@ - :/images/toolbar/display.png:/images/toolbar/display.png + :/images/toolbar/display.svg:/images/toolbar/display.svg Multi Screen @@ -853,7 +853,7 @@ - :/images/toolbar/addToPage.png:/images/toolbar/addToPage.png + :/images/toolbar/addToPage.svg:/images/toolbar/addToPage.svg Wide Size (16/9) @@ -874,7 +874,7 @@ - :/images/toolbar/addToPage.png:/images/toolbar/addToPage.png + :/images/toolbar/addToPage.svg:/images/toolbar/addToPage.svg Regular Size (4/3) @@ -898,7 +898,7 @@ - :/images/toolbar/addToPage.png:/images/toolbar/addToPage.png + :/images/toolbar/addToPage.svg:/images/toolbar/addToPage.svg Custom Size @@ -916,7 +916,7 @@ - :/images/toolbar/deleteDocument.png:/images/toolbar/deleteDocument.png + :/images/toolbar/deleteDocument.svg:/images/toolbar/deleteDocument.svg Stop Loading @@ -928,7 +928,7 @@ - :/images/toolbar/cut.png:/images/toolbar/cut.png + :/images/toolbar/cut.svg:/images/toolbar/cut.svg Cut @@ -940,7 +940,7 @@ - :/images/toolbar/copy.png:/images/toolbar/copy.png + :/images/toolbar/copy.svg:/images/toolbar/copy.svg Copy @@ -952,7 +952,7 @@ - :/images/toolbar/paste.png:/images/toolbar/paste.png + :/images/toolbar/paste.svg:/images/toolbar/paste.svg Paste @@ -1113,7 +1113,7 @@ - :/images/toolbar/record.png:/images/toolbar/record.png + :/images/toolbar/record.svg:/images/toolbar/record.svg Podcast @@ -1128,8 +1128,8 @@ - :/images/toolbar/record.png - :/images/toolbar/stop.png:/images/toolbar/record.png + :/images/toolbar/record.svg + :/images/toolbar/stop.svg:/images/toolbar/record.svg Record @@ -1177,7 +1177,7 @@ - :/images/toolbar/addToPage.png:/images/toolbar/addToPage.png + :/images/toolbar/addToPage.svg:/images/toolbar/addToPage.svg Add @@ -1422,7 +1422,7 @@ - :/images/toolbar/newDocument.png:/images/toolbar/newDocument.png + :/images/toolbar/newDocument.svg:/images/toolbar/newDocument.svg Pages @@ -1476,7 +1476,7 @@ - :/images/toolbar/pause.png:/images/toolbar/pause.png + :/images/toolbar/pause.svg:/images/toolbar/pause.svg Pause @@ -1488,7 +1488,7 @@ - :/images/toolbar/settings.png:/images/toolbar/settings.png + :/images/toolbar/settings.svg:/images/toolbar/settings.svg Podcast Config @@ -1500,7 +1500,7 @@ - :/images/toolbar/addToolToLibrary.png:/images/toolbar/addToolToLibrary.png + :/images/toolbar/addToolToLibrary.svg:/images/toolbar/addToolToLibrary.svg Capture Web Content @@ -1528,7 +1528,7 @@ - :/images/toolbar/captureArea.png:/images/toolbar/captureArea.png + :/images/toolbar/captureArea.svg:/images/toolbar/captureArea.svg Custom Capture @@ -1540,7 +1540,7 @@ - :/images/toolbar/captureWindow.png:/images/toolbar/captureWindow.png + :/images/toolbar/captureWindow.svg:/images/toolbar/captureWindow.svg Window Capture @@ -1570,8 +1570,8 @@ - :/images/toolbar/eyeClosed.png - :/images/toolbar/eyeOpened.png:/images/toolbar/eyeClosed.png + :/images/toolbar/eyeClosed.svg + :/images/toolbar/eyeOpened.svg:/images/toolbar/eyeClosed.svg Show on Display @@ -1601,7 +1601,7 @@ - :/images/toolbar/addToolToLibrary.png:/images/toolbar/addToolToLibrary.png + :/images/toolbar/addToolToLibrary.svg:/images/toolbar/addToolToLibrary.svg eduMedia @@ -1613,7 +1613,7 @@ - :/images/toolbar/updates.png:/images/toolbar/updates.png + :/images/toolbar/updates.svg:/images/toolbar/updates.svg Check Update @@ -1622,7 +1622,7 @@ - :/images/toolbar/hide.png:/images/toolbar/hide.png + :/images/toolbar/hide.svg:/images/toolbar/hide.svg Hide OpenBoard @@ -1665,7 +1665,7 @@ - :/images/toolbar/tutorial.png:/images/toolbar/tutorial.png + :/images/toolbar/tutorial.svg:/images/toolbar/tutorial.svg Open Tutorial diff --git a/resources/images/toolbar/addBookmark.svg b/resources/images/toolbar/addBookmark.svg new file mode 100644 index 00000000..97d2a04d --- /dev/null +++ b/resources/images/toolbar/addBookmark.svg @@ -0,0 +1,175 @@ + + + + + + + + + + + + + diff --git a/resources/images/toolbar/addInteractiveToLibrary.svg b/resources/images/toolbar/addInteractiveToLibrary.svg new file mode 100644 index 00000000..7e0c235b --- /dev/null +++ b/resources/images/toolbar/addInteractiveToLibrary.svg @@ -0,0 +1,221 @@ + +image/svg+xml diff --git a/resources/images/toolbar/addToDocument.svg b/resources/images/toolbar/addToDocument.svg new file mode 100644 index 00000000..b935fdf4 --- /dev/null +++ b/resources/images/toolbar/addToDocument.svg @@ -0,0 +1,120 @@ + + + + diff --git a/resources/images/toolbar/addToLibrary.svg b/resources/images/toolbar/addToLibrary.svg new file mode 100644 index 00000000..99552f12 --- /dev/null +++ b/resources/images/toolbar/addToLibrary.svg @@ -0,0 +1,184 @@ + +image/svg+xml diff --git a/resources/images/toolbar/addToPage.svg b/resources/images/toolbar/addToPage.svg new file mode 100644 index 00000000..b5316dc4 --- /dev/null +++ b/resources/images/toolbar/addToPage.svg @@ -0,0 +1,284 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/toolbar/addToWorkingDoc.svg b/resources/images/toolbar/addToWorkingDoc.svg new file mode 100644 index 00000000..dece7a63 --- /dev/null +++ b/resources/images/toolbar/addToWorkingDoc.svg @@ -0,0 +1,250 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/toolbar/addToolToLibrary.svg b/resources/images/toolbar/addToolToLibrary.svg new file mode 100644 index 00000000..96411bd3 --- /dev/null +++ b/resources/images/toolbar/addToolToLibrary.svg @@ -0,0 +1,275 @@ + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/toolbar/background.svg b/resources/images/toolbar/background.svg new file mode 100644 index 00000000..5b4b82c4 --- /dev/null +++ b/resources/images/toolbar/background.svg @@ -0,0 +1,141 @@ + + + +image/svg+xml diff --git a/resources/images/toolbar/board.svg b/resources/images/toolbar/board.svg new file mode 100644 index 00000000..128cd564 --- /dev/null +++ b/resources/images/toolbar/board.svg @@ -0,0 +1,311 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/toolbar/bookmarks.svg b/resources/images/toolbar/bookmarks.svg new file mode 100644 index 00000000..d4b420c5 --- /dev/null +++ b/resources/images/toolbar/bookmarks.svg @@ -0,0 +1,156 @@ + + + + + + + + + + + + + diff --git a/resources/images/toolbar/captureArea.svg b/resources/images/toolbar/captureArea.svg new file mode 100644 index 00000000..d60b7979 --- /dev/null +++ b/resources/images/toolbar/captureArea.svg @@ -0,0 +1,227 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/toolbar/captureScreen.svg b/resources/images/toolbar/captureScreen.svg new file mode 100644 index 00000000..b4dff438 --- /dev/null +++ b/resources/images/toolbar/captureScreen.svg @@ -0,0 +1,215 @@ + +image/svg+xml diff --git a/resources/images/toolbar/captureWindow.svg b/resources/images/toolbar/captureWindow.svg new file mode 100644 index 00000000..d6dd4cdd --- /dev/null +++ b/resources/images/toolbar/captureWindow.svg @@ -0,0 +1,267 @@ + +image/svg+xml diff --git a/resources/images/toolbar/clearPage.svg b/resources/images/toolbar/clearPage.svg new file mode 100644 index 00000000..3cf5d815 --- /dev/null +++ b/resources/images/toolbar/clearPage.svg @@ -0,0 +1,167 @@ + + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/toolbar/color.svg b/resources/images/toolbar/color.svg new file mode 100644 index 00000000..5f5df9e6 --- /dev/null +++ b/resources/images/toolbar/color.svg @@ -0,0 +1,145 @@ + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/toolbar/copy.svg b/resources/images/toolbar/copy.svg new file mode 100644 index 00000000..66232a09 --- /dev/null +++ b/resources/images/toolbar/copy.svg @@ -0,0 +1,307 @@ + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/toolbar/cut.svg b/resources/images/toolbar/cut.svg new file mode 100644 index 00000000..5d5ff19e --- /dev/null +++ b/resources/images/toolbar/cut.svg @@ -0,0 +1,162 @@ + + + + diff --git a/resources/images/toolbar/deleteDocument.svg b/resources/images/toolbar/deleteDocument.svg new file mode 100644 index 00000000..76a4a9b0 --- /dev/null +++ b/resources/images/toolbar/deleteDocument.svg @@ -0,0 +1,173 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/toolbar/deleteFolder.svg b/resources/images/toolbar/deleteFolder.svg new file mode 100644 index 00000000..a9cd2297 --- /dev/null +++ b/resources/images/toolbar/deleteFolder.svg @@ -0,0 +1,271 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/toolbar/display.svg b/resources/images/toolbar/display.svg new file mode 100644 index 00000000..088100b1 --- /dev/null +++ b/resources/images/toolbar/display.svg @@ -0,0 +1,255 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/toolbar/documents.svg b/resources/images/toolbar/documents.svg new file mode 100644 index 00000000..40e870a2 --- /dev/null +++ b/resources/images/toolbar/documents.svg @@ -0,0 +1,294 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/toolbar/duplicate.svg b/resources/images/toolbar/duplicate.svg new file mode 100644 index 00000000..e86c5fd8 --- /dev/null +++ b/resources/images/toolbar/duplicate.svg @@ -0,0 +1,243 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/toolbar/eraserTool.svg b/resources/images/toolbar/eraserTool.svg new file mode 100644 index 00000000..c9376324 --- /dev/null +++ b/resources/images/toolbar/eraserTool.svg @@ -0,0 +1,81 @@ + + + + diff --git a/resources/images/toolbar/export.svg b/resources/images/toolbar/export.svg new file mode 100644 index 00000000..704013a9 --- /dev/null +++ b/resources/images/toolbar/export.svg @@ -0,0 +1,173 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/toolbar/extraTool.svg b/resources/images/toolbar/extraTool.svg new file mode 100644 index 00000000..9e090ce0 --- /dev/null +++ b/resources/images/toolbar/extraTool.svg @@ -0,0 +1,559 @@ + + + + diff --git a/resources/images/toolbar/eyeClosed.svg b/resources/images/toolbar/eyeClosed.svg new file mode 100644 index 00000000..ac4bd13c --- /dev/null +++ b/resources/images/toolbar/eyeClosed.svg @@ -0,0 +1,159 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/toolbar/eyeOpened.svg b/resources/images/toolbar/eyeOpened.svg new file mode 100644 index 00000000..a426a140 --- /dev/null +++ b/resources/images/toolbar/eyeOpened.svg @@ -0,0 +1,166 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/toolbar/group.svg b/resources/images/toolbar/group.svg new file mode 100644 index 00000000..9c5e4b90 --- /dev/null +++ b/resources/images/toolbar/group.svg @@ -0,0 +1,157 @@ + +image/svg+xml diff --git a/resources/images/toolbar/hide.svg b/resources/images/toolbar/hide.svg new file mode 100644 index 00000000..903df8ea --- /dev/null +++ b/resources/images/toolbar/hide.svg @@ -0,0 +1,178 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/toolbar/home.svg b/resources/images/toolbar/home.svg new file mode 100644 index 00000000..20c3b062 --- /dev/null +++ b/resources/images/toolbar/home.svg @@ -0,0 +1,190 @@ + + + + diff --git a/resources/images/toolbar/import.svg b/resources/images/toolbar/import.svg new file mode 100644 index 00000000..93fba7f8 --- /dev/null +++ b/resources/images/toolbar/import.svg @@ -0,0 +1,164 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/toolbar/largeEraser.svg b/resources/images/toolbar/largeEraser.svg new file mode 100644 index 00000000..ad322172 --- /dev/null +++ b/resources/images/toolbar/largeEraser.svg @@ -0,0 +1,67 @@ + + + + diff --git a/resources/images/toolbar/largePen.svg b/resources/images/toolbar/largePen.svg new file mode 100644 index 00000000..efb7a92c --- /dev/null +++ b/resources/images/toolbar/largePen.svg @@ -0,0 +1,67 @@ + + + + diff --git a/resources/images/toolbar/library.svg b/resources/images/toolbar/library.svg new file mode 100644 index 00000000..3b51065e --- /dev/null +++ b/resources/images/toolbar/library.svg @@ -0,0 +1,180 @@ + +image/svg+xml diff --git a/resources/images/toolbar/lineTool.svg b/resources/images/toolbar/lineTool.svg new file mode 100644 index 00000000..7f0bc46b --- /dev/null +++ b/resources/images/toolbar/lineTool.svg @@ -0,0 +1,81 @@ + + + + diff --git a/resources/images/toolbar/mediumEraser.svg b/resources/images/toolbar/mediumEraser.svg new file mode 100644 index 00000000..cf26a737 --- /dev/null +++ b/resources/images/toolbar/mediumEraser.svg @@ -0,0 +1,67 @@ + + + + diff --git a/resources/images/toolbar/mediumPen.svg b/resources/images/toolbar/mediumPen.svg new file mode 100644 index 00000000..489e4a90 --- /dev/null +++ b/resources/images/toolbar/mediumPen.svg @@ -0,0 +1,67 @@ + + + + diff --git a/resources/images/toolbar/menu.svg b/resources/images/toolbar/menu.svg new file mode 100644 index 00000000..844a0aaf --- /dev/null +++ b/resources/images/toolbar/menu.svg @@ -0,0 +1,116 @@ + +image/svg+xml diff --git a/resources/images/toolbar/mic.svg b/resources/images/toolbar/mic.svg new file mode 100644 index 00000000..2045113e --- /dev/null +++ b/resources/images/toolbar/mic.svg @@ -0,0 +1,461 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/toolbar/micOff.svg b/resources/images/toolbar/micOff.svg new file mode 100644 index 00000000..07bde51b --- /dev/null +++ b/resources/images/toolbar/micOff.svg @@ -0,0 +1,517 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/toolbar/newDocument.svg b/resources/images/toolbar/newDocument.svg new file mode 100644 index 00000000..6ab59186 --- /dev/null +++ b/resources/images/toolbar/newDocument.svg @@ -0,0 +1,147 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/toolbar/newFolder.svg b/resources/images/toolbar/newFolder.svg new file mode 100644 index 00000000..fb0a3381 --- /dev/null +++ b/resources/images/toolbar/newFolder.svg @@ -0,0 +1,235 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/toolbar/newPage.svg b/resources/images/toolbar/newPage.svg new file mode 100644 index 00000000..13a61544 --- /dev/null +++ b/resources/images/toolbar/newPage.svg @@ -0,0 +1,181 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/toolbar/next.svg b/resources/images/toolbar/next.svg new file mode 100644 index 00000000..e5450d72 --- /dev/null +++ b/resources/images/toolbar/next.svg @@ -0,0 +1,93 @@ + + + + diff --git a/resources/images/toolbar/nextPageOn.svg b/resources/images/toolbar/nextPageOn.svg new file mode 100644 index 00000000..cd078970 --- /dev/null +++ b/resources/images/toolbar/nextPageOn.svg @@ -0,0 +1,183 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/toolbar/open.svg b/resources/images/toolbar/open.svg new file mode 100644 index 00000000..8ba3bfc1 --- /dev/null +++ b/resources/images/toolbar/open.svg @@ -0,0 +1,490 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/toolbar/pageSize.svg b/resources/images/toolbar/pageSize.svg new file mode 100644 index 00000000..5435919b --- /dev/null +++ b/resources/images/toolbar/pageSize.svg @@ -0,0 +1,280 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/toolbar/paste.svg b/resources/images/toolbar/paste.svg new file mode 100644 index 00000000..b3d50801 --- /dev/null +++ b/resources/images/toolbar/paste.svg @@ -0,0 +1,307 @@ + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/toolbar/pause.svg b/resources/images/toolbar/pause.svg new file mode 100644 index 00000000..238937f6 --- /dev/null +++ b/resources/images/toolbar/pause.svg @@ -0,0 +1,107 @@ + + + + diff --git a/resources/images/toolbar/pdf.svg b/resources/images/toolbar/pdf.svg new file mode 100644 index 00000000..b3cf5673 --- /dev/null +++ b/resources/images/toolbar/pdf.svg @@ -0,0 +1,122 @@ + + + +PDF diff --git a/resources/images/toolbar/plusBlack.svg b/resources/images/toolbar/plusBlack.svg new file mode 100644 index 00000000..28585109 --- /dev/null +++ b/resources/images/toolbar/plusBlack.svg @@ -0,0 +1,63 @@ + + + + diff --git a/resources/images/toolbar/plusBlackOn.svg b/resources/images/toolbar/plusBlackOn.svg new file mode 100644 index 00000000..caab71b0 --- /dev/null +++ b/resources/images/toolbar/plusBlackOn.svg @@ -0,0 +1,96 @@ + +image/svg+xml diff --git a/resources/images/toolbar/previous.svg b/resources/images/toolbar/previous.svg new file mode 100644 index 00000000..07d20510 --- /dev/null +++ b/resources/images/toolbar/previous.svg @@ -0,0 +1,93 @@ + + + + diff --git a/resources/images/toolbar/previousPageOn.svg b/resources/images/toolbar/previousPageOn.svg new file mode 100644 index 00000000..1e50424a --- /dev/null +++ b/resources/images/toolbar/previousPageOn.svg @@ -0,0 +1,183 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/toolbar/print.svg b/resources/images/toolbar/print.svg new file mode 100644 index 00000000..ac3732ba --- /dev/null +++ b/resources/images/toolbar/print.svg @@ -0,0 +1,606 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/toolbar/profile.svg b/resources/images/toolbar/profile.svg new file mode 100644 index 00000000..94bcaf4e --- /dev/null +++ b/resources/images/toolbar/profile.svg @@ -0,0 +1,111 @@ + +image/svg+xml diff --git a/resources/images/toolbar/proto.svg b/resources/images/toolbar/proto.svg new file mode 100644 index 00000000..92d49766 --- /dev/null +++ b/resources/images/toolbar/proto.svg @@ -0,0 +1,112 @@ + +HOTimage/svg+xml diff --git a/resources/images/toolbar/quit.svg b/resources/images/toolbar/quit.svg new file mode 100644 index 00000000..fd756d52 --- /dev/null +++ b/resources/images/toolbar/quit.svg @@ -0,0 +1,116 @@ + +image/svg+xml diff --git a/resources/images/toolbar/quitOn.svg b/resources/images/toolbar/quitOn.svg new file mode 100644 index 00000000..3de7a7e6 --- /dev/null +++ b/resources/images/toolbar/quitOn.svg @@ -0,0 +1,116 @@ + +image/svg+xml diff --git a/resources/images/toolbar/record.svg b/resources/images/toolbar/record.svg new file mode 100644 index 00000000..c8f90176 --- /dev/null +++ b/resources/images/toolbar/record.svg @@ -0,0 +1,128 @@ + +image/svg+xml diff --git a/resources/images/toolbar/redo.svg b/resources/images/toolbar/redo.svg new file mode 100644 index 00000000..171f2cca --- /dev/null +++ b/resources/images/toolbar/redo.svg @@ -0,0 +1,90 @@ + + + + diff --git a/resources/images/toolbar/redoOn.svg b/resources/images/toolbar/redoOn.svg new file mode 100644 index 00000000..ec1b31cc --- /dev/null +++ b/resources/images/toolbar/redoOn.svg @@ -0,0 +1,90 @@ + + + + diff --git a/resources/images/toolbar/reload.svg b/resources/images/toolbar/reload.svg new file mode 100644 index 00000000..a33b4a67 --- /dev/null +++ b/resources/images/toolbar/reload.svg @@ -0,0 +1,126 @@ + + + + diff --git a/resources/images/toolbar/remove.svg b/resources/images/toolbar/remove.svg new file mode 100644 index 00000000..3948bc34 --- /dev/null +++ b/resources/images/toolbar/remove.svg @@ -0,0 +1,89 @@ + + + + diff --git a/resources/images/toolbar/removeBackground.svg b/resources/images/toolbar/removeBackground.svg new file mode 100644 index 00000000..aa8ee2c7 --- /dev/null +++ b/resources/images/toolbar/removeBackground.svg @@ -0,0 +1,188 @@ + + + +image/svg+xml diff --git a/resources/images/toolbar/rename.svg b/resources/images/toolbar/rename.svg new file mode 100644 index 00000000..f2731803 --- /dev/null +++ b/resources/images/toolbar/rename.svg @@ -0,0 +1,275 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +Abc diff --git a/resources/images/toolbar/setBackground.svg b/resources/images/toolbar/setBackground.svg new file mode 100644 index 00000000..c661cfe5 --- /dev/null +++ b/resources/images/toolbar/setBackground.svg @@ -0,0 +1,170 @@ + + + +image/svg+xml diff --git a/resources/images/toolbar/settings.svg b/resources/images/toolbar/settings.svg new file mode 100644 index 00000000..56f58bac --- /dev/null +++ b/resources/images/toolbar/settings.svg @@ -0,0 +1,143 @@ + + + + diff --git a/resources/images/toolbar/smallEraser.svg b/resources/images/toolbar/smallEraser.svg new file mode 100644 index 00000000..7c9908fc --- /dev/null +++ b/resources/images/toolbar/smallEraser.svg @@ -0,0 +1,67 @@ + + + + diff --git a/resources/images/toolbar/smallPen.svg b/resources/images/toolbar/smallPen.svg new file mode 100644 index 00000000..d9c6a3ee --- /dev/null +++ b/resources/images/toolbar/smallPen.svg @@ -0,0 +1,67 @@ + + + + diff --git a/resources/images/toolbar/smallerText.svg b/resources/images/toolbar/smallerText.svg new file mode 100644 index 00000000..36b0cede --- /dev/null +++ b/resources/images/toolbar/smallerText.svg @@ -0,0 +1,183 @@ + + + + diff --git a/resources/images/toolbar/softwareUpdate.svg b/resources/images/toolbar/softwareUpdate.svg new file mode 100644 index 00000000..91f7a70c --- /dev/null +++ b/resources/images/toolbar/softwareUpdate.svg @@ -0,0 +1,329 @@ + + + + + + + + + + + + +image/svg+xml diff --git a/resources/images/toolbar/stop.svg b/resources/images/toolbar/stop.svg new file mode 100644 index 00000000..8ee5db84 --- /dev/null +++ b/resources/images/toolbar/stop.svg @@ -0,0 +1,81 @@ + + + + diff --git a/resources/images/toolbar/stylus.svg b/resources/images/toolbar/stylus.svg new file mode 100644 index 00000000..6565bac1 --- /dev/null +++ b/resources/images/toolbar/stylus.svg @@ -0,0 +1,385 @@ + + + + diff --git a/resources/images/toolbar/stylusTab.svg b/resources/images/toolbar/stylusTab.svg new file mode 100644 index 00000000..6565bac1 --- /dev/null +++ b/resources/images/toolbar/stylusTab.svg @@ -0,0 +1,385 @@ + + + + diff --git a/resources/images/toolbar/tools.svg b/resources/images/toolbar/tools.svg new file mode 100644 index 00000000..ab91d724 --- /dev/null +++ b/resources/images/toolbar/tools.svg @@ -0,0 +1,177 @@ + + + + diff --git a/resources/images/toolbar/tutorial.svg b/resources/images/toolbar/tutorial.svg new file mode 100644 index 00000000..644d291d --- /dev/null +++ b/resources/images/toolbar/tutorial.svg @@ -0,0 +1,140 @@ + +?image/svg+xml diff --git a/resources/images/toolbar/undo.svg b/resources/images/toolbar/undo.svg new file mode 100644 index 00000000..ad4ba035 --- /dev/null +++ b/resources/images/toolbar/undo.svg @@ -0,0 +1,90 @@ + + + + diff --git a/resources/images/toolbar/undoOn.svg b/resources/images/toolbar/undoOn.svg new file mode 100644 index 00000000..c1c93308 --- /dev/null +++ b/resources/images/toolbar/undoOn.svg @@ -0,0 +1,90 @@ + + + + diff --git a/resources/images/toolbar/ungroup.svg b/resources/images/toolbar/ungroup.svg new file mode 100644 index 00000000..dfc4f177 --- /dev/null +++ b/resources/images/toolbar/ungroup.svg @@ -0,0 +1,210 @@ + +image/svg+xml diff --git a/resources/images/toolbar/updates.svg b/resources/images/toolbar/updates.svg new file mode 100644 index 00000000..b0c92b28 --- /dev/null +++ b/resources/images/toolbar/updates.svg @@ -0,0 +1,136 @@ + + + + diff --git a/resources/images/toolbar/web.svg b/resources/images/toolbar/web.svg new file mode 100644 index 00000000..09c7b93b --- /dev/null +++ b/resources/images/toolbar/web.svg @@ -0,0 +1,321 @@ + + + + + + + + + + + + +image/svg+xml diff --git a/resources/images/toolbar/webTrap.svg b/resources/images/toolbar/webTrap.svg new file mode 100644 index 00000000..13df14ae --- /dev/null +++ b/resources/images/toolbar/webTrap.svg @@ -0,0 +1,106 @@ + +image/svg+xml diff --git a/resources/images/toolbar/webTrapEnabled.svg b/resources/images/toolbar/webTrapEnabled.svg new file mode 100644 index 00000000..301efafd --- /dev/null +++ b/resources/images/toolbar/webTrapEnabled.svg @@ -0,0 +1,120 @@ + +image/svg+xml diff --git a/resources/images/toolbar/webUpload.svg b/resources/images/toolbar/webUpload.svg new file mode 100644 index 00000000..6085c985 --- /dev/null +++ b/resources/images/toolbar/webUpload.svg @@ -0,0 +1,355 @@ + + + + + + + + + + + + +image/svg+xml diff --git a/resources/images/toolbar/window.svg b/resources/images/toolbar/window.svg new file mode 100644 index 00000000..d1c257fe --- /dev/null +++ b/resources/images/toolbar/window.svg @@ -0,0 +1,465 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/core/UBApplication.cpp b/src/core/UBApplication.cpp index 089448bd..05136945 100644 --- a/src/core/UBApplication.cpp +++ b/src/core/UBApplication.cpp @@ -520,7 +520,7 @@ void UBApplication::decorateActionMenu(QAction* action) pageSizeGroup->addAction(mainWindow->actionRegularPageSize); pageSizeGroup->addAction(mainWindow->actionCustomPageSize); - QMenu* documentSizeMenu = menu->addMenu(QIcon(":/images/toolbar/pageSize.png"),tr("Page Size")); + QMenu* documentSizeMenu = menu->addMenu(QIcon(":/images/toolbar/pageSize.svg"),tr("Page Size")); documentSizeMenu->addAction(mainWindow->actionWidePageSize); documentSizeMenu->addAction(mainWindow->actionRegularPageSize); documentSizeMenu->addAction(mainWindow->actionCustomPageSize); diff --git a/src/desktop/UBDesktopPalette.cpp b/src/desktop/UBDesktopPalette.cpp index 5e54043b..dd381d3e 100644 --- a/src/desktop/UBDesktopPalette.cpp +++ b/src/desktop/UBDesktopPalette.cpp @@ -52,7 +52,7 @@ UBDesktopPalette::UBDesktopPalette(QWidget *parent, UBRightPalette* _rightPalett { QList actions; - mActionUniboard = new QAction(QIcon(":/images/toolbar/board.png"), tr("Show OpenBoard"), this); + mActionUniboard = new QAction(QIcon(":/images/toolbar/board.svg"), tr("Show OpenBoard"), this); connect(mActionUniboard, SIGNAL(triggered()), this, SIGNAL(uniboardClick())); actions << mActionUniboard; @@ -66,17 +66,17 @@ UBDesktopPalette::UBDesktopPalette(QWidget *parent, UBRightPalette* _rightPalett if (UBPlatformUtils::hasVirtualKeyboard()) actions << UBApplication::mainWindow->actionVirtualKeyboard; - mActionCustomSelect = new QAction(QIcon(":/images/toolbar/captureArea.png"), tr("Capture Part of the Screen"), this); + mActionCustomSelect = new QAction(QIcon(":/images/toolbar/captureArea.svg"), tr("Capture Part of the Screen"), this); connect(mActionCustomSelect, SIGNAL(triggered()), this, SIGNAL(customClick())); actions << mActionCustomSelect; - mDisplaySelectAction = new QAction(QIcon(":/images/toolbar/captureScreen.png"), tr("Capture the Screen"), this); + mDisplaySelectAction = new QAction(QIcon(":/images/toolbar/captureScreen.svg"), tr("Capture the Screen"), this); connect(mDisplaySelectAction, SIGNAL(triggered()), this, SIGNAL(screenClick())); actions << mDisplaySelectAction; QIcon showHideIcon; - showHideIcon.addPixmap(QPixmap(":/images/toolbar/eyeOpened.png"), QIcon::Normal , QIcon::On); - showHideIcon.addPixmap(QPixmap(":/images/toolbar/eyeClosed.png"), QIcon::Normal , QIcon::Off); + showHideIcon.addFile(":/images/toolbar/eyeOpened.svg", QSize(), QIcon::Normal , QIcon::On); + showHideIcon.addFile(":/images/toolbar/eyeClosed.svg", QSize(), QIcon::Normal , QIcon::Off); mShowHideAction = new QAction(showHideIcon, "", this); mShowHideAction->setCheckable(true); @@ -90,7 +90,7 @@ UBDesktopPalette::UBDesktopPalette(QWidget *parent, UBRightPalette* _rightPalett // This palette can be minimized QIcon maximizeIcon; - maximizeIcon.addPixmap(QPixmap(":/images/toolbar/stylusTab.png"), QIcon::Normal, QIcon::On); + maximizeIcon.addFile(":/images/toolbar/stylusTab.svg", QSize(), QIcon::Normal, QIcon::On); mMaximizeAction = new QAction(maximizeIcon, tr("Show the stylus palette"), this); connect(mMaximizeAction, SIGNAL(triggered()), this, SLOT(maximizeMe())); connect(this, SIGNAL(maximizeStart()), this, SLOT(maximizeMe())); diff --git a/src/document/UBDocumentController.cpp b/src/document/UBDocumentController.cpp index c049c95f..cb2a1876 100644 --- a/src/document/UBDocumentController.cpp +++ b/src/document/UBDocumentController.cpp @@ -511,7 +511,7 @@ QVariant UBDocumentTreeModel::data(const QModelIndex &index, int role) const case UBDocumentTreeNode::Catalog : return QIcon(":images/folder.svg"); case UBDocumentTreeNode::Document : - return QIcon(":images/toolbar/board.png"); + return QIcon(":images/toolbar/board.svg"); } } break; diff --git a/src/domain/UBGraphicsGroupContainerItemDelegate.cpp b/src/domain/UBGraphicsGroupContainerItemDelegate.cpp index 457e3f06..a32abffb 100644 --- a/src/domain/UBGraphicsGroupContainerItemDelegate.cpp +++ b/src/domain/UBGraphicsGroupContainerItemDelegate.cpp @@ -56,8 +56,8 @@ void UBGraphicsGroupContainerItemDelegate::decorateMenu(QMenu *menu) { mLockAction = menu->addAction(tr("Locked"), this, SLOT(lock(bool))); QIcon lockIcon; - lockIcon.addPixmap(QPixmap(":/images/locked.svg"), QIcon::Normal, QIcon::On); - lockIcon.addPixmap(QPixmap(":/images/unlocked.svg"), QIcon::Normal, QIcon::Off); + lockIcon.addFile(":/images/locked.svg", QSize(), QIcon::Normal, QIcon::On); + lockIcon.addFile(":/images/unlocked.svg", QSize(), QIcon::Normal, QIcon::Off); mLockAction->setIcon(lockIcon); mLockAction->setCheckable(true); @@ -65,8 +65,8 @@ void UBGraphicsGroupContainerItemDelegate::decorateMenu(QMenu *menu) mShowOnDisplayAction->setCheckable(true); QIcon showIcon; - showIcon.addPixmap(QPixmap(":/images/eyeOpened.svg"), QIcon::Normal, QIcon::On); - showIcon.addPixmap(QPixmap(":/images/eyeClosed.svg"), QIcon::Normal, QIcon::Off); + showIcon.addFile(":/images/eyeOpened.svg", QSize(), QIcon::Normal, QIcon::On); + showIcon.addFile(":/images/eyeClosed.svg", QSize(), QIcon::Normal, QIcon::Off); mShowOnDisplayAction->setIcon(showIcon); } diff --git a/src/domain/UBGraphicsItemDelegate.cpp b/src/domain/UBGraphicsItemDelegate.cpp index 8c0dede6..92d72158 100644 --- a/src/domain/UBGraphicsItemDelegate.cpp +++ b/src/domain/UBGraphicsItemDelegate.cpp @@ -711,8 +711,8 @@ void UBGraphicsItemDelegate::decorateMenu(QMenu* menu) { mLockAction = menu->addAction(tr("Locked"), this, SLOT(lock(bool))); QIcon lockIcon; - lockIcon.addPixmap(QPixmap(":/images/locked.svg"), QIcon::Normal, QIcon::On); - lockIcon.addPixmap(QPixmap(":/images/unlocked.svg"), QIcon::Normal, QIcon::Off); + lockIcon.addFile(":/images/locked.svg", QSize(), QIcon::Normal, QIcon::On); + lockIcon.addFile(":/images/unlocked.svg", QSize(), QIcon::Normal, QIcon::Off); mLockAction->setIcon(lockIcon); mLockAction->setCheckable(true); @@ -720,8 +720,8 @@ void UBGraphicsItemDelegate::decorateMenu(QMenu* menu) mShowOnDisplayAction->setCheckable(true); QIcon showIcon; - showIcon.addPixmap(QPixmap(":/images/eyeOpened.svg"), QIcon::Normal, QIcon::On); - showIcon.addPixmap(QPixmap(":/images/eyeClosed.svg"), QIcon::Normal, QIcon::Off); + showIcon.addFile(":/images/eyeOpened.svg", QSize(), QIcon::Normal, QIcon::On); + showIcon.addFile(":/images/eyeClosed.svg", QSize(), QIcon::Normal, QIcon::Off); mShowOnDisplayAction->setIcon(showIcon); if (delegated()->data(UBGraphicsItemData::ItemCanBeSetAsBackground).toBool()) { @@ -729,7 +729,7 @@ void UBGraphicsItemDelegate::decorateMenu(QMenu* menu) mSetAsBackgroundAction->setCheckable(false); QIcon backgroundIcon; - backgroundIcon.addPixmap(QPixmap(":/images/setAsBackground.svg"), QIcon::Normal, QIcon::On); + backgroundIcon.addFile(":/images/setAsBackground.svg", QSize(), QIcon::Normal, QIcon::On); mSetAsBackgroundAction->setIcon(backgroundIcon); } @@ -738,7 +738,7 @@ void UBGraphicsItemDelegate::decorateMenu(QMenu* menu) mGotoContentSourceAction = menu->addAction(tr("Go to Content Source"), this, SLOT(gotoContentSource())); QIcon sourceIcon; - sourceIcon.addPixmap(QPixmap(":/images/toolbar/internet.png"), QIcon::Normal, QIcon::On); + sourceIcon.addFile(":/images/toolbar/internet.png", QSize(), QIcon::Normal, QIcon::On); mGotoContentSourceAction->setIcon(sourceIcon); } } diff --git a/src/domain/UBGraphicsWidgetItemDelegate.cpp b/src/domain/UBGraphicsWidgetItemDelegate.cpp index 33306450..19167e6f 100644 --- a/src/domain/UBGraphicsWidgetItemDelegate.cpp +++ b/src/domain/UBGraphicsWidgetItemDelegate.cpp @@ -87,8 +87,8 @@ void UBGraphicsWidgetItemDelegate::decorateMenu(QMenu* menu) freezeAction = menu->addAction(tr("Frozen"), this, SLOT(freeze(bool))); QIcon freezeIcon; - freezeIcon.addPixmap(QPixmap(":/images/frozen.svg"), QIcon::Normal, QIcon::On); - freezeIcon.addPixmap(QPixmap(":/images/unfrozen.svg"), QIcon::Normal, QIcon::Off); + freezeIcon.addFile(":/images/frozen.svg", QSize(), QIcon::Normal, QIcon::On); + freezeIcon.addFile(":/images/unfrozen.svg", QSize(), QIcon::Normal, QIcon::Off); freezeAction->setIcon(freezeIcon); freezeAction->setCheckable(true); @@ -97,8 +97,8 @@ void UBGraphicsWidgetItemDelegate::decorateMenu(QMenu* menu) { setAsToolAction = mMenu->addAction(tr("Transform as Tool "), this, SLOT(pin())); QIcon pinIcon; - pinIcon.addPixmap(QPixmap(":/images/unpin.svg"), QIcon::Normal, QIcon::On); - pinIcon.addPixmap(QPixmap(":/images/pin.svg"), QIcon::Normal, QIcon::Off); + pinIcon.addFile(":/images/unpin.svg", QSize(), QIcon::Normal, QIcon::On); + pinIcon.addFile(":/images/pin.svg", QSize(), QIcon::Normal, QIcon::Off); setAsToolAction->setIcon(pinIcon); } } diff --git a/src/web/browser/WBTabWidget.cpp b/src/web/browser/WBTabWidget.cpp index 338e08d0..1e5561ca 100644 --- a/src/web/browser/WBTabWidget.cpp +++ b/src/web/browser/WBTabWidget.cpp @@ -241,7 +241,7 @@ WBTabWidget::WBTabWidget(QWidget *parent) , mTabBar(new WBTabBar(this)) { setObjectName("ubWebBrowserTabWidget"); - mAddTabIcon = QPixmap(":/images/toolbar/plusBlack.png"); + mAddTabIcon = QPixmap(":/images/toolbar/plusBlack.svg"); setElideMode(Qt::ElideRight); From 86e2e166a1def6414f5bacf0f501e7bd0fc65967 Mon Sep 17 00:00:00 2001 From: thomas_lucky13 Date: Fri, 19 Aug 2022 17:11:38 +0400 Subject: [PATCH 12/12] next/previous/PageOn --- resources/images/toolbar/nextPageOn.svg | 197 ++++++++++++-------- resources/images/toolbar/previousPageOn.svg | 196 +++++++++++-------- 2 files changed, 245 insertions(+), 148 deletions(-) diff --git a/resources/images/toolbar/nextPageOn.svg b/resources/images/toolbar/nextPageOn.svg index cd078970..8915d6c6 100644 --- a/resources/images/toolbar/nextPageOn.svg +++ b/resources/images/toolbar/nextPageOn.svg @@ -11,7 +11,7 @@ xml:space="preserve" id="svg31" sodipodi:docname="nextPageOn.svg" - inkscape:version="1.2 (dc2aedaf03, 2022-05-15)" + inkscape:version="1.2 (1:1.2.1+202207142221+cd75a1ee6d)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink" @@ -19,18 +19,50 @@ xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" - xmlns:ns="&#38;#38;ns_sfw;" - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"> + + + + + + + transform="rotate(-90,63.4995,63.634)" + inkscape:label="icon"> - + - - - - + + + + diff --git a/resources/images/toolbar/previousPageOn.svg b/resources/images/toolbar/previousPageOn.svg index 1e50424a..7ccf37fa 100644 --- a/resources/images/toolbar/previousPageOn.svg +++ b/resources/images/toolbar/previousPageOn.svg @@ -11,7 +11,7 @@ xml:space="preserve" id="svg31" sodipodi:docname="previousPageOn.svg" - inkscape:version="1.2 (dc2aedaf03, 2022-05-15)" + inkscape:version="1.2 (1:1.2.1+202207142221+cd75a1ee6d)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink" @@ -19,18 +19,50 @@ xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" - xmlns:ns="&#38;#38;#38;ns_sfw;" - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"> + + + + + + + transform="rotate(-90,63.4995,63.634)" + inkscape:label="icon"> - + - - - - + + + +