From db91c6f424576de6c62a618188b49ee75d0789bb Mon Sep 17 00:00:00 2001 From: vocx-fc Date: Mon, 5 Oct 2020 18:27:16 -0500 Subject: [PATCH] Part: move icons to tools 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. --- src/Mod/Part/Gui/AppPartGui.cpp | 1 + src/Mod/Part/Gui/Resources/Part.qrc | 26 ++++++++++--------- .../icons/{ => tools}/Part_Chamfer.svg | 0 .../icons/{ => tools}/Part_Extrude.svg | 0 .../icons/{ => tools}/Part_Fillet.svg | 0 .../Resources/icons/{ => tools}/Part_Loft.svg | 0 .../icons/{ => tools}/Part_Mirror.svg | 0 .../icons/{ => tools}/Part_Offset.svg | 0 .../icons/{ => tools}/Part_Offset2D.svg | 0 .../{ => tools}/Part_ProjectionOnSurface.svg | 0 .../icons/{ => tools}/Part_Revolve.svg | 0 .../icons/{ => tools}/Part_RuledSurface.svg | 0 .../icons/{ => tools}/Part_Sweep.svg | 0 .../icons/{ => tools}/Part_Thickness.svg | 0 14 files changed, 15 insertions(+), 12 deletions(-) rename src/Mod/Part/Gui/Resources/icons/{ => tools}/Part_Chamfer.svg (100%) rename src/Mod/Part/Gui/Resources/icons/{ => tools}/Part_Extrude.svg (100%) rename src/Mod/Part/Gui/Resources/icons/{ => tools}/Part_Fillet.svg (100%) rename src/Mod/Part/Gui/Resources/icons/{ => tools}/Part_Loft.svg (100%) rename src/Mod/Part/Gui/Resources/icons/{ => tools}/Part_Mirror.svg (100%) rename src/Mod/Part/Gui/Resources/icons/{ => tools}/Part_Offset.svg (100%) rename src/Mod/Part/Gui/Resources/icons/{ => tools}/Part_Offset2D.svg (100%) rename src/Mod/Part/Gui/Resources/icons/{ => tools}/Part_ProjectionOnSurface.svg (100%) rename src/Mod/Part/Gui/Resources/icons/{ => tools}/Part_Revolve.svg (100%) rename src/Mod/Part/Gui/Resources/icons/{ => tools}/Part_RuledSurface.svg (100%) rename src/Mod/Part/Gui/Resources/icons/{ => tools}/Part_Sweep.svg (100%) rename src/Mod/Part/Gui/Resources/icons/{ => tools}/Part_Thickness.svg (100%) diff --git a/src/Mod/Part/Gui/AppPartGui.cpp b/src/Mod/Part/Gui/AppPartGui.cpp index 1dce561897..5c6e9e6495 100644 --- a/src/Mod/Part/Gui/AppPartGui.cpp +++ b/src/Mod/Part/Gui/AppPartGui.cpp @@ -126,6 +126,7 @@ PyMOD_INIT_FUNC(PartGui) Base::Console().Log("Loading GUI of Part module... done\n"); Gui::BitmapFactory().addPath(QString::fromLatin1(":/icons/create")); + Gui::BitmapFactory().addPath(QString::fromLatin1(":/icons/tools")); #if PY_MAJOR_VERSION >= 3 static struct PyModuleDef pAttachEngineTextsModuleDef = { diff --git a/src/Mod/Part/Gui/Resources/Part.qrc b/src/Mod/Part/Gui/Resources/Part.qrc index 06a284800f..64a837a6e4 100644 --- a/src/Mod/Part/Gui/Resources/Part.qrc +++ b/src/Mod/Part/Gui/Resources/Part.qrc @@ -9,12 +9,25 @@ icons/create/Part_Torus.svg icons/create/Part_Tube.svg + + icons/tools/Part_Chamfer.svg + icons/tools/Part_Extrude.svg + icons/tools/Part_Fillet.svg + icons/tools/Part_Loft.svg + icons/tools/Part_Mirror.svg + icons/tools/Part_Offset.svg + icons/tools/Part_Offset2D.svg + icons/tools/Part_ProjectionOnSurface.svg + icons/tools/Part_Revolve.svg + icons/tools/Part_RuledSurface.svg + icons/tools/Part_Sweep.svg + icons/tools/Part_Thickness.svg + icons/Part_Attachment.svg icons/Part_BooleanFragments.svg icons/Part_Booleans.svg icons/Part_BoxSelection.svg - icons/Part_Chamfer.svg icons/Part_CheckGeometry.svg icons/Part_Circle_Parametric.svg icons/Part_Common.svg @@ -27,10 +40,8 @@ icons/Part_Ellipse_Parametric.svg icons/Part_ExplodeCompound.svg icons/Part_Export.svg - icons/Part_Extrude.svg icons/Part_Feature.svg icons/Part_FeatureImport.svg - icons/Part_Fillet.svg icons/Part_Fuse.svg icons/Part_Helix_Parametric.svg icons/Part_Import.svg @@ -39,7 +50,6 @@ icons/Part_JoinCutout.svg icons/Part_JoinEmbed.svg icons/Part_Line_Parametric.svg - icons/Part_Loft.svg icons/Part_Measure_Angular.svg icons/Part_Measure_Linear.svg icons/Part_Measure_Refresh.svg @@ -47,17 +57,11 @@ icons/Part_Measure_Step_Done.svg icons/Part_Measure_Toggle_3d.svg icons/Part_Measure_Toggle_Delta.svg - icons/Part_Mirror.svg - icons/Part_Offset.svg - icons/Part_Offset2D.svg icons/Part_Point_Parametric.svg icons/Part_Points_from_Mesh.svg icons/Part_Polygon_Parametric.svg - icons/Part_ProjectionOnSurface.svg icons/Part_Refine_Shape.svg icons/Part_Reverse_Shape.svg - icons/Part_Revolve.svg - icons/Part_RuledSurface.svg icons/Part_Section.svg icons/Part_Shape_from_Mesh.svg icons/Part_ShapeInfo.svg @@ -65,8 +69,6 @@ icons/Part_SliceApart.svg icons/Part_Spiral_Parametric.svg icons/Part_Spline_Parametric.svg - icons/Part_Sweep.svg - icons/Part_Thickness.svg icons/Part_Transformed_Copy.svg icons/PartWorkbench.svg icons/Part_XOR.svg diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Chamfer.svg b/src/Mod/Part/Gui/Resources/icons/tools/Part_Chamfer.svg similarity index 100% rename from src/Mod/Part/Gui/Resources/icons/Part_Chamfer.svg rename to src/Mod/Part/Gui/Resources/icons/tools/Part_Chamfer.svg diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Extrude.svg b/src/Mod/Part/Gui/Resources/icons/tools/Part_Extrude.svg similarity index 100% rename from src/Mod/Part/Gui/Resources/icons/Part_Extrude.svg rename to src/Mod/Part/Gui/Resources/icons/tools/Part_Extrude.svg diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Fillet.svg b/src/Mod/Part/Gui/Resources/icons/tools/Part_Fillet.svg similarity index 100% rename from src/Mod/Part/Gui/Resources/icons/Part_Fillet.svg rename to src/Mod/Part/Gui/Resources/icons/tools/Part_Fillet.svg diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Loft.svg b/src/Mod/Part/Gui/Resources/icons/tools/Part_Loft.svg similarity index 100% rename from src/Mod/Part/Gui/Resources/icons/Part_Loft.svg rename to src/Mod/Part/Gui/Resources/icons/tools/Part_Loft.svg diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Mirror.svg b/src/Mod/Part/Gui/Resources/icons/tools/Part_Mirror.svg similarity index 100% rename from src/Mod/Part/Gui/Resources/icons/Part_Mirror.svg rename to src/Mod/Part/Gui/Resources/icons/tools/Part_Mirror.svg diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Offset.svg b/src/Mod/Part/Gui/Resources/icons/tools/Part_Offset.svg similarity index 100% rename from src/Mod/Part/Gui/Resources/icons/Part_Offset.svg rename to src/Mod/Part/Gui/Resources/icons/tools/Part_Offset.svg diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Offset2D.svg b/src/Mod/Part/Gui/Resources/icons/tools/Part_Offset2D.svg similarity index 100% rename from src/Mod/Part/Gui/Resources/icons/Part_Offset2D.svg rename to src/Mod/Part/Gui/Resources/icons/tools/Part_Offset2D.svg diff --git a/src/Mod/Part/Gui/Resources/icons/Part_ProjectionOnSurface.svg b/src/Mod/Part/Gui/Resources/icons/tools/Part_ProjectionOnSurface.svg similarity index 100% rename from src/Mod/Part/Gui/Resources/icons/Part_ProjectionOnSurface.svg rename to src/Mod/Part/Gui/Resources/icons/tools/Part_ProjectionOnSurface.svg diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Revolve.svg b/src/Mod/Part/Gui/Resources/icons/tools/Part_Revolve.svg similarity index 100% rename from src/Mod/Part/Gui/Resources/icons/Part_Revolve.svg rename to src/Mod/Part/Gui/Resources/icons/tools/Part_Revolve.svg diff --git a/src/Mod/Part/Gui/Resources/icons/Part_RuledSurface.svg b/src/Mod/Part/Gui/Resources/icons/tools/Part_RuledSurface.svg similarity index 100% rename from src/Mod/Part/Gui/Resources/icons/Part_RuledSurface.svg rename to src/Mod/Part/Gui/Resources/icons/tools/Part_RuledSurface.svg diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Sweep.svg b/src/Mod/Part/Gui/Resources/icons/tools/Part_Sweep.svg similarity index 100% rename from src/Mod/Part/Gui/Resources/icons/Part_Sweep.svg rename to src/Mod/Part/Gui/Resources/icons/tools/Part_Sweep.svg diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Thickness.svg b/src/Mod/Part/Gui/Resources/icons/tools/Part_Thickness.svg similarity index 100% rename from src/Mod/Part/Gui/Resources/icons/Part_Thickness.svg rename to src/Mod/Part/Gui/Resources/icons/tools/Part_Thickness.svg