From f662357537b89e302d9e57852a6e5d760f907945 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Althaus?= Date: Fri, 17 May 2024 09:09:46 +0200 Subject: [PATCH 1/6] Change PartDesign Pad and Revolution tree icons Use the same icons as the toolbar buttons. --- .../PartDesign/Gui/Resources/PartDesign.qrc | 2 - .../Resources/icons/Tree_PartDesign_Pad.svg | 143 ------------------ .../icons/Tree_PartDesign_Revolution.svg | 125 --------------- src/Mod/PartDesign/Gui/ViewProviderPad.cpp | 2 +- .../PartDesign/Gui/ViewProviderRevolution.cpp | 2 +- 5 files changed, 2 insertions(+), 272 deletions(-) delete mode 100644 src/Mod/PartDesign/Gui/Resources/icons/Tree_PartDesign_Pad.svg delete mode 100644 src/Mod/PartDesign/Gui/Resources/icons/Tree_PartDesign_Revolution.svg diff --git a/src/Mod/PartDesign/Gui/Resources/PartDesign.qrc b/src/Mod/PartDesign/Gui/Resources/PartDesign.qrc index fcfb16c4f9..5b16e198f1 100644 --- a/src/Mod/PartDesign/Gui/Resources/PartDesign.qrc +++ b/src/Mod/PartDesign/Gui/Resources/PartDesign.qrc @@ -59,7 +59,5 @@ icons/PartDesign_SubtractiveWedge.svg icons/PartDesign_Thickness.svg icons/PartDesignWorkbench.svg - icons/Tree_PartDesign_Pad.svg - icons/Tree_PartDesign_Revolution.svg diff --git a/src/Mod/PartDesign/Gui/Resources/icons/Tree_PartDesign_Pad.svg b/src/Mod/PartDesign/Gui/Resources/icons/Tree_PartDesign_Pad.svg deleted file mode 100644 index c136fa332e..0000000000 --- a/src/Mod/PartDesign/Gui/Resources/icons/Tree_PartDesign_Pad.svg +++ /dev/null @@ -1,143 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - [jmaustpc] - - - Tree_PartDesign_Pad - 2013-03-17 - https://www.freecad.org/wiki/index.php?title=Artwork - - - FreeCAD - - - FreeCAD/src/Mod/PartDesign/Gui/Resources/icons/Tree_PartDesign_Pad.svg - - - FreeCAD LGPL2+ - - - https://www.gnu.org/copyleft/lesser.html - - - [agryson] Alexander Gryson - - - - - - - - - - - - - - - - - diff --git a/src/Mod/PartDesign/Gui/Resources/icons/Tree_PartDesign_Revolution.svg b/src/Mod/PartDesign/Gui/Resources/icons/Tree_PartDesign_Revolution.svg deleted file mode 100644 index 243eaaabc2..0000000000 --- a/src/Mod/PartDesign/Gui/Resources/icons/Tree_PartDesign_Revolution.svg +++ /dev/null @@ -1,125 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - [jmaustpc] - - - Tree_PartDesign_Revolution - 2013-03-17 - https://www.freecad.org/wiki/index.php?title=Artwork - - - FreeCAD - - - FreeCAD/src/Mod/PartDesign/Gui/Resources/icons/Tree_PartDesign_Revolution.svg - - - FreeCAD LGPL2+ - - - https://www.gnu.org/copyleft/lesser.html - - - [agryson] Alexander Gryson - - - - - - - - - - - - - - diff --git a/src/Mod/PartDesign/Gui/ViewProviderPad.cpp b/src/Mod/PartDesign/Gui/ViewProviderPad.cpp index 0fbbd8e519..1d538990fd 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderPad.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderPad.cpp @@ -36,7 +36,7 @@ PROPERTY_SOURCE(PartDesignGui::ViewProviderPad,PartDesignGui::ViewProviderSketch ViewProviderPad::ViewProviderPad() { - sPixmap = "Tree_PartDesign_Pad.svg"; + sPixmap = "PartDesign_Pad.svg"; } ViewProviderPad::~ViewProviderPad() = default; diff --git a/src/Mod/PartDesign/Gui/ViewProviderRevolution.cpp b/src/Mod/PartDesign/Gui/ViewProviderRevolution.cpp index 1187d00eb9..30cea1cf29 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderRevolution.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderRevolution.cpp @@ -36,7 +36,7 @@ PROPERTY_SOURCE(PartDesignGui::ViewProviderRevolution,PartDesignGui::ViewProvide ViewProviderRevolution::ViewProviderRevolution() { - sPixmap = "Tree_PartDesign_Revolution.svg"; + sPixmap = "PartDesign_Revolution.svg"; } ViewProviderRevolution::~ViewProviderRevolution() = default; From 86a865e7e0396d3710ca65dc45334a2e5baf0e7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Althaus?= Date: Sat, 18 May 2024 19:01:20 +0200 Subject: [PATCH 2/6] Make "Sketch" in Pad icon red In other icons the support geometry is red and this mirrors the other icons --- .../Gui/Resources/icons/PartDesign_Pad.svg | 379 +++++++++++++----- 1 file changed, 277 insertions(+), 102 deletions(-) diff --git a/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Pad.svg b/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Pad.svg index d606170165..457542341a 100644 --- a/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Pad.svg +++ b/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Pad.svg @@ -1,114 +1,264 @@ - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + - - - - - + + + + - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - + + + + - - - - + + + - - - - - - - - - - - + + + - - - - - + + + + - - - - - + + + + - - - + + + - - - - + - + image/svg+xml - - + [wmayer] @@ -137,15 +287,40 @@ - - - - - - - - - + + + + + + + + + From 9b4c4ce60c4994dab42f79cc39cec5168c56b234 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Althaus?= Date: Sat, 18 May 2024 19:26:48 +0200 Subject: [PATCH 3/6] Replace the yellow Part primitive toolbar icons with the blue tree icons --- src/Mod/Part/BasicShapes/CommandShapes.py | 2 +- src/Mod/Part/Gui/Command.cpp | 6 +- src/Mod/Part/Gui/CommandParametric.cpp | 10 +- src/Mod/Part/Gui/CommandSimple.cpp | 2 +- src/Mod/Part/Gui/Resources/Part.qrc | 6 - .../Gui/Resources/icons/create/Part_Box.svg | 70 -------- .../Gui/Resources/icons/create/Part_Cone.svg | 62 ------- .../Resources/icons/create/Part_Cylinder.svg | 65 -------- .../Resources/icons/create/Part_Sphere.svg | 71 -------- .../Gui/Resources/icons/create/Part_Torus.svg | 104 ------------ .../Gui/Resources/icons/create/Part_Tube.svg | 152 ------------------ src/Mod/PartDesign/Gui/Workbench.cpp | 24 +-- src/Mod/TemplatePyMod/TaskPanel.py | 2 +- 13 files changed, 23 insertions(+), 553 deletions(-) delete mode 100644 src/Mod/Part/Gui/Resources/icons/create/Part_Box.svg delete mode 100644 src/Mod/Part/Gui/Resources/icons/create/Part_Cone.svg delete mode 100644 src/Mod/Part/Gui/Resources/icons/create/Part_Cylinder.svg delete mode 100644 src/Mod/Part/Gui/Resources/icons/create/Part_Sphere.svg delete mode 100644 src/Mod/Part/Gui/Resources/icons/create/Part_Torus.svg delete mode 100644 src/Mod/Part/Gui/Resources/icons/create/Part_Tube.svg diff --git a/src/Mod/Part/BasicShapes/CommandShapes.py b/src/Mod/Part/BasicShapes/CommandShapes.py index 03c776f427..8c0086b531 100644 --- a/src/Mod/Part/BasicShapes/CommandShapes.py +++ b/src/Mod/Part/BasicShapes/CommandShapes.py @@ -44,7 +44,7 @@ class CommandTube: return {'MenuText': Qt.QT_TRANSLATE_NOOP("Part_Tube","Create tube"), 'Accel': "", 'CmdType': "AlterDoc:Alter3DView:AlterSelection", - 'Pixmap': "Part_Tube", + 'Pixmap': "Part_Tube_Parametric", 'ToolTip': Qt.QT_TRANSLATE_NOOP("Part_Tube","Creates a tube")} def Activated(self): diff --git a/src/Mod/Part/Gui/Command.cpp b/src/Mod/Part/Gui/Command.cpp index 422daa40da..4290cf30c7 100644 --- a/src/Mod/Part/Gui/Command.cpp +++ b/src/Mod/Part/Gui/Command.cpp @@ -131,7 +131,7 @@ CmdPartBox2::CmdPartBox2() sToolTipText = QT_TR_NOOP("Create a box solid without dialog"); sWhatsThis = "Part_Box2"; sStatusTip = sToolTipText; - sPixmap = "Part_Box"; + sPixmap = "Part_Box_Parametric"; } void CmdPartBox2::activated(int iMsg) @@ -172,7 +172,7 @@ CmdPartBox3::CmdPartBox3() sToolTipText = QT_TR_NOOP("Create a box solid without dialog"); sWhatsThis = "Part_Box3"; sStatusTip = sToolTipText; - sPixmap = "Part_Box"; + sPixmap = "Part_Box_Parametric"; } void CmdPartBox3::activated(int iMsg) @@ -1059,7 +1059,7 @@ CmdPartImportCurveNet::CmdPartImportCurveNet() sToolTipText= QT_TR_NOOP("Import a curve network"); sWhatsThis = "Part_ImportCurveNet"; sStatusTip = sToolTipText; - sPixmap = "Part_Box"; + sPixmap = "Part_Box_Parametric"; } void CmdPartImportCurveNet::activated(int iMsg) diff --git a/src/Mod/Part/Gui/CommandParametric.cpp b/src/Mod/Part/Gui/CommandParametric.cpp index 815b69617e..262f611597 100644 --- a/src/Mod/Part/Gui/CommandParametric.cpp +++ b/src/Mod/Part/Gui/CommandParametric.cpp @@ -66,7 +66,7 @@ CmdPartCylinder::CmdPartCylinder() sToolTipText = QT_TR_NOOP("Create a Cylinder"); sWhatsThis = "Part_Cylinder"; sStatusTip = sToolTipText; - sPixmap = "Part_Cylinder"; + sPixmap = "Part_Cylinder_Parametric"; } void CmdPartCylinder::activated(int iMsg) @@ -108,7 +108,7 @@ CmdPartBox::CmdPartBox() sToolTipText = QT_TR_NOOP("Create a cube solid"); sWhatsThis = "Part_Box"; sStatusTip = sToolTipText; - sPixmap = "Part_Box"; + sPixmap = "Part_Box_Parametric"; } void CmdPartBox::activated(int iMsg) @@ -150,7 +150,7 @@ CmdPartSphere::CmdPartSphere() sToolTipText = QT_TR_NOOP("Create a sphere solid"); sWhatsThis = "Part_Sphere"; sStatusTip = sToolTipText; - sPixmap = "Part_Sphere"; + sPixmap = "Part_Sphere_Parametric"; } void CmdPartSphere::activated(int iMsg) @@ -192,7 +192,7 @@ CmdPartCone::CmdPartCone() sToolTipText = QT_TR_NOOP("Create a cone solid"); sWhatsThis = "Part_Cone"; sStatusTip = sToolTipText; - sPixmap = "Part_Cone"; + sPixmap = "Part_Cone_Parametric"; } void CmdPartCone::activated(int iMsg) @@ -234,7 +234,7 @@ CmdPartTorus::CmdPartTorus() sToolTipText = QT_TR_NOOP("Create a torus solid"); sWhatsThis = "Part_Torus"; sStatusTip = sToolTipText; - sPixmap = "Part_Torus"; + sPixmap = "Part_Torus_Parametric"; } void CmdPartTorus::activated(int iMsg) diff --git a/src/Mod/Part/Gui/CommandSimple.cpp b/src/Mod/Part/Gui/CommandSimple.cpp index 16e9936fe0..fb156b524d 100644 --- a/src/Mod/Part/Gui/CommandSimple.cpp +++ b/src/Mod/Part/Gui/CommandSimple.cpp @@ -57,7 +57,7 @@ CmdPartSimpleCylinder::CmdPartSimpleCylinder() sToolTipText = QT_TR_NOOP("Create a Cylinder"); sWhatsThis = "Part_SimpleCylinder"; sStatusTip = sToolTipText; - sPixmap = "Part_Cylinder"; + sPixmap = "Part_Cylinder_Parametric"; } void CmdPartSimpleCylinder::activated(int iMsg) diff --git a/src/Mod/Part/Gui/Resources/Part.qrc b/src/Mod/Part/Gui/Resources/Part.qrc index e4b86645ea..d9cdb30c36 100644 --- a/src/Mod/Part/Gui/Resources/Part.qrc +++ b/src/Mod/Part/Gui/Resources/Part.qrc @@ -21,14 +21,8 @@ icons/booleans/Part_XOR.svg - 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/parametric/Part_Box_Parametric.svg diff --git a/src/Mod/Part/Gui/Resources/icons/create/Part_Box.svg b/src/Mod/Part/Gui/Resources/icons/create/Part_Box.svg deleted file mode 100644 index 35d69df517..0000000000 --- a/src/Mod/Part/Gui/Resources/icons/create/Part_Box.svg +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - [wmayer] - - - Part_Box - 2011-10-10 - https://www.freecad.org/wiki/index.php?title=Artwork - - - FreeCAD - - - FreeCAD/src/Mod/Part/Gui/Resources/icons/Part_Box.svg - - - FreeCAD LGPL2+ - - - https://www.gnu.org/copyleft/lesser.html - - - [agryson] Alexander Gryson - - - - - - - - - - - - - diff --git a/src/Mod/Part/Gui/Resources/icons/create/Part_Cone.svg b/src/Mod/Part/Gui/Resources/icons/create/Part_Cone.svg deleted file mode 100644 index 10f8f5990e..0000000000 --- a/src/Mod/Part/Gui/Resources/icons/create/Part_Cone.svg +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - [wmayer] - - - Part_Cone - 2011-10-10 - https://www.freecad.org/wiki/index.php?title=Artwork - - - FreeCAD - - - FreeCAD/src/Mod/Part/Gui/Resources/icons/Part_Cone.svg - - - FreeCAD LGPL2+ - - - https://www.gnu.org/copyleft/lesser.html - - - [agryson] Alexander Gryson - - - - - - - - - - diff --git a/src/Mod/Part/Gui/Resources/icons/create/Part_Cylinder.svg b/src/Mod/Part/Gui/Resources/icons/create/Part_Cylinder.svg deleted file mode 100644 index 005992a355..0000000000 --- a/src/Mod/Part/Gui/Resources/icons/create/Part_Cylinder.svg +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - [wmayer] - - - Part_Cylinder - 2011-10-10 - https://www.freecad.org/wiki/index.php?title=Artwork - - - FreeCAD - - - FreeCAD/src/Mod/Part/Gui/Resources/icons/Part_Cylinder.svg - - - FreeCAD LGPL2+ - - - https://www.gnu.org/copyleft/lesser.html - - - [agryson] Alexander Gryson - - - - - - - - - - - - diff --git a/src/Mod/Part/Gui/Resources/icons/create/Part_Sphere.svg b/src/Mod/Part/Gui/Resources/icons/create/Part_Sphere.svg deleted file mode 100644 index 39a603b566..0000000000 --- a/src/Mod/Part/Gui/Resources/icons/create/Part_Sphere.svg +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - [wmayer] - - - Part_Sphere - 2011-10-10 - https://www.freecad.org/wiki/index.php?title=Artwork - - - FreeCAD - - - FreeCAD/src/Mod/Part/Gui/Resources/icons/Part_Sphere.svg - - - FreeCAD LGPL2+ - - - https://www.gnu.org/copyleft/lesser.html - - - [agryson] Alexander Gryson - - - - - - - - - - - diff --git a/src/Mod/Part/Gui/Resources/icons/create/Part_Torus.svg b/src/Mod/Part/Gui/Resources/icons/create/Part_Torus.svg deleted file mode 100644 index ee69daf84e..0000000000 --- a/src/Mod/Part/Gui/Resources/icons/create/Part_Torus.svg +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - [wmayer] - - - Part_Torus - 2011-10-10 - https://www.freecad.org/wiki/index.php?title=Artwork - - - FreeCAD - - - FreeCAD/src/Mod/Part/Gui/Resources/icons/Part_Torus.svg - - - FreeCAD LGPL2+ - - - https://www.gnu.org/copyleft/lesser.html - - - [agryson] Alexander Gryson - - - - - - - - - - diff --git a/src/Mod/Part/Gui/Resources/icons/create/Part_Tube.svg b/src/Mod/Part/Gui/Resources/icons/create/Part_Tube.svg deleted file mode 100644 index 62fbe9c215..0000000000 --- a/src/Mod/Part/Gui/Resources/icons/create/Part_Tube.svg +++ /dev/null @@ -1,152 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - [wmayer] - - - - 2011-10-10 - https://www.freecad.org/wiki/index.php?title=Artwork - - - FreeCAD - - - FreeCAD/src/Mod/Part/Gui/Resources/icons/Part_Cylinder.svg - - - FreeCAD LGPL2+ - - - https://www.gnu.org/copyleft/lesser.html - - - [agryson] Alexander Gryson - - - - - - - - - - - - - diff --git a/src/Mod/PartDesign/Gui/Workbench.cpp b/src/Mod/PartDesign/Gui/Workbench.cpp index 539f856705..d65f7f3913 100644 --- a/src/Mod/PartDesign/Gui/Workbench.cpp +++ b/src/Mod/PartDesign/Gui/Workbench.cpp @@ -279,7 +279,7 @@ void Workbench::activated() "SELECT Part::Feature SUBELEMENT Vertex COUNT 1..", Vertex, "Vertex tools", - "Part_Box" + "Part_Box_Parametric" )); const char* Edge[] = { @@ -294,7 +294,7 @@ void Workbench::activated() "SELECT Part::Feature SUBELEMENT Edge COUNT 1..", Edge, "Edge tools", - "Part_Box" + "Part_Box_Parametric" )); const char* Face[] = { @@ -312,7 +312,7 @@ void Workbench::activated() "SELECT Part::Feature SUBELEMENT Face COUNT 1", Face, "Face tools", - "Part_Box" + "Part_Box_Parametric" )); const char* Body[] = { @@ -322,7 +322,7 @@ void Workbench::activated() "SELECT PartDesign::Body COUNT 1", Body, "Start Body", - "Part_Box" + "Part_Box_Parametric" )); const char* Body2[] = { @@ -332,7 +332,7 @@ void Workbench::activated() "SELECT PartDesign::Body COUNT 1..", Body2, "Start Boolean", - "Part_Box" + "Part_Box_Parametric" )); const char* Plane1[] = { @@ -346,7 +346,7 @@ void Workbench::activated() "SELECT App::Plane COUNT 1", Plane1, "Start Part", - "Part_Box" + "Part_Box_Parametric" )); const char* Plane2[] = { "PartDesign_NewSketch", @@ -359,7 +359,7 @@ void Workbench::activated() "SELECT PartDesign::Plane COUNT 1", Plane2, "Start Part", - "Part_Box" + "Part_Box_Parametric" )); const char* Line[] = { @@ -371,7 +371,7 @@ void Workbench::activated() "SELECT PartDesign::Line COUNT 1", Line, "Start Part", - "Part_Box" + "Part_Box_Parametric" )); const char* Point[] = { @@ -384,7 +384,7 @@ void Workbench::activated() "SELECT PartDesign::Point COUNT 1", Point, "Start Part", - "Part_Box" + "Part_Box_Parametric" )); const char* NoSel[] = { @@ -393,7 +393,7 @@ void Workbench::activated() Watcher.push_back(new Gui::TaskView::TaskWatcherCommandsEmptySelection( NoSel, "Start Part", - "Part_Box" + "Part_Box_Parametric" )); const char* Faces[] = { @@ -406,7 +406,7 @@ void Workbench::activated() "SELECT Part::Feature SUBELEMENT Face COUNT 2..", Faces, "Face tools", - "Part_Box" + "Part_Box_Parametric" )); const char* Sketch[] = { @@ -427,7 +427,7 @@ void Workbench::activated() "SELECT Sketcher::SketchObject COUNT 1", Sketch, "Sketch tools", - "Part_Box" + "Part_Box_Parametric" )); const char* Transformed[] = { diff --git a/src/Mod/TemplatePyMod/TaskPanel.py b/src/Mod/TemplatePyMod/TaskPanel.py index cc8e301aaa..f18b1167aa 100644 --- a/src/Mod/TemplatePyMod/TaskPanel.py +++ b/src/Mod/TemplatePyMod/TaskPanel.py @@ -30,7 +30,7 @@ class TaskWatcherFilter: self.commands = ["Sketcher_NewSketch", "PartDesign_Fillet", "PartDesign_Chamfer"] self.filter = "SELECT Part::Feature SUBELEMENT Face COUNT 1" self.title = "Face tools" - self.icon = "Part_Box" + self.icon = "Part_Box_Parametric" class TaskPanel: def __init__(self): From 234bad1d0b32845a9cda7ed9fcf41fc01ce592ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Althaus?= Date: Sun, 19 May 2024 12:12:33 +0200 Subject: [PATCH 4/6] Replace remaining yellow Part icons with blue ones --- .../icons/create/Part_Primitives.svg | 444 ++++++++++--- .../icons/create/Part_Shapebuilder.svg | 594 +++++++++++++++--- 2 files changed, 875 insertions(+), 163 deletions(-) diff --git a/src/Mod/Part/Gui/Resources/icons/create/Part_Primitives.svg b/src/Mod/Part/Gui/Resources/icons/create/Part_Primitives.svg index 92860972c3..0554e7a470 100644 --- a/src/Mod/Part/Gui/Resources/icons/create/Part_Primitives.svg +++ b/src/Mod/Part/Gui/Resources/icons/create/Part_Primitives.svg @@ -1,75 +1,311 @@ - - - - - - + + + + + + - - - + + + - - - + + + - - - - - + + + - - - - - - + + + - - - - + + + + + - - - - - - - + + + + + - - - - - + + + + - - - - + + + + + + + - - - - - + + + + + - - + + + + + + + + + + + + + - - - - + - + image/svg+xml - - + [wmayer] @@ -98,27 +334,85 @@ - - - - - - - + + + + + + + - - - - + + + + - - - + + + - - - - + + + + diff --git a/src/Mod/Part/Gui/Resources/icons/create/Part_Shapebuilder.svg b/src/Mod/Part/Gui/Resources/icons/create/Part_Shapebuilder.svg index e16b676d13..0fc67ebe51 100644 --- a/src/Mod/Part/Gui/Resources/icons/create/Part_Shapebuilder.svg +++ b/src/Mod/Part/Gui/Resources/icons/create/Part_Shapebuilder.svg @@ -1,89 +1,365 @@ - - - - + + + + + - - - - + + + + - - - + + + - - - + + + - - - - - + + + + + - - - - - - + + + + + + - - - - + + + + - - - - - - + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - + + - + - + image/svg+xml - - + [wmayer] - Part_Shapebuilder 2011-10-24 https://www.freecad.org/wiki/index.php?title=Artwork @@ -106,36 +382,178 @@ - - - - - - - + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - + + + - - - + + + - - - + + + From 428b8ba0bc9a0d2c141d7c002d0f417321793119 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Althaus?= Date: Sun, 19 May 2024 12:16:56 +0200 Subject: [PATCH 5/6] Remove unused icons --- .../PartDesign/Gui/Resources/PartDesign.qrc | 2 - .../Resources/icons/PartDesign_Body_old.svg | 155 ------ .../icons/PartDesign_InvoluteGear.svg | 440 ------------------ 3 files changed, 597 deletions(-) delete mode 100644 src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Body_old.svg delete mode 100644 src/Mod/PartDesign/Gui/Resources/icons/PartDesign_InvoluteGear.svg diff --git a/src/Mod/PartDesign/Gui/Resources/PartDesign.qrc b/src/Mod/PartDesign/Gui/Resources/PartDesign.qrc index 5b16e198f1..fa8d6b1a01 100644 --- a/src/Mod/PartDesign/Gui/Resources/PartDesign.qrc +++ b/src/Mod/PartDesign/Gui/Resources/PartDesign.qrc @@ -14,7 +14,6 @@ icons/PartDesign_BaseFeature.svg icons/PartDesign_Body.svg icons/PartDesign_Body.svg - icons/PartDesign_Body_old.svg icons/PartDesign_Body_Tree.svg icons/PartDesign_Boolean.svg icons/PartDesign_Chamfer.svg @@ -26,7 +25,6 @@ icons/PartDesign_Groove.svg icons/PartDesign_Hole.svg icons/PartDesign_InternalExternalGear.svg - icons/PartDesign_InvoluteGear.svg icons/PartDesign_Line.svg icons/PartDesign_LinearPattern.svg icons/PartDesign_Migrate.svg diff --git a/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Body_old.svg b/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Body_old.svg deleted file mode 100644 index 1e59202bd9..0000000000 --- a/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Body_old.svg +++ /dev/null @@ -1,155 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - [jrheinlaender] - - - PartDesign_Body - 2013-05-22 - https://www.freecad.org/wiki/index.php?title=Artwork - - - FreeCAD - - - FreeCAD/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Body.svg - - - FreeCAD LGPL2+ - - - https://www.gnu.org/copyleft/lesser.html - - - [agryson] Alexander Gryson - - - - - - - - - - - - - - - diff --git a/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_InvoluteGear.svg b/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_InvoluteGear.svg deleted file mode 100644 index 2deabea9d3..0000000000 --- a/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_InvoluteGear.svg +++ /dev/null @@ -1,440 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - [maxwxyz] - - - https://www.freecad.org/wiki/index.php?title=Artwork - - - FreeCAD - - - FreeCAD/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateArc.svg - - - FreeCAD LGPL2+ - - - 2023-12-19 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 458d53c027ed56f0a62658b1012efab26ed7042d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Althaus?= Date: Sun, 19 May 2024 12:17:16 +0200 Subject: [PATCH 6/6] Use Body toolbar icon for the tree --- .../PartDesign/Gui/Resources/PartDesign.qrc | 1 - .../Resources/icons/PartDesign_Body_Tree.svg | 322 ------------------ src/Mod/PartDesign/Gui/ViewProviderBody.cpp | 2 +- 3 files changed, 1 insertion(+), 324 deletions(-) delete mode 100644 src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Body_Tree.svg diff --git a/src/Mod/PartDesign/Gui/Resources/PartDesign.qrc b/src/Mod/PartDesign/Gui/Resources/PartDesign.qrc index fa8d6b1a01..30e408fb50 100644 --- a/src/Mod/PartDesign/Gui/Resources/PartDesign.qrc +++ b/src/Mod/PartDesign/Gui/Resources/PartDesign.qrc @@ -14,7 +14,6 @@ icons/PartDesign_BaseFeature.svg icons/PartDesign_Body.svg icons/PartDesign_Body.svg - icons/PartDesign_Body_Tree.svg icons/PartDesign_Boolean.svg icons/PartDesign_Chamfer.svg icons/PartDesign_Clone.svg diff --git a/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Body_Tree.svg b/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Body_Tree.svg deleted file mode 100644 index 2b2c4cda7e..0000000000 --- a/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Body_Tree.svg +++ /dev/null @@ -1,322 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - Path-Stock - 2015-07-04 - https://www.freecad.org/wiki/index.php?title=Artwork - - - FreeCAD - - - FreeCAD/src/Mod/Path/Gui/Resources/icons/Path-Stock.svg - - - FreeCAD LGPL2+ - - - https://www.gnu.org/copyleft/lesser.html - - - [agryson] Alexander Gryson - - - - - - - - - - - - - - - - - diff --git a/src/Mod/PartDesign/Gui/ViewProviderBody.cpp b/src/Mod/PartDesign/Gui/ViewProviderBody.cpp index 874c49bc4b..68f47a28f5 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderBody.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderBody.cpp @@ -66,7 +66,7 @@ ViewProviderBody::ViewProviderBody() ADD_PROPERTY(DisplayModeBody,((long)0)); DisplayModeBody.setEnums(BodyModeEnum); - sPixmap = "PartDesign_Body_Tree.svg"; + sPixmap = "PartDesign_Body.svg"; Gui::ViewProviderOriginGroupExtension::initExtension(this); }