From 3b671bf4a5c874177fdecb571eb8909a0330385f Mon Sep 17 00:00:00 2001 From: vocx-fc Date: Mon, 5 Oct 2020 19:06:44 -0500 Subject: [PATCH] Part: move icons to booleans 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/BOPTools/JoinFeatures.py | 2 +- src/Mod/Part/BOPTools/SplitFeatures.py | 2 +- src/Mod/Part/CompoundTools/CompoundFilter.py | 3 +- .../CompoundTools/_CommandCompoundFilter.py | 2 +- .../CompoundTools/_CommandExplodeCompound.py | 2 +- src/Mod/Part/Gui/AppPartGui.cpp | 1 + src/Mod/Part/Gui/Resources/Part.qrc | 40 ++++++++++--------- .../{ => booleans}/Part_BooleanFragments.svg | 0 .../icons/{ => booleans}/Part_Booleans.svg | 0 .../{ => booleans}/Part_CheckGeometry.svg | 0 .../icons/{ => booleans}/Part_Common.svg | 0 .../icons/{ => booleans}/Part_Compound.svg | 0 .../{ => booleans}/Part_CompoundFilter.svg | 0 .../{ => booleans}/Part_CrossSections.svg | 0 .../icons/{ => booleans}/Part_Cut.svg | 0 .../icons/{ => booleans}/Part_Defeaturing.svg | 0 .../{ => booleans}/Part_ExplodeCompound.svg | 0 .../icons/{ => booleans}/Part_Fuse.svg | 0 .../icons/{ => booleans}/Part_JoinBypass.svg | 0 .../icons/{ => booleans}/Part_JoinConnect.svg | 0 .../icons/{ => booleans}/Part_JoinCutout.svg | 0 .../icons/{ => booleans}/Part_JoinEmbed.svg | 0 .../icons/{ => booleans}/Part_Section.svg | 0 .../icons/{ => booleans}/Part_Slice.svg | 0 .../icons/{ => booleans}/Part_SliceApart.svg | 0 .../icons/{ => booleans}/Part_XOR.svg | 0 26 files changed, 28 insertions(+), 24 deletions(-) rename src/Mod/Part/Gui/Resources/icons/{ => booleans}/Part_BooleanFragments.svg (100%) rename src/Mod/Part/Gui/Resources/icons/{ => booleans}/Part_Booleans.svg (100%) rename src/Mod/Part/Gui/Resources/icons/{ => booleans}/Part_CheckGeometry.svg (100%) rename src/Mod/Part/Gui/Resources/icons/{ => booleans}/Part_Common.svg (100%) rename src/Mod/Part/Gui/Resources/icons/{ => booleans}/Part_Compound.svg (100%) rename src/Mod/Part/Gui/Resources/icons/{ => booleans}/Part_CompoundFilter.svg (100%) rename src/Mod/Part/Gui/Resources/icons/{ => booleans}/Part_CrossSections.svg (100%) rename src/Mod/Part/Gui/Resources/icons/{ => booleans}/Part_Cut.svg (100%) rename src/Mod/Part/Gui/Resources/icons/{ => booleans}/Part_Defeaturing.svg (100%) rename src/Mod/Part/Gui/Resources/icons/{ => booleans}/Part_ExplodeCompound.svg (100%) rename src/Mod/Part/Gui/Resources/icons/{ => booleans}/Part_Fuse.svg (100%) rename src/Mod/Part/Gui/Resources/icons/{ => booleans}/Part_JoinBypass.svg (100%) rename src/Mod/Part/Gui/Resources/icons/{ => booleans}/Part_JoinConnect.svg (100%) rename src/Mod/Part/Gui/Resources/icons/{ => booleans}/Part_JoinCutout.svg (100%) rename src/Mod/Part/Gui/Resources/icons/{ => booleans}/Part_JoinEmbed.svg (100%) rename src/Mod/Part/Gui/Resources/icons/{ => booleans}/Part_Section.svg (100%) rename src/Mod/Part/Gui/Resources/icons/{ => booleans}/Part_Slice.svg (100%) rename src/Mod/Part/Gui/Resources/icons/{ => booleans}/Part_SliceApart.svg (100%) rename src/Mod/Part/Gui/Resources/icons/{ => booleans}/Part_XOR.svg (100%) diff --git a/src/Mod/Part/BOPTools/JoinFeatures.py b/src/Mod/Part/BOPTools/JoinFeatures.py index 5acd104e1a..3370219144 100644 --- a/src/Mod/Part/BOPTools/JoinFeatures.py +++ b/src/Mod/Part/BOPTools/JoinFeatures.py @@ -100,7 +100,7 @@ def cmdCreateJoinFeature(name, mode): FreeCAD.ActiveDocument.commitTransaction() def getIconPath(icon_dot_svg): - return ":/icons/" + icon_dot_svg + return icon_dot_svg # -------------------------- /common stuff -------------------------------------------------- diff --git a/src/Mod/Part/BOPTools/SplitFeatures.py b/src/Mod/Part/BOPTools/SplitFeatures.py index 2d1ee347b7..c7bcc41433 100644 --- a/src/Mod/Part/BOPTools/SplitFeatures.py +++ b/src/Mod/Part/BOPTools/SplitFeatures.py @@ -51,7 +51,7 @@ if FreeCAD.GuiUp: #--------------------------/translation-related code ---------------------------------------- def getIconPath(icon_dot_svg): - return ":/icons/" + icon_dot_svg + return icon_dot_svg # -------------------------- /common stuff -------------------------------------------------- diff --git a/src/Mod/Part/CompoundTools/CompoundFilter.py b/src/Mod/Part/CompoundTools/CompoundFilter.py index c8d52fda78..96d835f74b 100644 --- a/src/Mod/Part/CompoundTools/CompoundFilter.py +++ b/src/Mod/Part/CompoundTools/CompoundFilter.py @@ -185,7 +185,7 @@ class _ViewProviderCompoundFilter: vobj.setEditorMode("DontUnhideOnDelete", 2) # set hidden def getIcon(self): - return ":/icons/Part_CompoundFilter.svg" + return "Part_CompoundFilter" def attach(self, vobj): self.ViewObject = vobj @@ -240,3 +240,4 @@ def getNullShapeShape(scale=1.0): if scale != 1.0: ret = _nullShapeShape.copy() ret.scale(scale) + diff --git a/src/Mod/Part/CompoundTools/_CommandCompoundFilter.py b/src/Mod/Part/CompoundTools/_CommandCompoundFilter.py index 5d358999bb..2e50d6e160 100644 --- a/src/Mod/Part/CompoundTools/_CommandCompoundFilter.py +++ b/src/Mod/Part/CompoundTools/_CommandCompoundFilter.py @@ -53,7 +53,7 @@ if FreeCAD.GuiUp: class _CommandCompoundFilter: "Command to create CompoundFilter feature" def GetResources(self): - return {'Pixmap': ":/icons/Part_CompoundFilter.svg", + return {'Pixmap': "Part_CompoundFilter", 'MenuText': QtCore.QT_TRANSLATE_NOOP("Part_CompoundFilter", "Compound Filter"), 'Accel': "", 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Part_CompoundFilter", "Compound Filter: remove some childs from a compound")} diff --git a/src/Mod/Part/CompoundTools/_CommandExplodeCompound.py b/src/Mod/Part/CompoundTools/_CommandExplodeCompound.py index e0480807af..8485548c3a 100644 --- a/src/Mod/Part/CompoundTools/_CommandExplodeCompound.py +++ b/src/Mod/Part/CompoundTools/_CommandExplodeCompound.py @@ -52,7 +52,7 @@ if FreeCAD.GuiUp: class _CommandExplodeCompound: "Command to explode a compound" def GetResources(self): - return {'Pixmap': ":/icons/Part_ExplodeCompound.svg", + return {'Pixmap': "Part_ExplodeCompound", 'MenuText': QtCore.QT_TRANSLATE_NOOP("Part_ExplodeCompound", "Explode compound"), 'Accel': "", 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Part_ExplodeCompound", "Explode compound: split up a list of shapes into separate objects")} diff --git a/src/Mod/Part/Gui/AppPartGui.cpp b/src/Mod/Part/Gui/AppPartGui.cpp index 5c6e9e6495..e5e08fd3a5 100644 --- a/src/Mod/Part/Gui/AppPartGui.cpp +++ b/src/Mod/Part/Gui/AppPartGui.cpp @@ -125,6 +125,7 @@ PyMOD_INIT_FUNC(PartGui) Base::Console().Log("Loading GUI of Part module... done\n"); + Gui::BitmapFactory().addPath(QString::fromLatin1(":/icons/booleans")); Gui::BitmapFactory().addPath(QString::fromLatin1(":/icons/create")); Gui::BitmapFactory().addPath(QString::fromLatin1(":/icons/tools")); diff --git a/src/Mod/Part/Gui/Resources/Part.qrc b/src/Mod/Part/Gui/Resources/Part.qrc index 64a837a6e4..b6b13755b2 100644 --- a/src/Mod/Part/Gui/Resources/Part.qrc +++ b/src/Mod/Part/Gui/Resources/Part.qrc @@ -1,4 +1,25 @@ + + icons/booleans/Part_BooleanFragments.svg + icons/booleans/Part_Booleans.svg + icons/booleans/Part_CheckGeometry.svg + icons/booleans/Part_Common.svg + icons/booleans/Part_Compound.svg + icons/booleans/Part_CompoundFilter.svg + icons/booleans/Part_CrossSections.svg + icons/booleans/Part_Cut.svg + icons/booleans/Part_Defeaturing.svg + icons/booleans/Part_ExplodeCompound.svg + icons/booleans/Part_Fuse.svg + icons/booleans/Part_JoinBypass.svg + icons/booleans/Part_JoinConnect.svg + icons/booleans/Part_JoinCutout.svg + icons/booleans/Part_JoinEmbed.svg + icons/booleans/Part_Section.svg + icons/booleans/Part_Slice.svg + icons/booleans/Part_SliceApart.svg + icons/booleans/Part_XOR.svg + icons/create/Part_Box.svg icons/create/Part_Cone.svg @@ -25,30 +46,15 @@ icons/Part_Attachment.svg - icons/Part_BooleanFragments.svg - icons/Part_Booleans.svg icons/Part_BoxSelection.svg - icons/Part_CheckGeometry.svg icons/Part_Circle_Parametric.svg - icons/Part_Common.svg - icons/Part_Compound.svg - icons/Part_CompoundFilter.svg - icons/Part_CrossSections.svg - icons/Part_Cut.svg - icons/Part_Defeaturing.svg icons/Part_Element_Copy.svg icons/Part_Ellipse_Parametric.svg - icons/Part_ExplodeCompound.svg icons/Part_Export.svg icons/Part_Feature.svg icons/Part_FeatureImport.svg - icons/Part_Fuse.svg icons/Part_Helix_Parametric.svg icons/Part_Import.svg - icons/Part_JoinBypass.svg - icons/Part_JoinConnect.svg - icons/Part_JoinCutout.svg - icons/Part_JoinEmbed.svg icons/Part_Line_Parametric.svg icons/Part_Measure_Angular.svg icons/Part_Measure_Linear.svg @@ -62,16 +68,12 @@ icons/Part_Polygon_Parametric.svg icons/Part_Refine_Shape.svg icons/Part_Reverse_Shape.svg - icons/Part_Section.svg icons/Part_Shape_from_Mesh.svg icons/Part_ShapeInfo.svg - icons/Part_Slice.svg - icons/Part_SliceApart.svg icons/Part_Spiral_Parametric.svg icons/Part_Spline_Parametric.svg icons/Part_Transformed_Copy.svg icons/PartWorkbench.svg - icons/Part_XOR.svg icons/preferences-part_design.svg icons/Tree_Part.svg icons/Tree_Part2D.svg diff --git a/src/Mod/Part/Gui/Resources/icons/Part_BooleanFragments.svg b/src/Mod/Part/Gui/Resources/icons/booleans/Part_BooleanFragments.svg similarity index 100% rename from src/Mod/Part/Gui/Resources/icons/Part_BooleanFragments.svg rename to src/Mod/Part/Gui/Resources/icons/booleans/Part_BooleanFragments.svg diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Booleans.svg b/src/Mod/Part/Gui/Resources/icons/booleans/Part_Booleans.svg similarity index 100% rename from src/Mod/Part/Gui/Resources/icons/Part_Booleans.svg rename to src/Mod/Part/Gui/Resources/icons/booleans/Part_Booleans.svg diff --git a/src/Mod/Part/Gui/Resources/icons/Part_CheckGeometry.svg b/src/Mod/Part/Gui/Resources/icons/booleans/Part_CheckGeometry.svg similarity index 100% rename from src/Mod/Part/Gui/Resources/icons/Part_CheckGeometry.svg rename to src/Mod/Part/Gui/Resources/icons/booleans/Part_CheckGeometry.svg diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Common.svg b/src/Mod/Part/Gui/Resources/icons/booleans/Part_Common.svg similarity index 100% rename from src/Mod/Part/Gui/Resources/icons/Part_Common.svg rename to src/Mod/Part/Gui/Resources/icons/booleans/Part_Common.svg diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Compound.svg b/src/Mod/Part/Gui/Resources/icons/booleans/Part_Compound.svg similarity index 100% rename from src/Mod/Part/Gui/Resources/icons/Part_Compound.svg rename to src/Mod/Part/Gui/Resources/icons/booleans/Part_Compound.svg diff --git a/src/Mod/Part/Gui/Resources/icons/Part_CompoundFilter.svg b/src/Mod/Part/Gui/Resources/icons/booleans/Part_CompoundFilter.svg similarity index 100% rename from src/Mod/Part/Gui/Resources/icons/Part_CompoundFilter.svg rename to src/Mod/Part/Gui/Resources/icons/booleans/Part_CompoundFilter.svg diff --git a/src/Mod/Part/Gui/Resources/icons/Part_CrossSections.svg b/src/Mod/Part/Gui/Resources/icons/booleans/Part_CrossSections.svg similarity index 100% rename from src/Mod/Part/Gui/Resources/icons/Part_CrossSections.svg rename to src/Mod/Part/Gui/Resources/icons/booleans/Part_CrossSections.svg diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Cut.svg b/src/Mod/Part/Gui/Resources/icons/booleans/Part_Cut.svg similarity index 100% rename from src/Mod/Part/Gui/Resources/icons/Part_Cut.svg rename to src/Mod/Part/Gui/Resources/icons/booleans/Part_Cut.svg diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Defeaturing.svg b/src/Mod/Part/Gui/Resources/icons/booleans/Part_Defeaturing.svg similarity index 100% rename from src/Mod/Part/Gui/Resources/icons/Part_Defeaturing.svg rename to src/Mod/Part/Gui/Resources/icons/booleans/Part_Defeaturing.svg diff --git a/src/Mod/Part/Gui/Resources/icons/Part_ExplodeCompound.svg b/src/Mod/Part/Gui/Resources/icons/booleans/Part_ExplodeCompound.svg similarity index 100% rename from src/Mod/Part/Gui/Resources/icons/Part_ExplodeCompound.svg rename to src/Mod/Part/Gui/Resources/icons/booleans/Part_ExplodeCompound.svg diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Fuse.svg b/src/Mod/Part/Gui/Resources/icons/booleans/Part_Fuse.svg similarity index 100% rename from src/Mod/Part/Gui/Resources/icons/Part_Fuse.svg rename to src/Mod/Part/Gui/Resources/icons/booleans/Part_Fuse.svg diff --git a/src/Mod/Part/Gui/Resources/icons/Part_JoinBypass.svg b/src/Mod/Part/Gui/Resources/icons/booleans/Part_JoinBypass.svg similarity index 100% rename from src/Mod/Part/Gui/Resources/icons/Part_JoinBypass.svg rename to src/Mod/Part/Gui/Resources/icons/booleans/Part_JoinBypass.svg diff --git a/src/Mod/Part/Gui/Resources/icons/Part_JoinConnect.svg b/src/Mod/Part/Gui/Resources/icons/booleans/Part_JoinConnect.svg similarity index 100% rename from src/Mod/Part/Gui/Resources/icons/Part_JoinConnect.svg rename to src/Mod/Part/Gui/Resources/icons/booleans/Part_JoinConnect.svg diff --git a/src/Mod/Part/Gui/Resources/icons/Part_JoinCutout.svg b/src/Mod/Part/Gui/Resources/icons/booleans/Part_JoinCutout.svg similarity index 100% rename from src/Mod/Part/Gui/Resources/icons/Part_JoinCutout.svg rename to src/Mod/Part/Gui/Resources/icons/booleans/Part_JoinCutout.svg diff --git a/src/Mod/Part/Gui/Resources/icons/Part_JoinEmbed.svg b/src/Mod/Part/Gui/Resources/icons/booleans/Part_JoinEmbed.svg similarity index 100% rename from src/Mod/Part/Gui/Resources/icons/Part_JoinEmbed.svg rename to src/Mod/Part/Gui/Resources/icons/booleans/Part_JoinEmbed.svg diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Section.svg b/src/Mod/Part/Gui/Resources/icons/booleans/Part_Section.svg similarity index 100% rename from src/Mod/Part/Gui/Resources/icons/Part_Section.svg rename to src/Mod/Part/Gui/Resources/icons/booleans/Part_Section.svg diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Slice.svg b/src/Mod/Part/Gui/Resources/icons/booleans/Part_Slice.svg similarity index 100% rename from src/Mod/Part/Gui/Resources/icons/Part_Slice.svg rename to src/Mod/Part/Gui/Resources/icons/booleans/Part_Slice.svg diff --git a/src/Mod/Part/Gui/Resources/icons/Part_SliceApart.svg b/src/Mod/Part/Gui/Resources/icons/booleans/Part_SliceApart.svg similarity index 100% rename from src/Mod/Part/Gui/Resources/icons/Part_SliceApart.svg rename to src/Mod/Part/Gui/Resources/icons/booleans/Part_SliceApart.svg diff --git a/src/Mod/Part/Gui/Resources/icons/Part_XOR.svg b/src/Mod/Part/Gui/Resources/icons/booleans/Part_XOR.svg similarity index 100% rename from src/Mod/Part/Gui/Resources/icons/Part_XOR.svg rename to src/Mod/Part/Gui/Resources/icons/booleans/Part_XOR.svg