# HG changeset patch # User Teemu Piippo # Date 1646479978 -7200 # Node ID 36ea1a8aee33ba917bf6526b9b3f35b640505eb3 # Parent 3ebe1a0ca81875e85ccc1766dbc242670e354ebe Add icons for tools diff -r 3ebe1a0ca818 -r 36ea1a8aee33 icons/navigate-outline.png Binary file icons/navigate-outline.png has changed diff -r 3ebe1a0ca818 -r 36ea1a8aee33 icons_svg/navigate-outline.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/icons_svg/navigate-outline.svg Sat Mar 05 13:32:58 2022 +0200 @@ -0,0 +1,56 @@ + + + + + + image/svg+xml + + + + + + + ionicons-v5-f + + diff -r 3ebe1a0ca818 -r 36ea1a8aee33 ldforge.qrc --- a/ldforge.qrc Sat Mar 05 13:19:59 2022 +0200 +++ b/ldforge.qrc Sat Mar 05 13:32:58 2022 +0200 @@ -26,5 +26,6 @@ icons/warning-outline.png icons/linetype-conditionaledge.png icons/close-circle-outline.png + icons/navigate-outline.png diff -r 3ebe1a0ca818 -r 36ea1a8aee33 src/document.cpp --- a/src/document.cpp Sat Mar 05 13:19:59 2022 +0200 +++ b/src/document.cpp Sat Mar 05 13:32:58 2022 +0200 @@ -167,6 +167,7 @@ action->setCheckable(true); this->toolActions[toolInstance] = action; action->setToolTip(toolInstance->toolTip()); + action->setIcon(QPixmap{toolInstance->iconName()}); connect(action, &QAction::triggered, this, &Document::toolActionTriggered); this->toolsBar->addAction(action); QWidget* const widget = toolInstance->toolWidget(); diff -r 3ebe1a0ca818 -r 36ea1a8aee33 src/tools/basetool.cpp --- a/src/tools/basetool.cpp Sat Mar 05 13:19:59 2022 +0200 +++ b/src/tools/basetool.cpp Sat Mar 05 13:32:58 2022 +0200 @@ -7,3 +7,8 @@ document{document} { } + +QString BaseTool::iconName() const +{ + return ""; +} diff -r 3ebe1a0ca818 -r 36ea1a8aee33 src/tools/basetool.h --- a/src/tools/basetool.h Sat Mar 05 13:19:59 2022 +0200 +++ b/src/tools/basetool.h Sat Mar 05 13:32:58 2022 +0200 @@ -22,6 +22,7 @@ virtual void selectionChanged(const QSet&) {} virtual void reset() {} virtual void overpaint(Canvas*, QPainter*) const {} + virtual QString iconName() const; protected: QWidget* const parentWidget; Document* const document; diff -r 3ebe1a0ca818 -r 36ea1a8aee33 src/tools/drawtool.cpp --- a/src/tools/drawtool.cpp Sat Mar 05 13:19:59 2022 +0200 +++ b/src/tools/drawtool.cpp Sat Mar 05 13:32:58 2022 +0200 @@ -129,6 +129,11 @@ } } +QString DrawTool::iconName() const +{ + return ":/icons/pencil-outline.png"; +} + template std::array vectorToArray(const std::vector& x) { diff -r 3ebe1a0ca818 -r 36ea1a8aee33 src/tools/drawtool.h --- a/src/tools/drawtool.h Sat Mar 05 13:19:59 2022 +0200 +++ b/src/tools/drawtool.h Sat Mar 05 13:32:58 2022 +0200 @@ -15,6 +15,7 @@ bool keyReleased(Document*, Canvas* canvas, QKeyEvent* event) override; void reset() override; void overpaint(Canvas*, QPainter*) const override; + QString iconName() const override; private: void closeShape(Document *document); std::vector polygon; diff -r 3ebe1a0ca818 -r 36ea1a8aee33 src/tools/selecttool.cpp --- a/src/tools/selecttool.cpp Sat Mar 05 13:19:59 2022 +0200 +++ b/src/tools/selecttool.cpp Sat Mar 05 13:32:58 2022 +0200 @@ -53,3 +53,8 @@ this->objectEditor->setObjectId(ldraw::NULL_ID); } } + +QString SelectTool::iconName() const +{ + return ":/icons/navigate-outline.png"; +} diff -r 3ebe1a0ca818 -r 36ea1a8aee33 src/tools/selecttool.h --- a/src/tools/selecttool.h Sat Mar 05 13:19:59 2022 +0200 +++ b/src/tools/selecttool.h Sat Mar 05 13:32:58 2022 +0200 @@ -13,5 +13,6 @@ bool mouseClick(Document*, Canvas*, QMouseEvent*) override; QWidget* toolWidget() override; void selectionChanged(const QSet &newSelection) override; + QString iconName() const override; ObjectEditor* objectEditor; }; diff -r 3ebe1a0ca818 -r 36ea1a8aee33 src/tools/transformtool.cpp --- a/src/tools/transformtool.cpp Sat Mar 05 13:19:59 2022 +0200 +++ b/src/tools/transformtool.cpp Sat Mar 05 13:32:58 2022 +0200 @@ -37,6 +37,11 @@ return this->widget; } +QString TransformTool::iconName() const +{ + return ":/icons/grid-outline.png"; +} + void TransformTool::applyButtonClicked() { std::unique_ptr editor = this->document->editModel(); diff -r 3ebe1a0ca818 -r 36ea1a8aee33 src/tools/transformtool.h --- a/src/tools/transformtool.h Sat Mar 05 13:19:59 2022 +0200 +++ b/src/tools/transformtool.h Sat Mar 05 13:32:58 2022 +0200 @@ -12,6 +12,7 @@ virtual QString toolTip() const override; void selectionChanged(const QSet &newSelection) override; QWidget *toolWidget() override; + QString iconName() const override; private: Q_SLOT void applyButtonClicked(); MatrixEditor* matrixEditor;