From 3ec528db717f188e3c6f86c6b57930bebd19aaf0 Mon Sep 17 00:00:00 2001 From: Brad Collette Date: Wed, 28 Feb 2024 12:44:34 -0700 Subject: [PATCH] rename icons --- src/Mod/Path/Gui/Resources/Path.qrc | 49 ++--- .../{Path_3DPocket.svg => CAM_3DPocket.svg} | 6 +- .../{Path_3DSurface.svg => CAM_3DSurface.svg} | 6 +- .../Path/Gui/Resources/icons/CAM_Adaptive.svg | 4 +- src/Mod/Path/Gui/Resources/icons/CAM_Area.svg | 6 +- .../Gui/Resources/icons/CAM_Area_View.svg | 6 +- .../Resources/icons/CAM_Area_Workplane.svg | 6 +- ..._BFastForward.svg => CAM_BFastForward.svg} | 0 .../icons/{Path_BPause.svg => CAM_BPause.svg} | 0 .../icons/{Path_BPlay.svg => CAM_BPlay.svg} | 0 .../icons/{Path_BStep.svg => CAM_BStep.svg} | 0 .../icons/{Path_BStop.svg => CAM_BStop.svg} | 0 ..._BaseGeometry.svg => CAM_BaseGeometry.svg} | 6 +- .../icons/{Path_Copy.svg => CAM_Copy.svg} | 6 +- .../icons/{Path_Datums.svg => CAM_Datums.svg} | 6 +- .../icons/{Path_Depths.svg => CAM_Depths.svg} | 6 +- .../icons/{Path_Face.svg => CAM_Face.svg} | 6 +- ...Path_FacePocket.svg => CAM_FacePocket.svg} | 6 +- ...th_FaceProfile.svg => CAM_FaceProfile.svg} | 6 +- .../{Path_Heights.svg => CAM_Heights.svg} | 6 +- .../Gui/Resources/icons/CAM_InactiveOp.svg | 4 +- ..._LengthOffset.svg => CAM_LengthOffset.svg} | 6 +- .../{Path_Machine.svg => CAM_Machine.svg} | 6 +- ..._MachineLathe.svg => CAM_MachineLathe.svg} | 6 +- ...th_MachineMill.svg => CAM_MachineMill.svg} | 6 +- ...achine_test1.svg => CAM_Machine_test1.svg} | 6 +- .../Path/Gui/Resources/icons/CAM_OpActive.svg | 2 +- .../Path/Gui/Resources/icons/CAM_OpCopy.svg | 4 +- ...Path_OperationA.svg => CAM_OperationA.svg} | 2 +- ...Path_OperationB.svg => CAM_OperationB.svg} | 6 +- ...Path_SetupSheet.svg => CAM_SetupSheet.svg} | 0 .../Gui/Resources/icons/CAM_Simulator.svg | 4 +- .../icons/{Path_Speed.svg => CAM_Speed.svg} | 6 +- .../icons/{Path_Tags.svg => CAM_Tags.svg} | 6 +- .../Resources/icons/CAM_ToolController.svg | 6 +- .../{Path_Waterline.svg => CAM_Waterline.svg} | 10 +- .../Path/Gui/Resources/icons/Path_Axis.svg | 88 -------- .../Path/Gui/Resources/icons/Path_Contour.svg | 193 ------------------ .../Path/Gui/Resources/icons/Path_Holding.svg | 171 ---------------- .../Path/Gui/Resources/icons/Path_Kurve.svg | 45 ---- .../Path/Gui/Resources/icons/Path_Plane.svg | 74 ------- .../Path/Gui/Resources/icons/Path_Stock.svg | 65 ------ .../Resources/panels/PageBaseGeometryEdit.ui | 2 +- .../Gui/Resources/panels/PageDepthsEdit.ui | 2 +- .../Gui/Resources/panels/PageHeightsEdit.ui | 2 +- .../Path/Gui/Resources/panels/SurfaceEdit.ui | 8 +- .../Gui/Resources/panels/TaskPathSimulator.ui | 10 +- src/Mod/Path/InitGui.py | 8 +- .../Path/Path/Base/Gui/IconViewProvider.py | 2 +- src/Mod/Path/Path/Base/Gui/SetupSheet.py | 2 +- src/Mod/Path/Path/Dressup/Gui/Preferences.py | 2 +- src/Mod/Path/Path/Main/Gui/Fixture.py | 4 +- src/Mod/Path/Path/Op/Base.py | 6 +- src/Mod/Path/Path/Op/Gui/Base.py | 8 +- src/Mod/Path/Path/Op/Gui/Copy.py | 14 +- src/Mod/Path/Path/Op/Gui/MillFace.py | 2 +- src/Mod/Path/Path/Op/Gui/Pocket.py | 2 +- src/Mod/Path/Path/Op/Gui/Profile.py | 2 +- src/Mod/Path/Path/Op/Gui/Surface.py | 6 +- src/Mod/Path/Path/Op/Gui/Waterline.py | 6 +- src/Mod/Path/Path/Op/Surface.py | 56 ++--- src/Mod/Path/Path/Post/scripts/gcode_pre.py | 4 +- src/Mod/Path/Path/Tool/Gui/Controller.py | 2 +- 63 files changed, 176 insertions(+), 821 deletions(-) rename src/Mod/Path/Gui/Resources/icons/{Path_3DPocket.svg => CAM_3DPocket.svg} (98%) rename src/Mod/Path/Gui/Resources/icons/{Path_3DSurface.svg => CAM_3DSurface.svg} (98%) rename src/Mod/Path/Gui/Resources/icons/{Path_BFastForward.svg => CAM_BFastForward.svg} (100%) rename src/Mod/Path/Gui/Resources/icons/{Path_BPause.svg => CAM_BPause.svg} (100%) rename src/Mod/Path/Gui/Resources/icons/{Path_BPlay.svg => CAM_BPlay.svg} (100%) rename src/Mod/Path/Gui/Resources/icons/{Path_BStep.svg => CAM_BStep.svg} (100%) rename src/Mod/Path/Gui/Resources/icons/{Path_BStop.svg => CAM_BStop.svg} (100%) rename src/Mod/Path/Gui/Resources/icons/{Path_BaseGeometry.svg => CAM_BaseGeometry.svg} (96%) rename src/Mod/Path/Gui/Resources/icons/{Path_Copy.svg => CAM_Copy.svg} (99%) rename src/Mod/Path/Gui/Resources/icons/{Path_Datums.svg => CAM_Datums.svg} (98%) rename src/Mod/Path/Gui/Resources/icons/{Path_Depths.svg => CAM_Depths.svg} (98%) rename src/Mod/Path/Gui/Resources/icons/{Path_Face.svg => CAM_Face.svg} (99%) rename src/Mod/Path/Gui/Resources/icons/{Path_FacePocket.svg => CAM_FacePocket.svg} (99%) rename src/Mod/Path/Gui/Resources/icons/{Path_FaceProfile.svg => CAM_FaceProfile.svg} (99%) rename src/Mod/Path/Gui/Resources/icons/{Path_Heights.svg => CAM_Heights.svg} (98%) rename src/Mod/Path/Gui/Resources/icons/{Path_LengthOffset.svg => CAM_LengthOffset.svg} (99%) rename src/Mod/Path/Gui/Resources/icons/{Path_Machine.svg => CAM_Machine.svg} (99%) rename src/Mod/Path/Gui/Resources/icons/{Path_MachineLathe.svg => CAM_MachineLathe.svg} (98%) rename src/Mod/Path/Gui/Resources/icons/{Path_MachineMill.svg => CAM_MachineMill.svg} (99%) rename src/Mod/Path/Gui/Resources/icons/{Path_Machine_test1.svg => CAM_Machine_test1.svg} (99%) rename src/Mod/Path/Gui/Resources/icons/{Path_OperationA.svg => CAM_OperationA.svg} (99%) rename src/Mod/Path/Gui/Resources/icons/{Path_OperationB.svg => CAM_OperationB.svg} (98%) rename src/Mod/Path/Gui/Resources/icons/{Path_SetupSheet.svg => CAM_SetupSheet.svg} (100%) rename src/Mod/Path/Gui/Resources/icons/{Path_Speed.svg => CAM_Speed.svg} (98%) rename src/Mod/Path/Gui/Resources/icons/{Path_Tags.svg => CAM_Tags.svg} (99%) rename src/Mod/Path/Gui/Resources/icons/{Path_Waterline.svg => CAM_Waterline.svg} (98%) delete mode 100644 src/Mod/Path/Gui/Resources/icons/Path_Axis.svg delete mode 100644 src/Mod/Path/Gui/Resources/icons/Path_Contour.svg delete mode 100644 src/Mod/Path/Gui/Resources/icons/Path_Holding.svg delete mode 100644 src/Mod/Path/Gui/Resources/icons/Path_Kurve.svg delete mode 100644 src/Mod/Path/Gui/Resources/icons/Path_Plane.svg delete mode 100644 src/Mod/Path/Gui/Resources/icons/Path_Stock.svg diff --git a/src/Mod/Path/Gui/Resources/Path.qrc b/src/Mod/Path/Gui/Resources/Path.qrc index 9df08eafa8..1f57b53a6e 100644 --- a/src/Mod/Path/Gui/Resources/Path.qrc +++ b/src/Mod/Path/Gui/Resources/Path.qrc @@ -1,49 +1,42 @@ icons/CAM_Adaptive.svg - icons/Path_3DPocket.svg - icons/Path_3DSurface.svg + icons/CAM_3DPocket.svg + icons/CAM_3DSurface.svg icons/CAM_Area_View.svg icons/CAM_Area_Workplane.svg icons/CAM_Area.svg icons/CAM_Array.svg - icons/Path_Axis.svg - icons/Path_BFastForward.svg - icons/Path_BPause.svg - icons/Path_BPlay.svg - icons/Path_BStep.svg - icons/Path_BStop.svg - icons/Path_BaseGeometry.svg + icons/CAM_BFastForward.svg + icons/CAM_BPause.svg + icons/CAM_BPlay.svg + icons/CAM_BStep.svg + icons/CAM_BStop.svg + icons/CAM_BaseGeometry.svg icons/CAM_Camotics.svg icons/CAM_Comment.svg icons/CAM_Compound.svg - icons/Path_Contour.svg - icons/Path_Copy.svg + icons/CAM_Copy.svg icons/CAM_Custom.svg - icons/Path_Datums.svg + icons/CAM_Datums.svg icons/CAM_Deburr.svg - icons/Path_Depths.svg + icons/CAM_Depths.svg icons/CAM_Dressup.svg icons/CAM_Drilling.svg icons/CAM_Engrave.svg icons/CAM_ExportTemplate.svg - icons/Path_Face.svg - icons/Path_FacePocket.svg - icons/Path_FaceProfile.svg - icons/Path_Heights.svg + icons/CAM_Face.svg + icons/CAM_FacePocket.svg + icons/CAM_FaceProfile.svg + icons/CAM_Heights.svg icons/CAM_Helix.svg icons/CAM_Inspect.svg icons/CAM_Job.svg - icons/Path_Kurve.svg - icons/Path_LengthOffset.svg - icons/Path_Machine.svg - icons/Path_MachineLathe.svg - icons/Path_MachineMill.svg + icons/CAM_LengthOffset.svg icons/CAM_OpActive.svg icons/CAM_OpCopy.svg - icons/Path_OperationA.svg - icons/Path_OperationB.svg - icons/Path_Plane.svg + icons/CAM_OperationA.svg + icons/CAM_OperationB.svg icons/CAM_Pocket.svg icons/CAM_Post.svg icons/CAM_Probe.svg @@ -52,13 +45,11 @@ icons/CAM_Profile.svg icons/CAM_Sanity.svg icons/CAM_SelectLoop.svg - icons/Path_SetupSheet.svg + icons/CAM_SetupSheet.svg icons/CAM_Shape.svg icons/CAM_SimpleCopy.svg icons/CAM_Simulator.svg icons/CAM_Slot.svg - icons/Path_Speed.svg - icons/Path_Stock.svg icons/CAM_Stop.svg icons/CAM_ThreadMilling.svg icons/CAM_ToolBit.svg @@ -68,7 +59,7 @@ icons/CAM_Toolpath.svg icons/CAM_ToolTable.svg icons/CAM_Vcarve.svg - icons/Path_Waterline.svg + icons/CAM_Waterline.svg icons/arrow-ccw.svg icons/arrow-cw.svg icons/arrow-down.svg diff --git a/src/Mod/Path/Gui/Resources/icons/Path_3DPocket.svg b/src/Mod/Path/Gui/Resources/icons/CAM_3DPocket.svg similarity index 98% rename from src/Mod/Path/Gui/Resources/icons/Path_3DPocket.svg rename to src/Mod/Path/Gui/Resources/icons/CAM_3DPocket.svg index 9dc00eac2a..d8f0e25b82 100644 --- a/src/Mod/Path/Gui/Resources/icons/Path_3DPocket.svg +++ b/src/Mod/Path/Gui/Resources/icons/CAM_3DPocket.svg @@ -14,7 +14,7 @@ id="svg2816" version="1.1" inkscape:version="0.92.2 (5c3e80d, 2017-08-06)" - sodipodi:docname="Path_3DPocket.svg"> + sodipodi:docname="CAM_3DPocket.svg"> - Path_3DSurface + CAM_3DSurface 2016-05-15 https://www.freecad.org/wiki/index.php?title=Artwork @@ -197,7 +197,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_3DSurface.svg + FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_3DSurface.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/Path_3DSurface.svg b/src/Mod/Path/Gui/Resources/icons/CAM_3DSurface.svg similarity index 98% rename from src/Mod/Path/Gui/Resources/icons/Path_3DSurface.svg rename to src/Mod/Path/Gui/Resources/icons/CAM_3DSurface.svg index f5e6518bc1..de06dbefe7 100644 --- a/src/Mod/Path/Gui/Resources/icons/Path_3DSurface.svg +++ b/src/Mod/Path/Gui/Resources/icons/CAM_3DSurface.svg @@ -1,5 +1,5 @@ - + @@ -47,7 +47,7 @@ image/svg+xml - Path_3DSurface + CAM_3DSurface 2016-05-15 https://www.freecad.org/wiki/index.php?title=Artwork @@ -55,7 +55,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_3DSurface.svg + FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_3DSurface.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_Adaptive.svg b/src/Mod/Path/Gui/Resources/icons/CAM_Adaptive.svg index 4617ac3a3d..42a999c693 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_Adaptive.svg +++ b/src/Mod/Path/Gui/Resources/icons/CAM_Adaptive.svg @@ -575,7 +575,7 @@ - Path_FaceProfile + CAM_Adaptive 2016-01-19 https://www.freecad.org/wiki/index.php?title=Artwork @@ -583,7 +583,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_ + FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_ FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_Area.svg b/src/Mod/Path/Gui/Resources/icons/CAM_Area.svg index 3fba657bc6..b5c29b3da8 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_Area.svg +++ b/src/Mod/Path/Gui/Resources/icons/CAM_Area.svg @@ -15,7 +15,7 @@ id="svg2816" version="1.1" inkscape:version="0.91 r13725" - sodipodi:docname="Path_Area.svg"> + sodipodi:docname="CAM_Area.svg"> - Path_FaceProfile + CAM_Area 2016-01-19 https://www.freecad.org/wiki/index.php?title=Artwork @@ -595,7 +595,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_ + FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_ FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_Area_View.svg b/src/Mod/Path/Gui/Resources/icons/CAM_Area_View.svg index ec6d9028ae..aae2306401 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_Area_View.svg +++ b/src/Mod/Path/Gui/Resources/icons/CAM_Area_View.svg @@ -15,7 +15,7 @@ id="svg2816" version="1.1" inkscape:version="0.91 r13725" - sodipodi:docname="Path_Area_View.svg"> + sodipodi:docname="CAM_Area_View.svg"> - Path_FaceProfile + CAM_Area_View 2016-01-19 https://www.freecad.org/wiki/index.php?title=Artwork @@ -595,7 +595,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_ + FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_ FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_Area_Workplane.svg b/src/Mod/Path/Gui/Resources/icons/CAM_Area_Workplane.svg index e5ecd91b06..195f543aac 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_Area_Workplane.svg +++ b/src/Mod/Path/Gui/Resources/icons/CAM_Area_Workplane.svg @@ -15,7 +15,7 @@ id="svg2816" version="1.1" inkscape:version="0.91 r13725" - sodipodi:docname="Path_Area_Workplane.svg"> + sodipodi:docname="CAM_Area_Workplane.svg"> - Path_FaceProfile + CAM_Area_Workplane 2016-01-19 https://www.freecad.org/wiki/index.php?title=Artwork @@ -617,7 +617,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_ + FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_ FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/Path_BFastForward.svg b/src/Mod/Path/Gui/Resources/icons/CAM_BFastForward.svg similarity index 100% rename from src/Mod/Path/Gui/Resources/icons/Path_BFastForward.svg rename to src/Mod/Path/Gui/Resources/icons/CAM_BFastForward.svg diff --git a/src/Mod/Path/Gui/Resources/icons/Path_BPause.svg b/src/Mod/Path/Gui/Resources/icons/CAM_BPause.svg similarity index 100% rename from src/Mod/Path/Gui/Resources/icons/Path_BPause.svg rename to src/Mod/Path/Gui/Resources/icons/CAM_BPause.svg diff --git a/src/Mod/Path/Gui/Resources/icons/Path_BPlay.svg b/src/Mod/Path/Gui/Resources/icons/CAM_BPlay.svg similarity index 100% rename from src/Mod/Path/Gui/Resources/icons/Path_BPlay.svg rename to src/Mod/Path/Gui/Resources/icons/CAM_BPlay.svg diff --git a/src/Mod/Path/Gui/Resources/icons/Path_BStep.svg b/src/Mod/Path/Gui/Resources/icons/CAM_BStep.svg similarity index 100% rename from src/Mod/Path/Gui/Resources/icons/Path_BStep.svg rename to src/Mod/Path/Gui/Resources/icons/CAM_BStep.svg diff --git a/src/Mod/Path/Gui/Resources/icons/Path_BStop.svg b/src/Mod/Path/Gui/Resources/icons/CAM_BStop.svg similarity index 100% rename from src/Mod/Path/Gui/Resources/icons/Path_BStop.svg rename to src/Mod/Path/Gui/Resources/icons/CAM_BStop.svg diff --git a/src/Mod/Path/Gui/Resources/icons/Path_BaseGeometry.svg b/src/Mod/Path/Gui/Resources/icons/CAM_BaseGeometry.svg similarity index 96% rename from src/Mod/Path/Gui/Resources/icons/Path_BaseGeometry.svg rename to src/Mod/Path/Gui/Resources/icons/CAM_BaseGeometry.svg index e015f6b9b2..278d1f82bb 100644 --- a/src/Mod/Path/Gui/Resources/icons/Path_BaseGeometry.svg +++ b/src/Mod/Path/Gui/Resources/icons/CAM_BaseGeometry.svg @@ -1,5 +1,5 @@ - + @@ -21,7 +21,7 @@ image/svg+xml - Path_BaseGeometry + CAM_BaseGeometry 2016-05-15 https://www.freecad.org/wiki/index.php?title=Artwork @@ -29,7 +29,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_BaseGeometry.svg + FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_BaseGeometry.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/Path_Copy.svg b/src/Mod/Path/Gui/Resources/icons/CAM_Copy.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/Path_Copy.svg rename to src/Mod/Path/Gui/Resources/icons/CAM_Copy.svg index f5fd853d51..5ae4f1bff8 100644 --- a/src/Mod/Path/Gui/Resources/icons/Path_Copy.svg +++ b/src/Mod/Path/Gui/Resources/icons/CAM_Copy.svg @@ -1,6 +1,6 @@ - + @@ -124,7 +124,7 @@ image/svg+xml - Path_Copy + CAM_Copy 2015-07-04 https://www.freecad.org/wiki/index.php?title=Artwork @@ -132,7 +132,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_Copy.svg + FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Copy.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/Path_Datums.svg b/src/Mod/Path/Gui/Resources/icons/CAM_Datums.svg similarity index 98% rename from src/Mod/Path/Gui/Resources/icons/Path_Datums.svg rename to src/Mod/Path/Gui/Resources/icons/CAM_Datums.svg index a1e1bd648b..e9a938f5bd 100644 --- a/src/Mod/Path/Gui/Resources/icons/Path_Datums.svg +++ b/src/Mod/Path/Gui/Resources/icons/CAM_Datums.svg @@ -1,6 +1,6 @@ - + @@ -48,7 +48,7 @@ image/svg+xml - Path_Datums + CAM_Datums 2015-07-04 https://www.freecad.org/wiki/index.php?title=Artwork @@ -56,7 +56,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_Datums.svg + FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Datums.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/Path_Depths.svg b/src/Mod/Path/Gui/Resources/icons/CAM_Depths.svg similarity index 98% rename from src/Mod/Path/Gui/Resources/icons/Path_Depths.svg rename to src/Mod/Path/Gui/Resources/icons/CAM_Depths.svg index 14f09790d7..a39eb9379b 100644 --- a/src/Mod/Path/Gui/Resources/icons/Path_Depths.svg +++ b/src/Mod/Path/Gui/Resources/icons/CAM_Depths.svg @@ -1,5 +1,5 @@ - + @@ -46,7 +46,7 @@ image/svg+xml - Path_Depths + CAM_Depths 2016-05-15 https://www.freecad.org/wiki/index.php?title=Artwork @@ -54,7 +54,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_Depths.svg + FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Depths.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/Path_Face.svg b/src/Mod/Path/Gui/Resources/icons/CAM_Face.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/Path_Face.svg rename to src/Mod/Path/Gui/Resources/icons/CAM_Face.svg index bf9c0ce5af..6f769cd719 100644 --- a/src/Mod/Path/Gui/Resources/icons/Path_Face.svg +++ b/src/Mod/Path/Gui/Resources/icons/CAM_Face.svg @@ -1,6 +1,6 @@ - + @@ -166,7 +166,7 @@ image/svg+xml - Path_Face + CAM_Face 2016-11-07 https://www.freecad.org/wiki/index.php?title=Artwork @@ -174,7 +174,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_ + FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_ FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/Path_FacePocket.svg b/src/Mod/Path/Gui/Resources/icons/CAM_FacePocket.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/Path_FacePocket.svg rename to src/Mod/Path/Gui/Resources/icons/CAM_FacePocket.svg index 845e31078b..6c5586eb33 100644 --- a/src/Mod/Path/Gui/Resources/icons/Path_FacePocket.svg +++ b/src/Mod/Path/Gui/Resources/icons/CAM_FacePocket.svg @@ -1,6 +1,6 @@ - + @@ -117,7 +117,7 @@ image/svg+xml - Path_FacePocket + CAM_FacePocket 2016-01-19 https://www.freecad.org/wiki/index.php?title=Artwork @@ -125,7 +125,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_ + FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_ FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/Path_FaceProfile.svg b/src/Mod/Path/Gui/Resources/icons/CAM_FaceProfile.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/Path_FaceProfile.svg rename to src/Mod/Path/Gui/Resources/icons/CAM_FaceProfile.svg index a2b1ac5d5c..7ad8646363 100644 --- a/src/Mod/Path/Gui/Resources/icons/Path_FaceProfile.svg +++ b/src/Mod/Path/Gui/Resources/icons/CAM_FaceProfile.svg @@ -1,6 +1,6 @@ - + @@ -117,7 +117,7 @@ image/svg+xml - Path_FaceProfile + CAM_FaceProfile 2016-01-19 https://www.freecad.org/wiki/index.php?title=Artwork @@ -125,7 +125,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_ + FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_ FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/Path_Heights.svg b/src/Mod/Path/Gui/Resources/icons/CAM_Heights.svg similarity index 98% rename from src/Mod/Path/Gui/Resources/icons/Path_Heights.svg rename to src/Mod/Path/Gui/Resources/icons/CAM_Heights.svg index e36311f607..326847ed7b 100644 --- a/src/Mod/Path/Gui/Resources/icons/Path_Heights.svg +++ b/src/Mod/Path/Gui/Resources/icons/CAM_Heights.svg @@ -1,5 +1,5 @@ - + @@ -31,7 +31,7 @@ image/svg+xml - Path_Heights + CAM_Heights 2016-05-15 https://www.freecad.org/wiki/index.php?title=Artwork @@ -39,7 +39,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_Heights.svg + FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Heights.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_InactiveOp.svg b/src/Mod/Path/Gui/Resources/icons/CAM_InactiveOp.svg index 8cd142bff8..a310c24c63 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_InactiveOp.svg +++ b/src/Mod/Path/Gui/Resources/icons/CAM_InactiveOp.svg @@ -15,7 +15,7 @@ id="svg2726" sodipodi:version="0.32" inkscape:version="0.91 r13725" - sodipodi:docname="Path_InactiveOp.svg" + sodipodi:docname="CAM_InactiveOp.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" version="1.1"> ellipsis - Path_OperationA + CAM_OperationA https://www.gnu.org/copyleft/lesser.html diff --git a/src/Mod/Path/Gui/Resources/icons/Path_LengthOffset.svg b/src/Mod/Path/Gui/Resources/icons/CAM_LengthOffset.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/Path_LengthOffset.svg rename to src/Mod/Path/Gui/Resources/icons/CAM_LengthOffset.svg index 85a963040e..70586c4513 100644 --- a/src/Mod/Path/Gui/Resources/icons/Path_LengthOffset.svg +++ b/src/Mod/Path/Gui/Resources/icons/CAM_LengthOffset.svg @@ -1,6 +1,6 @@ - + @@ -97,7 +97,7 @@ image/svg+xml - Path_LengthOffset + CAM_LengthOffset 2015-07-04 https://www.freecad.org/wiki/index.php?title=Artwork @@ -105,7 +105,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_LengthOffset.svg + FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_LengthOffset.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/Path_Machine.svg b/src/Mod/Path/Gui/Resources/icons/CAM_Machine.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/Path_Machine.svg rename to src/Mod/Path/Gui/Resources/icons/CAM_Machine.svg index 0e676877c2..6256f6b20f 100644 --- a/src/Mod/Path/Gui/Resources/icons/Path_Machine.svg +++ b/src/Mod/Path/Gui/Resources/icons/CAM_Machine.svg @@ -1,6 +1,6 @@ - + @@ -118,7 +118,7 @@ image/svg+xml - Path_Machine + CAM_Machine 2015-07-04 https://www.freecad.org/wiki/index.php?title=Artwork @@ -126,7 +126,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_Machine.svg + FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Machine.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/Path_MachineLathe.svg b/src/Mod/Path/Gui/Resources/icons/CAM_MachineLathe.svg similarity index 98% rename from src/Mod/Path/Gui/Resources/icons/Path_MachineLathe.svg rename to src/Mod/Path/Gui/Resources/icons/CAM_MachineLathe.svg index 8e0306ff5b..9be1adde9b 100644 --- a/src/Mod/Path/Gui/Resources/icons/Path_MachineLathe.svg +++ b/src/Mod/Path/Gui/Resources/icons/CAM_MachineLathe.svg @@ -1,5 +1,5 @@ - + @@ -61,7 +61,7 @@ image/svg+xml - Path_MachineLathe + CAM_MachineLathe 2016-05-15 https://www.freecad.org/wiki/index.php?title=Artwork @@ -69,7 +69,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_MachineLathe.svg + FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_MachineLathe.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/Path_MachineMill.svg b/src/Mod/Path/Gui/Resources/icons/CAM_MachineMill.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/Path_MachineMill.svg rename to src/Mod/Path/Gui/Resources/icons/CAM_MachineMill.svg index 9d05f2ad9d..547f21e00f 100644 --- a/src/Mod/Path/Gui/Resources/icons/Path_MachineMill.svg +++ b/src/Mod/Path/Gui/Resources/icons/CAM_MachineMill.svg @@ -1,5 +1,5 @@ - + @@ -38,7 +38,7 @@ image/svg+xml - Path_MachineMill + CAM_MachineMill 2016-05-15 https://www.freecad.org/wiki/index.php?title=Artwork @@ -46,7 +46,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_MachineMill.svg + FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_MachineMill.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/Path_Machine_test1.svg b/src/Mod/Path/Gui/Resources/icons/CAM_Machine_test1.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/Path_Machine_test1.svg rename to src/Mod/Path/Gui/Resources/icons/CAM_Machine_test1.svg index 737400293a..9c6c22f1bf 100644 --- a/src/Mod/Path/Gui/Resources/icons/Path_Machine_test1.svg +++ b/src/Mod/Path/Gui/Resources/icons/CAM_Machine_test1.svg @@ -1,6 +1,6 @@ - + @@ -136,7 +136,7 @@ image/svg+xml - Path_Machine_test1 + CAM_Machine_test1 2016-05-15 https://www.freecad.org/wiki/index.php?title=Artwork @@ -144,7 +144,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_Machine_test1.svg + FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Machine_test1.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_OpActive.svg b/src/Mod/Path/Gui/Resources/icons/CAM_OpActive.svg index 28f637baae..4f2bee8769 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_OpActive.svg +++ b/src/Mod/Path/Gui/Resources/icons/CAM_OpActive.svg @@ -487,7 +487,7 @@ ellipsis - Path_OperationA + CAM_OperationA https://www.gnu.org/copyleft/lesser.html diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_OpCopy.svg b/src/Mod/Path/Gui/Resources/icons/CAM_OpCopy.svg index 428b5289b8..57aa6b5172 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_OpCopy.svg +++ b/src/Mod/Path/Gui/Resources/icons/CAM_OpCopy.svg @@ -605,7 +605,7 @@ - Path_FaceProfile + CAM_OpCopy 2016-01-19 https://www.freecad.org/wiki/index.php?title=Artwork @@ -613,7 +613,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_ + FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_ FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/Path_OperationA.svg b/src/Mod/Path/Gui/Resources/icons/CAM_OperationA.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/Path_OperationA.svg rename to src/Mod/Path/Gui/Resources/icons/CAM_OperationA.svg index a18b6452ba..af876a0c59 100644 --- a/src/Mod/Path/Gui/Resources/icons/Path_OperationA.svg +++ b/src/Mod/Path/Gui/Resources/icons/CAM_OperationA.svg @@ -139,7 +139,7 @@ ellipsis - Path_OperationA + CAM_OperationA https://www.gnu.org/copyleft/lesser.html diff --git a/src/Mod/Path/Gui/Resources/icons/Path_OperationB.svg b/src/Mod/Path/Gui/Resources/icons/CAM_OperationB.svg similarity index 98% rename from src/Mod/Path/Gui/Resources/icons/Path_OperationB.svg rename to src/Mod/Path/Gui/Resources/icons/CAM_OperationB.svg index f42344864b..9f9623270e 100644 --- a/src/Mod/Path/Gui/Resources/icons/Path_OperationB.svg +++ b/src/Mod/Path/Gui/Resources/icons/CAM_OperationB.svg @@ -1,5 +1,5 @@ - + @@ -58,7 +58,7 @@ image/svg+xml - Path_OperationB + CAM_OperationB 2016-05-15 https://www.freecad.org/wiki/index.php?title=Artwork @@ -66,7 +66,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_OperationB.svg + FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_OperationB.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/Path_SetupSheet.svg b/src/Mod/Path/Gui/Resources/icons/CAM_SetupSheet.svg similarity index 100% rename from src/Mod/Path/Gui/Resources/icons/Path_SetupSheet.svg rename to src/Mod/Path/Gui/Resources/icons/CAM_SetupSheet.svg diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_Simulator.svg b/src/Mod/Path/Gui/Resources/icons/CAM_Simulator.svg index aba4beaaa3..db8edda064 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_Simulator.svg +++ b/src/Mod/Path/Gui/Resources/icons/CAM_Simulator.svg @@ -1283,7 +1283,7 @@ - Path_Machine + CAM_Machine 2015-07-04 https://www.freecad.org/wiki/index.php?title=Artwork @@ -1291,7 +1291,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_Machine.svg + FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Machine.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/Path_Speed.svg b/src/Mod/Path/Gui/Resources/icons/CAM_Speed.svg similarity index 98% rename from src/Mod/Path/Gui/Resources/icons/Path_Speed.svg rename to src/Mod/Path/Gui/Resources/icons/CAM_Speed.svg index beffb62419..005ee9ae87 100644 --- a/src/Mod/Path/Gui/Resources/icons/Path_Speed.svg +++ b/src/Mod/Path/Gui/Resources/icons/CAM_Speed.svg @@ -1,5 +1,5 @@ - + @@ -43,7 +43,7 @@ image/svg+xml - Path_Speed + CAM_Speed 2016-05-15 https://www.freecad.org/wiki/index.php?title=Artwork @@ -51,7 +51,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_Speed.svg + FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Speed.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/Path_Tags.svg b/src/Mod/Path/Gui/Resources/icons/CAM_Tags.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/Path_Tags.svg rename to src/Mod/Path/Gui/Resources/icons/CAM_Tags.svg index 1602e29312..5701464485 100644 --- a/src/Mod/Path/Gui/Resources/icons/Path_Tags.svg +++ b/src/Mod/Path/Gui/Resources/icons/CAM_Tags.svg @@ -1,6 +1,6 @@ - + @@ -123,7 +123,7 @@ image/svg+xml - Path_Tags + CAM_Tags 2016-02-24 https://www.freecad.org/wiki/index.php?title=Artwork @@ -131,7 +131,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_Tags.svg + FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Tags.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_ToolController.svg b/src/Mod/Path/Gui/Resources/icons/CAM_ToolController.svg index b080462474..d8bf136645 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_ToolController.svg +++ b/src/Mod/Path/Gui/Resources/icons/CAM_ToolController.svg @@ -1,6 +1,6 @@ - + @@ -113,7 +113,7 @@ image/svg+xml - Path_LoadTool + CAM_LoadTool 2015-07-04 https://www.freecad.org/wiki/index.php?title=Artwork @@ -121,7 +121,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_LoadTool.svg + FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_LoadTool.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/Path_Waterline.svg b/src/Mod/Path/Gui/Resources/icons/CAM_Waterline.svg similarity index 98% rename from src/Mod/Path/Gui/Resources/icons/Path_Waterline.svg rename to src/Mod/Path/Gui/Resources/icons/CAM_Waterline.svg index 6fbb95ac15..dde6ab9b9e 100644 --- a/src/Mod/Path/Gui/Resources/icons/Path_Waterline.svg +++ b/src/Mod/Path/Gui/Resources/icons/CAM_Waterline.svg @@ -14,9 +14,9 @@ id="svg2816" version="1.1" inkscape:version="0.92.4 (5da689c313, 2019-01-14)" - sodipodi:docname="Path_Waterline.svg"> + sodipodi:docname="CAM_Waterline.svg"> Path_Waterline + id="title165">CAM_Waterline image/svg+xml - Path_Waterline - Path_Waterline + CAM_Waterline + CAM_Waterline 2019-05-19 https://www.freecad.org/wiki/index.php?title=Artwork @@ -184,7 +184,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_Waterline.svg + FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Waterline.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/Path_Axis.svg b/src/Mod/Path/Gui/Resources/icons/Path_Axis.svg deleted file mode 100644 index d5307eff5c..0000000000 --- a/src/Mod/Path/Gui/Resources/icons/Path_Axis.svg +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - - - - - - image/svg+xml - - - Path_Axis - 2015-07-04 - https://www.freecad.org/wiki/index.php?title=Artwork - - - FreeCAD - - - FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_Axis.svg - - - FreeCAD LGPL2+ - - - https://www.gnu.org/copyleft/lesser.html - - - [agryson] Alexander Gryson - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Mod/Path/Gui/Resources/icons/Path_Contour.svg b/src/Mod/Path/Gui/Resources/icons/Path_Contour.svg deleted file mode 100644 index 2007062346..0000000000 --- a/src/Mod/Path/Gui/Resources/icons/Path_Contour.svg +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - Path_Contour - 2016-08-16 - https://www.freecad.org/wiki/index.php?title=Artwork - - - FreeCAD - - - FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_Contour.svg - - - FreeCAD LGPL2+ - - - https://www.gnu.org/copyleft/lesser.html - - - [agryson] Alexander Gryson - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Mod/Path/Gui/Resources/icons/Path_Holding.svg b/src/Mod/Path/Gui/Resources/icons/Path_Holding.svg deleted file mode 100644 index 7732c5218b..0000000000 --- a/src/Mod/Path/Gui/Resources/icons/Path_Holding.svg +++ /dev/null @@ -1,171 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - Path_Holding - 2016-02-24 - https://www.freecad.org/wiki/index.php?title=Artwork - - - FreeCAD - - - FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_Holding.svg - - - FreeCAD LGPL2+ - - - https://www.gnu.org/copyleft/lesser.html - - - [agryson] Alexander Gryson - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Mod/Path/Gui/Resources/icons/Path_Kurve.svg b/src/Mod/Path/Gui/Resources/icons/Path_Kurve.svg deleted file mode 100644 index 395b53c143..0000000000 --- a/src/Mod/Path/Gui/Resources/icons/Path_Kurve.svg +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - image/svg+xml - - - Path_Kurve - 2015-07-04 - https://www.freecad.org/wiki/index.php?title=Artwork - - - FreeCAD - - - FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_Kurve.svg - - - FreeCAD LGPL2+ - - - https://www.gnu.org/copyleft/lesser.html - - - [agryson] Alexander Gryson - - - - - - - - - - - - - - diff --git a/src/Mod/Path/Gui/Resources/icons/Path_Plane.svg b/src/Mod/Path/Gui/Resources/icons/Path_Plane.svg deleted file mode 100644 index 5f47a42c0d..0000000000 --- a/src/Mod/Path/Gui/Resources/icons/Path_Plane.svg +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - image/svg+xml - - - Path_Plane - 2015-07-04 - https://www.freecad.org/wiki/index.php?title=Artwork - - - FreeCAD - - - FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_Plane.svg - - - FreeCAD LGPL2+ - - - https://www.gnu.org/copyleft/lesser.html - - - [agryson] Alexander Gryson - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Mod/Path/Gui/Resources/icons/Path_Stock.svg b/src/Mod/Path/Gui/Resources/icons/Path_Stock.svg deleted file mode 100644 index 02b73ee644..0000000000 --- a/src/Mod/Path/Gui/Resources/icons/Path_Stock.svg +++ /dev/null @@ -1,65 +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/Path/Gui/Resources/panels/PageBaseGeometryEdit.ui b/src/Mod/Path/Gui/Resources/panels/PageBaseGeometryEdit.ui index 75e50235c3..0057f64d2b 100644 --- a/src/Mod/Path/Gui/Resources/panels/PageBaseGeometryEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/PageBaseGeometryEdit.ui @@ -21,7 +21,7 @@ - :/icons/Path_BaseGeometry.svg:/icons/Path_BaseGeometry.svg + :/icons/CAM_BaseGeometry.svg:/icons/CAM_BaseGeometry.svg diff --git a/src/Mod/Path/Gui/Resources/panels/PageDepthsEdit.ui b/src/Mod/Path/Gui/Resources/panels/PageDepthsEdit.ui index 696c60e060..8834a594a6 100644 --- a/src/Mod/Path/Gui/Resources/panels/PageDepthsEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/PageDepthsEdit.ui @@ -18,7 +18,7 @@ - :/icons/Path_Depths.svg:/icons/Path_Depths.svg + :/icons/CAM_Depths.svg:/icons/CAM_Depths.svg diff --git a/src/Mod/Path/Gui/Resources/panels/PageHeightsEdit.ui b/src/Mod/Path/Gui/Resources/panels/PageHeightsEdit.ui index 9878b8c4b7..ceab3ede12 100644 --- a/src/Mod/Path/Gui/Resources/panels/PageHeightsEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/PageHeightsEdit.ui @@ -15,7 +15,7 @@ - :/icons/Path_Heights.svg:/icons/Path_Heights.svg + :/icons/CAM_Heights.svg:/icons/CAM_Heights.svg diff --git a/src/Mod/Path/Gui/Resources/panels/SurfaceEdit.ui b/src/Mod/Path/Gui/Resources/panels/SurfaceEdit.ui index a3f874d277..eafef0471a 100644 --- a/src/Mod/Path/Gui/Resources/panels/SurfaceEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/SurfaceEdit.ui @@ -39,7 +39,7 @@ - :/icons/Path_BaseGeometry.svg:/icons/Path_BaseGeometry.svg + :/icons/CAM_BaseGeometry.svg:/icons/CAM_BaseGeometry.svg Base Geometry @@ -117,7 +117,7 @@ - :/icons/Path_Depths.svg:/icons/Path_Depths.svg + :/icons/CAM_Depths.svg:/icons/CAM_Depths.svg Depths @@ -192,7 +192,7 @@ - :/icons/Path_Heights.svg:/icons/Path_Heights.svg + :/icons/CAM_Heights.svg:/icons/CAM_Heights.svg Heights @@ -242,7 +242,7 @@ - :/icons/Path_OperationB.svg:/icons/Path_OperationB.svg + :/icons/CAM_OperationB.svg:/icons/CAM_OperationB.svg Operation diff --git a/src/Mod/Path/Gui/Resources/panels/TaskPathSimulator.ui b/src/Mod/Path/Gui/Resources/panels/TaskPathSimulator.ui index 8d5e7fec6c..040e814c1d 100644 --- a/src/Mod/Path/Gui/Resources/panels/TaskPathSimulator.ui +++ b/src/Mod/Path/Gui/Resources/panels/TaskPathSimulator.ui @@ -39,7 +39,7 @@ - :/icons/Path_BStop.svg:/icons/Path_BStop.svg + :/icons/CAM_BStop.svg:/icons/CAM_BStop.svg @@ -59,7 +59,7 @@ - :/icons/Path_BPlay.svg:/icons/Path_BPlay.svg + :/icons/CAM_BPlay.svg:/icons/CAM_BPlay.svg @@ -79,7 +79,7 @@ - :/icons/Path_BPause.svg:/icons/Path_BPause.svg + :/icons/CAM_BPause.svg:/icons/CAM_BPause.svg @@ -99,7 +99,7 @@ - :/icons/Path_BStep.svg:/icons/Path_BStep.svg + :/icons/CAM_BStep.svg:/icons/CAM_BStep.svg @@ -119,7 +119,7 @@ - :/icons/Path_BFastForward.svg:/icons/Path_BFastForward.svg + :/icons/CAM_BFastForward.svg:/icons/CAM_BFastForward.svg diff --git a/src/Mod/Path/InitGui.py b/src/Mod/Path/InitGui.py index 35df96b8a0..1e71c99eb2 100644 --- a/src/Mod/Path/InitGui.py +++ b/src/Mod/Path/InitGui.py @@ -169,13 +169,13 @@ class CAMWorkbench(Workbench): from Path.Op.Gui import Surface from Path.Op.Gui import Waterline - threedopcmdlist.extend(["Path_Surface", "Path_Waterline"]) - threedcmdgroup = ["Path_3dTools"] + threedopcmdlist.extend(["CAM_Surface", "CAM_Waterline"]) + threedcmdgroup = ["CAM_3dTools"] FreeCADGui.addCommand( - "Path_3dTools", + "CAM_3dTools", PathCommandGroup( threedopcmdlist, - QT_TRANSLATE_NOOP("Path_3dTools", "3D Operations"), + QT_TRANSLATE_NOOP("CAM_3dTools", "3D Operations"), ), ) except ImportError: diff --git a/src/Mod/Path/Path/Base/Gui/IconViewProvider.py b/src/Mod/Path/Path/Base/Gui/IconViewProvider.py index c92531cc6e..73c625ae01 100644 --- a/src/Mod/Path/Path/Base/Gui/IconViewProvider.py +++ b/src/Mod/Path/Path/Base/Gui/IconViewProvider.py @@ -69,7 +69,7 @@ class ViewProvider(object): self.editCallback = state["editCallback"] def getIcon(self): - return ":/icons/Path_{}.svg".format(self.icon) + return ":/icons/CAM_{}.svg".format(self.icon) def onEdit(self, callback): self.editModule = callback.__module__ diff --git a/src/Mod/Path/Path/Base/Gui/SetupSheet.py b/src/Mod/Path/Path/Base/Gui/SetupSheet.py index 8c8b5cf98a..beac01ca1b 100644 --- a/src/Mod/Path/Path/Base/Gui/SetupSheet.py +++ b/src/Mod/Path/Path/Base/Gui/SetupSheet.py @@ -65,7 +65,7 @@ class ViewProvider: self.obj = vobj.Object def getIcon(self): - return ":/icons/Path_SetupSheet.svg" + return ":/icons/CAM_SetupSheet.svg" def dumps(self): return None diff --git a/src/Mod/Path/Path/Dressup/Gui/Preferences.py b/src/Mod/Path/Path/Dressup/Gui/Preferences.py index 18fa63336f..563b57ceee 100644 --- a/src/Mod/Path/Path/Dressup/Gui/Preferences.py +++ b/src/Mod/Path/Path/Dressup/Gui/Preferences.py @@ -36,7 +36,7 @@ def RegisterDressup(dressup): class DressupPreferencesPage: def __init__(self, parent=None): self.form = QtGui.QToolBox() - self.form.setWindowTitle(translate("Path_PreferencesPathDressup", "Dressups")) + self.form.setWindowTitle(translate("CAM_PreferencesPathDressup", "Dressups")) pages = [] for dressup in _dressups: page = dressup.preferencesPage() diff --git a/src/Mod/Path/Path/Main/Gui/Fixture.py b/src/Mod/Path/Path/Main/Gui/Fixture.py index 6761a0d320..c4d10e0b5b 100644 --- a/src/Mod/Path/Path/Main/Gui/Fixture.py +++ b/src/Mod/Path/Path/Main/Gui/Fixture.py @@ -119,7 +119,7 @@ class _ViewProviderFixture: return None def getIcon(self): # optional - return ":/icons/Path_Datums.svg" + return ":/icons/CAM_Datums.svg" def onChanged(self, vobj, prop): # optional mode = 2 @@ -149,7 +149,7 @@ class _ViewProviderFixture: class CommandPathFixture: def GetResources(self): return { - "Pixmap": "Path_Datums", + "Pixmap": "CAM_Datums", "MenuText": QT_TRANSLATE_NOOP("CAM_Fixture", "Fixture"), "ToolTip": QT_TRANSLATE_NOOP( "CAM_Fixture", "Creates a Fixture Offset" diff --git a/src/Mod/Path/Path/Op/Base.py b/src/Mod/Path/Path/Op/Base.py index 8154066ab9..b77868720c 100644 --- a/src/Mod/Path/Path/Op/Base.py +++ b/src/Mod/Path/Path/Op/Base.py @@ -375,9 +375,9 @@ class ObjectOp(object): enums = { "CoolantMode": [ - (translate("Path_Operation", "None"), "None"), - (translate("Path_Operation", "Flood"), "Flood"), - (translate("Path_Operation", "Mist"), "Mist"), + (translate("CAM_Operation", "None"), "None"), + (translate("CAM_Operation", "Flood"), "Flood"), + (translate("CAM_Operation", "Mist"), "Mist"), ], } diff --git a/src/Mod/Path/Path/Op/Gui/Base.py b/src/Mod/Path/Path/Op/Gui/Base.py index bb369015ae..a9a668f149 100644 --- a/src/Mod/Path/Path/Op/Gui/Base.py +++ b/src/Mod/Path/Path/Op/Gui/Base.py @@ -455,7 +455,7 @@ class TaskPanelBaseGeometryPage(TaskPanelPage): super(TaskPanelBaseGeometryPage, self).__init__(obj, features) self.panelTitle = "Base Geometry" - self.OpIcon = ":/icons/Path_BaseGeometry.svg" + self.OpIcon = ":/icons/CAM_BaseGeometry.svg" self.setIcon(self.OpIcon) def getForm(self): @@ -815,7 +815,7 @@ class TaskPanelHeightsPage(TaskPanelPage): self.clearanceHeight = None self.safeHeight = None self.panelTitle = "Heights" - self.OpIcon = ":/icons/Path_Heights.svg" + self.OpIcon = ":/icons/CAM_Heights.svg" self.setIcon(self.OpIcon) def getForm(self): @@ -863,7 +863,7 @@ class TaskPanelDepthsPage(TaskPanelPage): self.finishDepth = None self.stepDown = None self.panelTitle = "Depths" - self.OpIcon = ":/icons/Path_Depths.svg" + self.OpIcon = ":/icons/CAM_Depths.svg" self.setIcon(self.OpIcon) def getForm(self): @@ -1342,7 +1342,7 @@ class CommandSetStartPoint: def GetResources(self): return { - "Pixmap": "Path_StartPoint", + "Pixmap": "CAM_StartPoint", "MenuText": QT_TRANSLATE_NOOP("PathOp", "Pick Start Point"), "ToolTip": QT_TRANSLATE_NOOP("PathOp", "Pick Start Point"), } diff --git a/src/Mod/Path/Path/Op/Gui/Copy.py b/src/Mod/Path/Path/Op/Gui/Copy.py index 7e27330778..bdb35a0f61 100644 --- a/src/Mod/Path/Path/Op/Gui/Copy.py +++ b/src/Mod/Path/Path/Op/Gui/Copy.py @@ -77,7 +77,7 @@ class ViewProviderPathCopy: return def getIcon(self): - return ":/icons/Path_Copy.svg" + return ":/icons/CAM_Copy.svg" def dumps(self): return None @@ -89,10 +89,10 @@ class ViewProviderPathCopy: class CommandPathCopy: def GetResources(self): return { - "Pixmap": "Path_Copy", - "MenuText": QT_TRANSLATE_NOOP("Path_Copy", "Copy"), + "Pixmap": "CAM_Copy", + "MenuText": QT_TRANSLATE_NOOP("CAM_Copy", "Copy"), "ToolTip": QT_TRANSLATE_NOOP( - "Path_Copy", "Creates a linked copy of another path" + "CAM_Copy", "Creates a linked copy of another path" ), } @@ -117,11 +117,11 @@ selection = FreeCADGui.Selection.getSelection() proj = selection[0].InList[0] #get the group that the selectied object is inside if len(selection) != 1: - FreeCAD.Console.PrintError(translate("Path_Copy", "Please select one path object")+"\n") + FreeCAD.Console.PrintError(translate("CAM_Copy", "Please select one path object")+"\n") selGood = False if not selection[0].isDerivedFrom("Path::Feature"): - FreeCAD.Console.PrintError(translate("Path_Copy", "The selected object is not a path")+"\n") + FreeCAD.Console.PrintError(translate("CAM_Copy", "The selected object is not a path")+"\n") selGood = False if selGood: @@ -147,6 +147,6 @@ FreeCAD.ActiveDocument.recompute() if FreeCAD.GuiUp: # register the FreeCAD command - FreeCADGui.addCommand("Path_Copy", CommandPathCopy()) + FreeCADGui.addCommand("CAM_Copy", CommandPathCopy()) FreeCAD.Console.PrintLog("Loading PathCopy... done\n") diff --git a/src/Mod/Path/Path/Op/Gui/MillFace.py b/src/Mod/Path/Path/Op/Gui/MillFace.py index 684a1acf95..e2f1190de7 100644 --- a/src/Mod/Path/Path/Op/Gui/MillFace.py +++ b/src/Mod/Path/Path/Op/Gui/MillFace.py @@ -72,7 +72,7 @@ Command = PathOpGui.SetupOperation( "MillFace", PathMillFace.Create, TaskPanelOpPage, - "Path_Face", + "CAM_Face", QT_TRANSLATE_NOOP("CAM_MillFace", "Face"), QT_TRANSLATE_NOOP( "CAM_MillFace", "Create a Facing Operation from a model or face" diff --git a/src/Mod/Path/Path/Op/Gui/Pocket.py b/src/Mod/Path/Path/Op/Gui/Pocket.py index 45f698e770..f43e78bc0f 100644 --- a/src/Mod/Path/Path/Op/Gui/Pocket.py +++ b/src/Mod/Path/Path/Op/Gui/Pocket.py @@ -53,7 +53,7 @@ Command = PathOpGui.SetupOperation( "Pocket3D", PathPocket.Create, TaskPanelOpPage, - "Path_3DPocket", + "CAM_3DPocket", QT_TRANSLATE_NOOP("CAM_Pocket3D", "3D Pocket"), QT_TRANSLATE_NOOP( "CAM_Pocket3D", "Creates a Path 3D Pocket from a face or faces" diff --git a/src/Mod/Path/Path/Op/Gui/Profile.py b/src/Mod/Path/Path/Op/Gui/Profile.py index 6b652e0811..39a4424e91 100644 --- a/src/Mod/Path/Path/Op/Gui/Profile.py +++ b/src/Mod/Path/Path/Op/Gui/Profile.py @@ -161,7 +161,7 @@ Command = PathOpGui.SetupOperation( "Profile", PathProfile.Create, TaskPanelOpPage, - "Path_Contour", + "CAM_Profile", QT_TRANSLATE_NOOP("Path", "Profile"), QT_TRANSLATE_NOOP( "Path", "Profile entire model, selected face(s) or selected edge(s)" diff --git a/src/Mod/Path/Path/Op/Gui/Surface.py b/src/Mod/Path/Path/Op/Gui/Surface.py index bf2988eec5..7f38b5f228 100644 --- a/src/Mod/Path/Path/Op/Gui/Surface.py +++ b/src/Mod/Path/Path/Op/Gui/Surface.py @@ -278,10 +278,10 @@ Command = PathOpGui.SetupOperation( "Surface", PathSurface.Create, TaskPanelOpPage, - "Path_3DSurface", - QtCore.QT_TRANSLATE_NOOP("Path_Surface", "3D Surface"), + "CAM_3DSurface", + QtCore.QT_TRANSLATE_NOOP("CAM_Surface", "3D Surface"), QtCore.QT_TRANSLATE_NOOP( - "Path_Surface", "Create a 3D Surface Operation from a model" + "CAM_Surface", "Create a 3D Surface Operation from a model" ), PathSurface.SetupProperties, ) diff --git a/src/Mod/Path/Path/Op/Gui/Waterline.py b/src/Mod/Path/Path/Op/Gui/Waterline.py index 5845322b46..8f45e553d2 100644 --- a/src/Mod/Path/Path/Op/Gui/Waterline.py +++ b/src/Mod/Path/Path/Op/Gui/Waterline.py @@ -173,9 +173,9 @@ Command = PathOpGui.SetupOperation( "Waterline", PathWaterline.Create, TaskPanelOpPage, - "Path_Waterline", - QT_TRANSLATE_NOOP("Path_Waterline", "Waterline"), - QT_TRANSLATE_NOOP("Path_Waterline", "Create a Waterline Operation from a model"), + "CAM_Waterline", + QT_TRANSLATE_NOOP("CAM_Waterline", "Waterline"), + QT_TRANSLATE_NOOP("CAM_Waterline", "Create a Waterline Operation from a model"), PathWaterline.SetupProperties, ) diff --git a/src/Mod/Path/Path/Op/Surface.py b/src/Mod/Path/Path/Op/Surface.py index 47cd09ea2d..05547124d6 100644 --- a/src/Mod/Path/Path/Op/Surface.py +++ b/src/Mod/Path/Path/Op/Surface.py @@ -446,52 +446,52 @@ class ObjectSurface(PathOp.ObjectOp): # Enumeration lists for App::PropertyEnumeration properties enums = { "BoundBox": [ - (translate("Path_Surface", "BaseBoundBox"), "BaseBoundBox"), - (translate("Path_Surface", "Stock"), "Stock"), + (translate("CAM_Surface", "BaseBoundBox"), "BaseBoundBox"), + (translate("CAM_Surface", "Stock"), "Stock"), ], "PatternCenterAt": [ - (translate("Path_Surface", "CenterOfMass"), "CenterOfMass"), - (translate("Path_Surface", "CenterOfBoundBox"), "CenterOfBoundBox"), - (translate("Path_Surface", "XminYmin"), "XminYmin"), - (translate("Path_Surface", "Custom"), "Custom"), + (translate("CAM_Surface", "CenterOfMass"), "CenterOfMass"), + (translate("CAM_Surface", "CenterOfBoundBox"), "CenterOfBoundBox"), + (translate("CAM_Surface", "XminYmin"), "XminYmin"), + (translate("CAM_Surface", "Custom"), "Custom"), ], "CutMode": [ - (translate("Path_Surface", "Conventional"), "Conventional"), - (translate("Path_Surface", "Climb"), "Climb"), + (translate("CAM_Surface", "Conventional"), "Conventional"), + (translate("CAM_Surface", "Climb"), "Climb"), ], "CutPattern": [ - (translate("Path_Surface", "Circular"), "Circular"), - (translate("Path_Surface", "CircularZigZag"), "CircularZigZag"), - (translate("Path_Surface", "Line"), "Line"), - (translate("Path_Surface", "Offset"), "Offset"), - (translate("Path_Surface", "Spiral"), "Spiral"), - (translate("Path_Surface", "ZigZag"), "ZigZag"), + (translate("CAM_Surface", "Circular"), "Circular"), + (translate("CAM_Surface", "CircularZigZag"), "CircularZigZag"), + (translate("CAM_Surface", "Line"), "Line"), + (translate("CAM_Surface", "Offset"), "Offset"), + (translate("CAM_Surface", "Spiral"), "Spiral"), + (translate("CAM_Surface", "ZigZag"), "ZigZag"), ], "DropCutterDir": [ - (translate("Path_Surface", "X"), "X"), - (translate("Path_Surface", "Y"), "Y"), + (translate("CAM_Surface", "X"), "X"), + (translate("CAM_Surface", "Y"), "Y"), ], "HandleMultipleFeatures": [ - (translate("Path_Surface", "Collectively"), "Collectively"), - (translate("Path_Surface", "Individually"), "Individually"), + (translate("CAM_Surface", "Collectively"), "Collectively"), + (translate("CAM_Surface", "Individually"), "Individually"), ], "LayerMode": [ - (translate("Path_Surface", "Single-pass"), "Single-pass"), - (translate("Path_Surface", "Multi-pass"), "Multi-pass"), + (translate("CAM_Surface", "Single-pass"), "Single-pass"), + (translate("CAM_Surface", "Multi-pass"), "Multi-pass"), ], "ProfileEdges": [ - (translate("Path_Surface", "None"), "None"), - (translate("Path_Surface", "Only"), "Only"), - (translate("Path_Surface", "First"), "First"), - (translate("Path_Surface", "Last"), "Last"), + (translate("CAM_Surface", "None"), "None"), + (translate("CAM_Surface", "Only"), "Only"), + (translate("CAM_Surface", "First"), "First"), + (translate("CAM_Surface", "Last"), "Last"), ], "RotationAxis": [ - (translate("Path_Surface", "X"), "X"), - (translate("Path_Surface", "Y"), "Y"), + (translate("CAM_Surface", "X"), "X"), + (translate("CAM_Surface", "Y"), "Y"), ], "ScanType": [ - (translate("Path_Surface", "Planar"), "Planar"), - (translate("Path_Surface", "Rotational"), "Rotational"), + (translate("CAM_Surface", "Planar"), "Planar"), + (translate("CAM_Surface", "Rotational"), "Rotational"), ], } diff --git a/src/Mod/Path/Path/Post/scripts/gcode_pre.py b/src/Mod/Path/Path/Post/scripts/gcode_pre.py index 8dc43ec50a..f0921273b9 100644 --- a/src/Mod/Path/Path/Post/scripts/gcode_pre.py +++ b/src/Mod/Path/Path/Post/scripts/gcode_pre.py @@ -223,10 +223,10 @@ def insert(filename, docname=None): if not _isImportEnvironmentReady(): return except PathNoActiveDocumentException: - Path.Log.error(translate("Path_Gcode_pre", "No active document")) + Path.Log.error(translate("CAM_Gcode_pre", "No active document")) return except PathNoJobException: - Path.Log.error(translate("Path_Gcode_pre", "No job object")) + Path.Log.error(translate("CAM_Gcode_pre", "No job object")) return # Create a Custom operation for each gcode-toolNumber pair diff --git a/src/Mod/Path/Path/Tool/Gui/Controller.py b/src/Mod/Path/Path/Tool/Gui/Controller.py index 1ece3e3c45..42d4bdb9e5 100644 --- a/src/Mod/Path/Path/Tool/Gui/Controller.py +++ b/src/Mod/Path/Path/Tool/Gui/Controller.py @@ -138,7 +138,7 @@ def Create(name="Default Tool", tool=None, toolNumber=1): class CommandPathToolController(object): def GetResources(self): return { - "Pixmap": "Path_LengthOffset", + "Pixmap": "CAM_LengthOffset", "MenuText": QT_TRANSLATE_NOOP( "CAM_ToolController", "Add Tool Controller to the Job" ),