From 8e5e1e710a5e6194e06c0ab80fb4ad6095169019 Mon Sep 17 00:00:00 2001 From: wmayer Date: Mon, 24 Oct 2011 09:29:55 +0000 Subject: [PATCH] + icon for shape builder command git-svn-id: https://free-cad.svn.sourceforge.net/svnroot/free-cad/trunk@5057 e8eeb9e2-ec13-0410-a4a9-efa5cf37419d --- src/Mod/Part/Gui/Command.cpp | 3 +- src/Mod/Part/Gui/Makefile.am | 6 + src/Mod/Part/Gui/Resources/Part.qrc | 4 +- .../Resources/icons/Part_CreatePrimitives.png | Bin 0 -> 3368 bytes .../Gui/Resources/icons/Part_Shapebuilder.png | Bin 0 -> 2370 bytes .../Gui/Resources/icons/Part_Shapebuilder.svg | 329 ++++++++++++++++++ src/Mod/Part/Gui/TaskShapeBuilder.cpp | 4 +- 7 files changed, 343 insertions(+), 3 deletions(-) create mode 100644 src/Mod/Part/Gui/Resources/icons/Part_CreatePrimitives.png create mode 100644 src/Mod/Part/Gui/Resources/icons/Part_Shapebuilder.png create mode 100644 src/Mod/Part/Gui/Resources/icons/Part_Shapebuilder.svg diff --git a/src/Mod/Part/Gui/Command.cpp b/src/Mod/Part/Gui/Command.cpp index 37be52474..2c5c49b13 100644 --- a/src/Mod/Part/Gui/Command.cpp +++ b/src/Mod/Part/Gui/Command.cpp @@ -203,7 +203,7 @@ CmdPartPrimitives::CmdPartPrimitives() sToolTipText = QT_TR_NOOP("Creation of parametrized geometric primitives"); sWhatsThis = "Part_Primitives"; sStatusTip = sToolTipText; - sPixmap = "Part_CreatePrimitives"; + sPixmap = "Part_CreatePrimitives.png"; } void CmdPartPrimitives::activated(int iMsg) @@ -890,6 +890,7 @@ CmdPartBuilder::CmdPartBuilder() sToolTipText = QT_TR_NOOP("Advanced utility to create shapes"); sWhatsThis = sToolTipText; sStatusTip = sToolTipText; + sPixmap = "Part_Shapebuilder"; } void CmdPartBuilder::activated(int iMsg) diff --git a/src/Mod/Part/Gui/Makefile.am b/src/Mod/Part/Gui/Makefile.am index c277b56ca..7329a30ab 100644 --- a/src/Mod/Part/Gui/Makefile.am +++ b/src/Mod/Part/Gui/Makefile.am @@ -191,6 +191,8 @@ EXTRA_DIST = \ Resources/icons/Part_Chamfer.svg \ Resources/icons/Part_Cut.svg \ Resources/icons/Part_Common.svg \ + Resources/icons/Part_CreatePrimitives.png \ + Resources/icons/Part_CreatePrimitives.svg \ Resources/icons/Part_Fuse.svg \ Resources/icons/Part_Section.svg \ Resources/icons/Part_Extrude.svg \ @@ -199,6 +201,10 @@ EXTRA_DIST = \ Resources/icons/Part_Import.svg \ Resources/icons/Part_Mirror.svg \ Resources/icons/Part_MirrorPNG.png \ + Resources/icons/Part_RuledSurface.png \ + Resources/icons/Part_Shapebuilder.png \ + Resources/icons/Part_Shapebuilder.svg \ + Resources/icons/Part_ShapeInfo.png \ Resources/icons/Tree_Part.svg \ Resources/icons/preferences-part_design.svg \ Resources/icons/PartFeature.svg \ diff --git a/src/Mod/Part/Gui/Resources/Part.qrc b/src/Mod/Part/Gui/Resources/Part.qrc index 644540054..213e2c47a 100644 --- a/src/Mod/Part/Gui/Resources/Part.qrc +++ b/src/Mod/Part/Gui/Resources/Part.qrc @@ -9,7 +9,8 @@ icons/Part_Common.svg icons/Part_Cone.svg icons/Part_Cut.svg - icons/Part_CreatePrimitives.svg + icons/Part_CreatePrimitives.png + icons/Part_CreatePrimitives.svg icons/Part_Cylinder.svg icons/Part_Extrude.svg icons/Part_Fillet.svg @@ -20,6 +21,7 @@ icons/Part_Revolve.svg icons/Part_RuledSurface.svg icons/Part_Section.svg + icons/Part_Shapebuilder.png icons/Part_ShapeInfo.svg icons/Part_Sphere.svg icons/Part_Torus.svg diff --git a/src/Mod/Part/Gui/Resources/icons/Part_CreatePrimitives.png b/src/Mod/Part/Gui/Resources/icons/Part_CreatePrimitives.png new file mode 100644 index 0000000000000000000000000000000000000000..a4d4cc809e1203bc02d2f4e22811f2202c898ded GIT binary patch literal 3368 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 literal 0 HcmV?d00001 diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Shapebuilder.svg b/src/Mod/Part/Gui/Resources/icons/Part_Shapebuilder.svg new file mode 100644 index 000000000..a70a9ea18 --- /dev/null +++ b/src/Mod/Part/Gui/Resources/icons/Part_Shapebuilder.svg @@ -0,0 +1,329 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Part/Gui/TaskShapeBuilder.cpp b/src/Mod/Part/Gui/TaskShapeBuilder.cpp index 1171940d4..a3c2f3bfa 100644 --- a/src/Mod/Part/Gui/TaskShapeBuilder.cpp +++ b/src/Mod/Part/Gui/TaskShapeBuilder.cpp @@ -36,6 +36,7 @@ #include "ViewProviderExt.h" #include +#include #include #include #include @@ -379,7 +380,8 @@ TaskShapeBuilder::TaskShapeBuilder() { widget = new ShapeBuilderWidget(); taskbox = new Gui::TaskView::TaskBox( - QPixmap(), widget->windowTitle(), true, 0); + Gui::BitmapFactory().pixmap("Part_Shapebuilder"), + widget->windowTitle(), true, 0); taskbox->groupLayout()->addWidget(widget); Content.push_back(taskbox); }