From 2737e1c4ce5c1127f189e0b0f391cf53cc5e4bb0 Mon Sep 17 00:00:00 2001 From: thomas_lucky13 Date: Thu, 21 Jul 2022 11:34:56 +0400 Subject: [PATCH] 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; }