From 4b50102f6c221b6a4bdd0e11226271cef1897b27 Mon Sep 17 00:00:00 2001 From: vocx-fc Date: Mon, 5 Oct 2020 17:33:51 -0500 Subject: [PATCH] Part: move icons to create subdirectory The path to the icons is added to `AppPartGui.cpp` using `Gui::BitmapFactory().addPath()`, so the icons are found automatically in their new directories. Rename icon `Part_CreatePrimitives.svg` to `Part_Primitives.svg`. --- src/Mod/Part/BasicShapes/Shapes.py | 3 ++- src/Mod/Part/Gui/AppPartGui.cpp | 2 ++ src/Mod/Part/Gui/Command.cpp | 2 +- src/Mod/Part/Gui/Resources/Part.qrc | 18 ++++++++++-------- .../Resources/icons/{ => create}/Part_Box.svg | 0 .../Resources/icons/{ => create}/Part_Cone.svg | 0 .../icons/{ => create}/Part_Cylinder.svg | 0 .../Part_Primitives.svg} | 0 .../icons/{ => create}/Part_Shapebuilder.svg | 0 .../icons/{ => create}/Part_Sphere.svg | 0 .../icons/{ => create}/Part_Torus.svg | 0 .../Resources/icons/{ => create}/Part_Tube.svg | 0 12 files changed, 15 insertions(+), 10 deletions(-) rename src/Mod/Part/Gui/Resources/icons/{ => create}/Part_Box.svg (100%) rename src/Mod/Part/Gui/Resources/icons/{ => create}/Part_Cone.svg (100%) rename src/Mod/Part/Gui/Resources/icons/{ => create}/Part_Cylinder.svg (100%) rename src/Mod/Part/Gui/Resources/icons/{Part_CreatePrimitives.svg => create/Part_Primitives.svg} (100%) rename src/Mod/Part/Gui/Resources/icons/{ => create}/Part_Shapebuilder.svg (100%) rename src/Mod/Part/Gui/Resources/icons/{ => create}/Part_Sphere.svg (100%) rename src/Mod/Part/Gui/Resources/icons/{ => create}/Part_Torus.svg (100%) rename src/Mod/Part/Gui/Resources/icons/{ => create}/Part_Tube.svg (100%) diff --git a/src/Mod/Part/BasicShapes/Shapes.py b/src/Mod/Part/BasicShapes/Shapes.py index 0c1aed5b8a..4af89d40fd 100644 --- a/src/Mod/Part/BasicShapes/Shapes.py +++ b/src/Mod/Part/BasicShapes/Shapes.py @@ -85,7 +85,7 @@ if FreeCAD.GuiUp: return {'MenuText': Qt.QT_TRANSLATE_NOOP("Part_Tube","Create tube"), 'Accel': "", 'CmdType': "AlterDoc:Alter3DView:AlterSelection", - 'Pixmap': ":/icons/Part_Tube.svg", + 'Pixmap': "Part_Tube", 'ToolTip': Qt.QT_TRANSLATE_NOOP("Part_Tube","Creates a tube")} def Activated(self): @@ -101,3 +101,4 @@ if FreeCAD.GuiUp: FreeCADGui.addCommand('Part_Tube', CommandTube()) + diff --git a/src/Mod/Part/Gui/AppPartGui.cpp b/src/Mod/Part/Gui/AppPartGui.cpp index 8210da42b9..1dce561897 100644 --- a/src/Mod/Part/Gui/AppPartGui.cpp +++ b/src/Mod/Part/Gui/AppPartGui.cpp @@ -125,6 +125,8 @@ PyMOD_INIT_FUNC(PartGui) Base::Console().Log("Loading GUI of Part module... done\n"); + Gui::BitmapFactory().addPath(QString::fromLatin1(":/icons/create")); + #if PY_MAJOR_VERSION >= 3 static struct PyModuleDef pAttachEngineTextsModuleDef = { PyModuleDef_HEAD_INIT, diff --git a/src/Mod/Part/Gui/Command.cpp b/src/Mod/Part/Gui/Command.cpp index dec5cec6e3..a180b7e4f6 100644 --- a/src/Mod/Part/Gui/Command.cpp +++ b/src/Mod/Part/Gui/Command.cpp @@ -220,7 +220,7 @@ CmdPartPrimitives::CmdPartPrimitives() sToolTipText = QT_TR_NOOP("Creation of parametrized geometric primitives"); sWhatsThis = "Part_Primitives"; sStatusTip = sToolTipText; - sPixmap = "Part_CreatePrimitives"; + sPixmap = "Part_Primitives"; } void CmdPartPrimitives::activated(int iMsg) diff --git a/src/Mod/Part/Gui/Resources/Part.qrc b/src/Mod/Part/Gui/Resources/Part.qrc index a79abe5a14..06a284800f 100644 --- a/src/Mod/Part/Gui/Resources/Part.qrc +++ b/src/Mod/Part/Gui/Resources/Part.qrc @@ -1,9 +1,18 @@ + + icons/create/Part_Box.svg + icons/create/Part_Cone.svg + icons/create/Part_Cylinder.svg + icons/create/Part_Primitives.svg + icons/create/Part_Shapebuilder.svg + icons/create/Part_Sphere.svg + icons/create/Part_Torus.svg + icons/create/Part_Tube.svg + icons/Part_Attachment.svg icons/Part_BooleanFragments.svg icons/Part_Booleans.svg - icons/Part_Box.svg icons/Part_BoxSelection.svg icons/Part_Chamfer.svg icons/Part_CheckGeometry.svg @@ -11,11 +20,8 @@ icons/Part_Common.svg icons/Part_Compound.svg icons/Part_CompoundFilter.svg - icons/Part_Cone.svg - icons/Part_CreatePrimitives.svg icons/Part_CrossSections.svg icons/Part_Cut.svg - icons/Part_Cylinder.svg icons/Part_Defeaturing.svg icons/Part_Element_Copy.svg icons/Part_Ellipse_Parametric.svg @@ -53,19 +59,15 @@ icons/Part_Revolve.svg icons/Part_RuledSurface.svg icons/Part_Section.svg - icons/Part_Shapebuilder.svg icons/Part_Shape_from_Mesh.svg icons/Part_ShapeInfo.svg icons/Part_Slice.svg icons/Part_SliceApart.svg - icons/Part_Sphere.svg icons/Part_Spiral_Parametric.svg icons/Part_Spline_Parametric.svg icons/Part_Sweep.svg icons/Part_Thickness.svg - icons/Part_Torus.svg icons/Part_Transformed_Copy.svg - icons/Part_Tube.svg icons/PartWorkbench.svg icons/Part_XOR.svg icons/preferences-part_design.svg diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Box.svg b/src/Mod/Part/Gui/Resources/icons/create/Part_Box.svg similarity index 100% rename from src/Mod/Part/Gui/Resources/icons/Part_Box.svg rename to src/Mod/Part/Gui/Resources/icons/create/Part_Box.svg diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Cone.svg b/src/Mod/Part/Gui/Resources/icons/create/Part_Cone.svg similarity index 100% rename from src/Mod/Part/Gui/Resources/icons/Part_Cone.svg rename to src/Mod/Part/Gui/Resources/icons/create/Part_Cone.svg diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Cylinder.svg b/src/Mod/Part/Gui/Resources/icons/create/Part_Cylinder.svg similarity index 100% rename from src/Mod/Part/Gui/Resources/icons/Part_Cylinder.svg rename to src/Mod/Part/Gui/Resources/icons/create/Part_Cylinder.svg diff --git a/src/Mod/Part/Gui/Resources/icons/Part_CreatePrimitives.svg b/src/Mod/Part/Gui/Resources/icons/create/Part_Primitives.svg similarity index 100% rename from src/Mod/Part/Gui/Resources/icons/Part_CreatePrimitives.svg rename to src/Mod/Part/Gui/Resources/icons/create/Part_Primitives.svg diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Shapebuilder.svg b/src/Mod/Part/Gui/Resources/icons/create/Part_Shapebuilder.svg similarity index 100% rename from src/Mod/Part/Gui/Resources/icons/Part_Shapebuilder.svg rename to src/Mod/Part/Gui/Resources/icons/create/Part_Shapebuilder.svg diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Sphere.svg b/src/Mod/Part/Gui/Resources/icons/create/Part_Sphere.svg similarity index 100% rename from src/Mod/Part/Gui/Resources/icons/Part_Sphere.svg rename to src/Mod/Part/Gui/Resources/icons/create/Part_Sphere.svg diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Torus.svg b/src/Mod/Part/Gui/Resources/icons/create/Part_Torus.svg similarity index 100% rename from src/Mod/Part/Gui/Resources/icons/Part_Torus.svg rename to src/Mod/Part/Gui/Resources/icons/create/Part_Torus.svg diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Tube.svg b/src/Mod/Part/Gui/Resources/icons/create/Part_Tube.svg similarity index 100% rename from src/Mod/Part/Gui/Resources/icons/Part_Tube.svg rename to src/Mod/Part/Gui/Resources/icons/create/Part_Tube.svg