# HG changeset patch # User Teemu Piippo # Date 1646476934 -7200 # Node ID 5bd755eaa5a88d9421917a717634b7664cff2e48 # Parent 869fe95c4e5e1ecbe48f198f23a4e6de74629bba Add icons from ionicons diff -r 869fe95c4e5e -r 5bd755eaa5a8 CMakeLists.txt --- a/CMakeLists.txt Sat Mar 05 00:51:23 2022 +0200 +++ b/CMakeLists.txt Sat Mar 05 12:42:14 2022 +0200 @@ -198,7 +198,7 @@ ${LDFORGE_SOURCES} ${LDFORGE_HEADERS} ${LDFORGE_RESOURCES} - #${LDFORGE_QRC} + ${LDFORGE_QRC} #${LDFORGE_QM_RC_FILE} ${QM_FILES} ${LDFORGE_FORMS_HEADERS} diff -r 869fe95c4e5e -r 5bd755eaa5a8 LICENSE-ionicons --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/LICENSE-ionicons Sat Mar 05 12:42:14 2022 +0200 @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2015-present Ionic (http://ionic.io/) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff -r 869fe95c4e5e -r 5bd755eaa5a8 icons/chatbubble-ellipses-outline.png Binary file icons/chatbubble-ellipses-outline.png has changed diff -r 869fe95c4e5e -r 5bd755eaa5a8 icons/close.png Binary file icons/close.png has changed diff -r 869fe95c4e5e -r 5bd755eaa5a8 icons/cube-outline.png Binary file icons/cube-outline.png has changed diff -r 869fe95c4e5e -r 5bd755eaa5a8 icons/document-outline.png Binary file icons/document-outline.png has changed diff -r 869fe95c4e5e -r 5bd755eaa5a8 icons/folder-open-outline.png Binary file icons/folder-open-outline.png has changed diff -r 869fe95c4e5e -r 5bd755eaa5a8 icons/grid-outline.png Binary file icons/grid-outline.png has changed diff -r 869fe95c4e5e -r 5bd755eaa5a8 icons/linetype-conditionaledge.png Binary file icons/linetype-conditionaledge.png has changed diff -r 869fe95c4e5e -r 5bd755eaa5a8 icons/linetype-edgeline.png Binary file icons/linetype-edgeline.png has changed diff -r 869fe95c4e5e -r 5bd755eaa5a8 icons/linetype-errorline.png Binary file icons/linetype-errorline.png has changed diff -r 869fe95c4e5e -r 5bd755eaa5a8 icons/linetype-quadrilateral.png Binary file icons/linetype-quadrilateral.png has changed diff -r 869fe95c4e5e -r 5bd755eaa5a8 icons/linetype-subfile.png Binary file icons/linetype-subfile.png has changed diff -r 869fe95c4e5e -r 5bd755eaa5a8 icons/linetype-triangle.png Binary file icons/linetype-triangle.png has changed diff -r 869fe95c4e5e -r 5bd755eaa5a8 icons/pencil-outline.png Binary file icons/pencil-outline.png has changed diff -r 869fe95c4e5e -r 5bd755eaa5a8 icons/renderstyle-bfc.png Binary file icons/renderstyle-bfc.png has changed diff -r 869fe95c4e5e -r 5bd755eaa5a8 icons/renderstyle-normal.png Binary file icons/renderstyle-normal.png has changed diff -r 869fe95c4e5e -r 5bd755eaa5a8 icons/renderstyle-randomcolors.png Binary file icons/renderstyle-randomcolors.png has changed diff -r 869fe95c4e5e -r 5bd755eaa5a8 icons/renderstyle-wireframe.png Binary file icons/renderstyle-wireframe.png has changed diff -r 869fe95c4e5e -r 5bd755eaa5a8 icons/save-as-outline.png Binary file icons/save-as-outline.png has changed diff -r 869fe95c4e5e -r 5bd755eaa5a8 icons/save-outline.png Binary file icons/save-outline.png has changed diff -r 869fe95c4e5e -r 5bd755eaa5a8 icons/settings-outline.png Binary file icons/settings-outline.png has changed diff -r 869fe95c4e5e -r 5bd755eaa5a8 icons/stop-outline.png Binary file icons/stop-outline.png has changed diff -r 869fe95c4e5e -r 5bd755eaa5a8 icons/warning-outline.png Binary file icons/warning-outline.png has changed diff -r 869fe95c4e5e -r 5bd755eaa5a8 icons_svg/chatbubble-ellipses-outline.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/icons_svg/chatbubble-ellipses-outline.svg Sat Mar 05 12:42:14 2022 +0200 @@ -0,0 +1,71 @@ + + + + + + image/svg+xml + + + + + + + ionicons-v5-s + + + + + diff -r 869fe95c4e5e -r 5bd755eaa5a8 icons_svg/close.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/icons_svg/close.svg Sat Mar 05 12:42:14 2022 +0200 @@ -0,0 +1,1 @@ +ionicons-v5-m \ No newline at end of file diff -r 869fe95c4e5e -r 5bd755eaa5a8 icons_svg/cube-outline.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/icons_svg/cube-outline.svg Sat Mar 05 12:42:14 2022 +0200 @@ -0,0 +1,1 @@ +ionicons-v5-h \ No newline at end of file diff -r 869fe95c4e5e -r 5bd755eaa5a8 icons_svg/document-outline.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/icons_svg/document-outline.svg Sat Mar 05 12:42:14 2022 +0200 @@ -0,0 +1,72 @@ + + + + + + image/svg+xml + + + + + + + ionicons-v5-e + + + + + + diff -r 869fe95c4e5e -r 5bd755eaa5a8 icons_svg/folder-open-outline.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/icons_svg/folder-open-outline.svg Sat Mar 05 12:42:14 2022 +0200 @@ -0,0 +1,60 @@ + + + + + + image/svg+xml + + + + + + + ionicons-v5-n + + + diff -r 869fe95c4e5e -r 5bd755eaa5a8 icons_svg/grid-outline.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/icons_svg/grid-outline.svg Sat Mar 05 12:42:14 2022 +0200 @@ -0,0 +1,1 @@ +ionicons-v5-i \ No newline at end of file diff -r 869fe95c4e5e -r 5bd755eaa5a8 icons_svg/linetype-conditionaledge.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/icons_svg/linetype-conditionaledge.svg Sat Mar 05 12:42:14 2022 +0200 @@ -0,0 +1,79 @@ + + + + + + image/svg+xml + + ionicons-v5-d + + + + + + ionicons-v5-d + + + + + + + diff -r 869fe95c4e5e -r 5bd755eaa5a8 icons_svg/linetype-edgeline.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/icons_svg/linetype-edgeline.svg Sat Mar 05 12:42:14 2022 +0200 @@ -0,0 +1,70 @@ + + + + + + image/svg+xml + + ionicons-v5-d + + + + + + ionicons-v5-d + + + + diff -r 869fe95c4e5e -r 5bd755eaa5a8 icons_svg/linetype-errorline.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/icons_svg/linetype-errorline.svg Sat Mar 05 12:42:14 2022 +0200 @@ -0,0 +1,64 @@ + + + + + + image/svg+xml + + ionicons-v5-r + + + + + + ionicons-v5-r + + + + diff -r 869fe95c4e5e -r 5bd755eaa5a8 icons_svg/linetype-quadrilateral.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/icons_svg/linetype-quadrilateral.svg Sat Mar 05 12:42:14 2022 +0200 @@ -0,0 +1,58 @@ + + + + + + image/svg+xml + + ionicons-v5-c + + + + + + ionicons-v5-c + + diff -r 869fe95c4e5e -r 5bd755eaa5a8 icons_svg/linetype-subfile.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/icons_svg/linetype-subfile.svg Sat Mar 05 12:42:14 2022 +0200 @@ -0,0 +1,68 @@ + + + + + + image/svg+xml + + ionicons-v5-h + + + + + + ionicons-v5-h + + + + diff -r 869fe95c4e5e -r 5bd755eaa5a8 icons_svg/linetype-triangle.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/icons_svg/linetype-triangle.svg Sat Mar 05 12:42:14 2022 +0200 @@ -0,0 +1,57 @@ + + + + + + image/svg+xml + + ionicons-v5-q + + + + + + ionicons-v5-q + + diff -r 869fe95c4e5e -r 5bd755eaa5a8 icons_svg/pencil-outline.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/icons_svg/pencil-outline.svg Sat Mar 05 12:42:14 2022 +0200 @@ -0,0 +1,1 @@ +ionicons-v5-k \ No newline at end of file diff -r 869fe95c4e5e -r 5bd755eaa5a8 icons_svg/renderstyle-bfc.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/icons_svg/renderstyle-bfc.svg Sat Mar 05 12:42:14 2022 +0200 @@ -0,0 +1,80 @@ + + + + + + image/svg+xml + + ionicons-v5-h + + + + + + ionicons-v5-h + + + + + + + diff -r 869fe95c4e5e -r 5bd755eaa5a8 icons_svg/renderstyle-normal.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/icons_svg/renderstyle-normal.svg Sat Mar 05 12:42:14 2022 +0200 @@ -0,0 +1,68 @@ + + + + + + image/svg+xml + + ionicons-v5-h + + + + + + ionicons-v5-h + + + + diff -r 869fe95c4e5e -r 5bd755eaa5a8 icons_svg/renderstyle-randomcolors.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/icons_svg/renderstyle-randomcolors.svg Sat Mar 05 12:42:14 2022 +0200 @@ -0,0 +1,130 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + diff -r 869fe95c4e5e -r 5bd755eaa5a8 icons_svg/renderstyle-wireframe.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/icons_svg/renderstyle-wireframe.svg Sat Mar 05 12:42:14 2022 +0200 @@ -0,0 +1,80 @@ + + + + + + image/svg+xml + + ionicons-v5-h + + + + + + ionicons-v5-h + + + + + + diff -r 869fe95c4e5e -r 5bd755eaa5a8 icons_svg/save-as-outline.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/icons_svg/save-as-outline.svg Sat Mar 05 12:42:14 2022 +0200 @@ -0,0 +1,57 @@ + + + + + + image/svg+xml + + ionicons-v5-p + + + + + + ionicons-v5-p + + diff -r 869fe95c4e5e -r 5bd755eaa5a8 icons_svg/save-outline.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/icons_svg/save-outline.svg Sat Mar 05 12:42:14 2022 +0200 @@ -0,0 +1,56 @@ + + + + + + image/svg+xml + + + + + + + ionicons-v5-p + + diff -r 869fe95c4e5e -r 5bd755eaa5a8 icons_svg/settings-outline.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/icons_svg/settings-outline.svg Sat Mar 05 12:42:14 2022 +0200 @@ -0,0 +1,56 @@ + + + + + + image/svg+xml + + + + + + + ionicons-v5-q + + diff -r 869fe95c4e5e -r 5bd755eaa5a8 icons_svg/stop-outline.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/icons_svg/stop-outline.svg Sat Mar 05 12:42:14 2022 +0200 @@ -0,0 +1,1 @@ +ionicons-v5-c \ No newline at end of file diff -r 869fe95c4e5e -r 5bd755eaa5a8 icons_svg/warning-outline.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/icons_svg/warning-outline.svg Sat Mar 05 12:42:14 2022 +0200 @@ -0,0 +1,1 @@ +ionicons-v5-r \ No newline at end of file diff -r 869fe95c4e5e -r 5bd755eaa5a8 ldforge.qrc --- a/ldforge.qrc Sat Mar 05 00:51:23 2022 +0200 +++ b/ldforge.qrc Sat Mar 05 12:42:14 2022 +0200 @@ -3,5 +3,27 @@ flags/en.png flags/fi.png flags/sv.png + icons/renderstyle-bfc.png + icons/renderstyle-randomcolors.png + icons/chatbubble-ellipses-outline.png + icons/close.png + icons/cube-outline.png + icons/document-outline.png + icons/folder-open-outline.png + icons/linetype-quadrilateral.png + icons/linetype-subfile.png + icons/linetype-triangle.png + icons/save-outline.png + icons/settings-outline.png + icons/stop-outline.png + icons/renderstyle-normal.png + icons/renderstyle-wireframe.png + icons/save-as-outline.png + icons/grid-outline.png + icons/linetype-edgeline.png + icons/linetype-errorline.png + icons/pencil-outline.png + icons/warning-outline.png + icons/linetype-conditionaledge.png diff -r 869fe95c4e5e -r 5bd755eaa5a8 src/linetypes/conditionaledge.cpp --- a/src/linetypes/conditionaledge.cpp Sat Mar 05 00:51:23 2022 +0200 +++ b/src/linetypes/conditionaledge.cpp Sat Mar 05 12:42:14 2022 +0200 @@ -22,5 +22,10 @@ utility::vertexToString(this->points[0]), utility::vertexToString(this->points[1]), utility::vertexToString(this->points[2]), - utility::vertexToString(this->points[3])); + utility::vertexToString(this->points[3])); } + +QString ldraw::ConditionalEdge::iconName() const +{ + return ":/icons/linetype-conditionaledge.png"; +} diff -r 869fe95c4e5e -r 5bd755eaa5a8 src/linetypes/conditionaledge.h --- a/src/linetypes/conditionaledge.h Sat Mar 05 00:51:23 2022 +0200 +++ b/src/linetypes/conditionaledge.h Sat Mar 05 12:42:14 2022 +0200 @@ -13,4 +13,5 @@ QString textRepresentation() const override; Type typeIdentifier() const override; QString toLDrawCode() const override; + QString iconName() const override; }; diff -r 869fe95c4e5e -r 5bd755eaa5a8 src/linetypes/edge.cpp --- a/src/linetypes/edge.cpp Sat Mar 05 00:51:23 2022 +0200 +++ b/src/linetypes/edge.cpp Sat Mar 05 12:42:14 2022 +0200 @@ -27,5 +27,10 @@ "2 %1 %2 %3", this->colorIndex.index, utility::vertexToString(this->points[0]), - utility::vertexToString(this->points[1])); + utility::vertexToString(this->points[1])); } + +QString ldraw::Edge::iconName() const +{ + return ":/icons/linetype-edgeline.png"; +} diff -r 869fe95c4e5e -r 5bd755eaa5a8 src/linetypes/edge.h --- a/src/linetypes/edge.h Sat Mar 05 00:51:23 2022 +0200 +++ b/src/linetypes/edge.h Sat Mar 05 12:42:14 2022 +0200 @@ -14,4 +14,5 @@ void getPolygons(std::vector& polygons, GetPolygonsContext* context) const override; Type typeIdentifier() const override; QString toLDrawCode() const override; + QString iconName() const override; }; diff -r 869fe95c4e5e -r 5bd755eaa5a8 src/linetypes/errorline.cpp --- a/src/linetypes/errorline.cpp Sat Mar 05 00:51:23 2022 +0200 +++ b/src/linetypes/errorline.cpp Sat Mar 05 12:42:14 2022 +0200 @@ -61,3 +61,8 @@ { return this->text; } + +QString ldraw::ErrorLine::iconName() const +{ + return ":/icons/linetype-errorline.png"; +} diff -r 869fe95c4e5e -r 5bd755eaa5a8 src/linetypes/errorline.h --- a/src/linetypes/errorline.h Sat Mar 05 00:51:23 2022 +0200 +++ b/src/linetypes/errorline.h Sat Mar 05 12:42:14 2022 +0200 @@ -19,6 +19,7 @@ QDataStream& serialize(QDataStream& stream) const override; QDataStream& deserialize(QDataStream& stream) override; QString toLDrawCode() const override; + QString iconName() const override; QString text; QString message; protected: diff -r 869fe95c4e5e -r 5bd755eaa5a8 src/linetypes/metacommand.cpp --- a/src/linetypes/metacommand.cpp Sat Mar 05 00:51:23 2022 +0200 +++ b/src/linetypes/metacommand.cpp Sat Mar 05 12:42:14 2022 +0200 @@ -56,3 +56,8 @@ return "0 " + this->storedText; } +QString ldraw::MetaCommand::iconName() const +{ + return ":/icons/chatbubble-ellipses-outline.png"; +} + diff -r 869fe95c4e5e -r 5bd755eaa5a8 src/linetypes/metacommand.h --- a/src/linetypes/metacommand.h Sat Mar 05 00:51:23 2022 +0200 +++ b/src/linetypes/metacommand.h Sat Mar 05 12:42:14 2022 +0200 @@ -18,6 +18,7 @@ QDataStream& serialize(QDataStream& stream) const override; QDataStream& deserialize(QDataStream& stream) override; QString toLDrawCode() const override; + QString iconName() const override; protected: void setProperty(SetPropertyResult* result, const PropertyKeyValue& pair) override; }; diff -r 869fe95c4e5e -r 5bd755eaa5a8 src/linetypes/object.cpp --- a/src/linetypes/object.cpp Sat Mar 05 00:51:23 2022 +0200 +++ b/src/linetypes/object.cpp Sat Mar 05 12:42:14 2022 +0200 @@ -95,6 +95,11 @@ return stream; } +QString ldraw::Object::iconName() const +{ + return ""; +} + ldraw::ColoredObject::ColoredObject(const Color color_index) : colorIndex{color_index} { diff -r 869fe95c4e5e -r 5bd755eaa5a8 src/linetypes/object.h --- a/src/linetypes/object.h Sat Mar 05 00:51:23 2022 +0200 +++ b/src/linetypes/object.h Sat Mar 05 12:42:14 2022 +0200 @@ -79,6 +79,7 @@ virtual QDataStream& deserialize(QDataStream& stream); virtual Type typeIdentifier() const = 0; virtual QString toLDrawCode() const = 0; + virtual QString iconName() const; protected: template diff -r 869fe95c4e5e -r 5bd755eaa5a8 src/linetypes/quadrilateral.cpp --- a/src/linetypes/quadrilateral.cpp Sat Mar 05 00:51:23 2022 +0200 +++ b/src/linetypes/quadrilateral.cpp Sat Mar 05 12:42:14 2022 +0200 @@ -43,5 +43,10 @@ utility::vertexToString(this->points[0]), utility::vertexToString(this->points[1]), utility::vertexToString(this->points[2]), - utility::vertexToString(this->points[3])); + utility::vertexToString(this->points[3])); } + +QString ldraw::Quadrilateral::iconName() const +{ + return ":/icons/linetype-quadrilateral.png"; +} diff -r 869fe95c4e5e -r 5bd755eaa5a8 src/linetypes/quadrilateral.h --- a/src/linetypes/quadrilateral.h Sat Mar 05 00:51:23 2022 +0200 +++ b/src/linetypes/quadrilateral.h Sat Mar 05 12:42:14 2022 +0200 @@ -15,4 +15,5 @@ void invert() override; Type typeIdentifier() const override; QString toLDrawCode() const override; + QString iconName() const override; }; diff -r 869fe95c4e5e -r 5bd755eaa5a8 src/linetypes/subfilereference.cpp --- a/src/linetypes/subfilereference.cpp Sat Mar 05 00:51:23 2022 +0200 +++ b/src/linetypes/subfilereference.cpp Sat Mar 05 12:42:14 2022 +0200 @@ -138,3 +138,8 @@ this->referenceName); return result; } + +QString ldraw::SubfileReference::iconName() const +{ + return ":/icons/linetype-subfile.png"; +} diff -r 869fe95c4e5e -r 5bd755eaa5a8 src/linetypes/subfilereference.h --- a/src/linetypes/subfilereference.h Sat Mar 05 00:51:23 2022 +0200 +++ b/src/linetypes/subfilereference.h Sat Mar 05 12:42:14 2022 +0200 @@ -26,6 +26,7 @@ QDataStream& serialize(QDataStream& stream) const override; QDataStream& deserialize(QDataStream& stream) override; QString toLDrawCode() const override; + QString iconName() const override; glm::mat4 transformation; QString referenceName; bool isInverted = false; diff -r 869fe95c4e5e -r 5bd755eaa5a8 src/linetypes/triangle.cpp --- a/src/linetypes/triangle.cpp Sat Mar 05 00:51:23 2022 +0200 +++ b/src/linetypes/triangle.cpp Sat Mar 05 12:42:14 2022 +0200 @@ -40,5 +40,10 @@ this->colorIndex.index, utility::vertexToString(this->points[0]), utility::vertexToString(this->points[1]), - utility::vertexToString(this->points[2])); + utility::vertexToString(this->points[2])); } + +QString ldraw::Triangle::iconName() const +{ + return ":/icons/linetype-triangle.png"; +} diff -r 869fe95c4e5e -r 5bd755eaa5a8 src/linetypes/triangle.h --- a/src/linetypes/triangle.h Sat Mar 05 00:51:23 2022 +0200 +++ b/src/linetypes/triangle.h Sat Mar 05 12:42:14 2022 +0200 @@ -15,5 +15,6 @@ void invert() override; Type typeIdentifier() const override; QString toLDrawCode() const override; + QString iconName() const override; }; diff -r 869fe95c4e5e -r 5bd755eaa5a8 src/main.cpp --- a/src/main.cpp Sat Mar 05 00:51:23 2022 +0200 +++ b/src/main.cpp Sat Mar 05 12:42:14 2022 +0200 @@ -21,6 +21,9 @@ #include "version.h" #include #include +#include +#include +#include int main(int argc, char *argv[]) { diff -r 869fe95c4e5e -r 5bd755eaa5a8 src/mainwindow.ui --- a/src/mainwindow.ui Sat Mar 05 00:51:23 2022 +0200 +++ b/src/mainwindow.ui Sat Mar 05 12:42:14 2022 +0200 @@ -26,7 +26,7 @@ 0 0 800 - 32 + 35 @@ -63,12 +63,49 @@ + + + toolBar + + + TopToolBarArea + + + false + + + + + + + + + toolBar + + + TopToolBarArea + + + false + + + + + + + + :/icons/close.png:/icons/close.png + Quit + + + :/icons/folder-open-outline.png:/icons/folder-open-outline.png + Open… @@ -77,6 +114,10 @@ + + + :/icons/document-outline.png:/icons/document-outline.png + New @@ -85,6 +126,10 @@ + + + :/icons/settings-outline.png:/icons/settings-outline.png + Preferences… @@ -93,6 +138,10 @@ true + + + :/icons/renderstyle-normal.png:/icons/renderstyle-normal.png + Normal colours @@ -101,6 +150,10 @@ true + + + :/icons/renderstyle-bfc.png:/icons/renderstyle-bfc.png + BFC color coding @@ -109,6 +162,10 @@ true + + + :/icons/renderstyle-randomcolors.png:/icons/renderstyle-randomcolors.png + Random colours @@ -130,6 +187,10 @@ + + + :/icons/save-outline.png:/icons/save-outline.png + Save @@ -138,6 +199,10 @@ + + + :/icons/save-as-outline.png:/icons/save-as-outline.png + Save as… @@ -146,6 +211,8 @@ - + + + diff -r 869fe95c4e5e -r 5bd755eaa5a8 src/model.cpp --- a/src/model.cpp Sat Mar 05 00:51:23 2022 +0200 +++ b/src/model.cpp Sat Mar 05 12:42:14 2022 +0200 @@ -79,6 +79,8 @@ const ldraw::Object* object = (*this)[index.row()]; switch(role) { + case Qt::DecorationRole: + return QPixmap{object->iconName()}.scaledToHeight(24); case Qt::DisplayRole: return object->textRepresentation(); case Qt::ForegroundRole: diff -r 869fe95c4e5e -r 5bd755eaa5a8 svg-to-png.sh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/svg-to-png.sh Sat Mar 05 12:42:14 2022 +0200 @@ -0,0 +1,8 @@ +#!/bin/bash +mkdir --parents icons +for svgfile in $(find icons_svg -name '*.svg') +do + pngfile="icons/$(basename ${svgfile%.svg}.png)" + echo "$svgfile => $pngfile" + convert -background none "${svgfile}" "${pngfile}" +done