diff --git a/src/Mod/Path/Gui/Command.cpp b/src/Mod/Path/Gui/Command.cpp index 0af7ec5ef9..2722826eb8 100644 --- a/src/Mod/Path/Gui/Command.cpp +++ b/src/Mod/Path/Gui/Command.cpp @@ -40,15 +40,15 @@ DEF_STD_CMD_A(CmdPathArea) CmdPathArea::CmdPathArea() - :Command("Path_Area") + :Command("CAM_Area") { sAppModule = "Path"; sGroup = QT_TR_NOOP("Path"); sMenuText = QT_TR_NOOP("Area"); sToolTipText = QT_TR_NOOP("Creates a feature area from selected objects"); - sWhatsThis = "Path_Area"; + sWhatsThis = "CAM_Area"; sStatusTip = sToolTipText; - sPixmap = "Path_Area"; + sPixmap = "CAM_Area"; } void CmdPathArea::activated(int iMsg) @@ -122,15 +122,15 @@ bool CmdPathArea::isActive() DEF_STD_CMD_A(CmdPathAreaWorkplane) CmdPathAreaWorkplane::CmdPathAreaWorkplane() - :Command("Path_Area_Workplane") + :Command("CAM_Area_Workplane") { sAppModule = "Path"; sGroup = QT_TR_NOOP("Path"); sMenuText = QT_TR_NOOP("Area workplane"); sToolTipText = QT_TR_NOOP("Select a workplane for a FeatureArea"); - sWhatsThis = "Path_Area_Workplane"; + sWhatsThis = "CAM_Area_Workplane"; sStatusTip = sToolTipText; - sPixmap = "Path_Area_Workplane"; + sPixmap = "CAM_Area_Workplane"; } void CmdPathAreaWorkplane::activated(int iMsg) @@ -212,15 +212,15 @@ bool CmdPathAreaWorkplane::isActive() DEF_STD_CMD_A(CmdPathCompound) CmdPathCompound::CmdPathCompound() - :Command("Path_Compound") + :Command("CAM_Compound") { sAppModule = "Path"; sGroup = QT_TR_NOOP("Path"); sMenuText = QT_TR_NOOP("Compound"); sToolTipText = QT_TR_NOOP("Creates a compound from selected paths"); - sWhatsThis = "Path_Compound"; + sWhatsThis = "CAM_Compound"; sStatusTip = sToolTipText; - sPixmap = "Path_Compound"; + sPixmap = "CAM_Compound"; } void CmdPathCompound::activated(int iMsg) @@ -264,15 +264,15 @@ bool CmdPathCompound::isActive() DEF_STD_CMD_A(CmdPathShape) CmdPathShape::CmdPathShape() - :Command("Path_Shape") + :Command("CAM_Shape") { sAppModule = "Path"; sGroup = QT_TR_NOOP("Path"); sMenuText = QT_TR_NOOP("From Shape"); sToolTipText = QT_TR_NOOP("Creates a path from a selected shape"); - sWhatsThis = "Path_Shape"; + sWhatsThis = "CAM_Shape"; sStatusTip = sToolTipText; - sPixmap = "Path_Shape"; + sPixmap = "CAM_Shape"; } void CmdPathShape::activated(int iMsg) diff --git a/src/Mod/Path/Gui/Resources/Path.qrc b/src/Mod/Path/Gui/Resources/Path.qrc index 98b0a2594a..b42e80563e 100644 --- a/src/Mod/Path/Gui/Resources/Path.qrc +++ b/src/Mod/Path/Gui/Resources/Path.qrc @@ -1,12 +1,12 @@ - icons/Path_Adaptive.svg + icons/CAM_Adaptive.svg icons/Path_3DPocket.svg icons/Path_3DSurface.svg - icons/Path_Area_View.svg - icons/Path_Area_Workplane.svg - icons/Path_Area.svg - icons/Path_Array.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 @@ -14,61 +14,61 @@ icons/Path_BStep.svg icons/Path_BStop.svg icons/Path_BaseGeometry.svg - icons/Path_Camotics.svg - icons/Path_Comment.svg - icons/Path_Compound.svg + icons/CAM_Camotics.svg + icons/CAM_Comment.svg + icons/CAM_Compound.svg icons/Path_Contour.svg icons/Path_Copy.svg - icons/Path_Custom.svg + icons/CAM_Custom.svg icons/Path_Datums.svg - icons/Path_Deburr.svg + icons/CAM_Deburr.svg icons/Path_Depths.svg - icons/Path_Dressup.svg - icons/Path_Drilling.svg - icons/Path_Engrave.svg - icons/Path_ExportTemplate.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/Path_Helix.svg + icons/CAM_Helix.svg icons/Path_Hop.svg - icons/Path_Inspect.svg - icons/Path_Job.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/Path_OpActive.svg - icons/Path_OpCopy.svg + icons/CAM_OpActive.svg + icons/CAM_OpCopy.svg icons/Path_OperationA.svg icons/Path_OperationB.svg icons/Path_Plane.svg - icons/Path_Pocket.svg - icons/Path_Post.svg - icons/Path_Probe.svg - icons/Path_Profile_Edges.svg - icons/Path_Profile_Face.svg - icons/Path_Profile.svg - icons/Path_Sanity.svg - icons/Path_SelectLoop.svg + icons/CAM_Pocket.svg + icons/CAM_Post.svg + icons/CAM_Probe.svg + icons/CAM_Profile_Edges.svg + icons/CAM_Profile_Face.svg + icons/CAM_Profile.svg + icons/CAM_Sanity.svg + icons/CAM_SelectLoop.svg icons/Path_SetupSheet.svg - icons/Path_Shape.svg - icons/Path_SimpleCopy.svg - icons/Path_Simulator.svg - icons/Path_Slot.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/Path_Stop.svg - icons/Path_ThreadMilling.svg - icons/Path_ToolBit.svg - icons/Path_ToolChange.svg - icons/Path_ToolController.svg - icons/Path_ToolDuplicate.svg - icons/Path_Toolpath.svg - icons/Path_ToolTable.svg - icons/Path_Vcarve.svg + icons/CAM_Stop.svg + icons/CAM_ThreadMilling.svg + icons/CAM_ToolBit.svg + icons/CAM_ToolChange.svg + icons/CAM_ToolController.svg + icons/CAM_ToolDuplicate.svg + icons/CAM_Toolpath.svg + icons/CAM_ToolTable.svg + icons/CAM_Vcarve.svg icons/Path_Waterline.svg icons/arrow-ccw.svg icons/arrow-cw.svg diff --git a/src/Mod/Path/Gui/Resources/icons/Path_Adaptive.svg b/src/Mod/Path/Gui/Resources/icons/CAM_Adaptive.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/Path_Adaptive.svg rename to src/Mod/Path/Gui/Resources/icons/CAM_Adaptive.svg index 22d6e7ee52..4617ac3a3d 100644 --- a/src/Mod/Path/Gui/Resources/icons/Path_Adaptive.svg +++ b/src/Mod/Path/Gui/Resources/icons/CAM_Adaptive.svg @@ -15,7 +15,7 @@ id="svg2816" version="1.1" inkscape:version="0.91 r13725" - sodipodi:docname="Path_Adaptive.svg"> + sodipodi:docname="CAM_Adaptive.svg"> - + @@ -111,7 +111,7 @@ image/svg+xml - Path_Array + CAM_Array 2016-01-19 https://www.freecad.org/wiki/index.php?title=Artwork @@ -119,7 +119,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_Array.svg + FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Array.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/Path_Camotics.svg b/src/Mod/Path/Gui/Resources/icons/CAM_Camotics.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/Path_Camotics.svg rename to src/Mod/Path/Gui/Resources/icons/CAM_Camotics.svg index 473e5a99a4..88b7aac68b 100644 --- a/src/Mod/Path/Gui/Resources/icons/Path_Camotics.svg +++ b/src/Mod/Path/Gui/Resources/icons/CAM_Camotics.svg @@ -8,7 +8,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - sodipodi:docname="Path_Camotics.svg" + sodipodi:docname="CAM_Camotics.svg" inkscape:version="0.92.3 (2405546, 2018-03-11)" version="1.1" id="svg2816" @@ -576,7 +576,7 @@ - Path_Drilling + CAM_Camotics 2015-07-04 https://www.freecad.org/wiki/index.php?title=Artwork @@ -584,7 +584,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_Drilling.svg + FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Camotics.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/Path_Comment.svg b/src/Mod/Path/Gui/Resources/icons/CAM_Comment.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/Path_Comment.svg rename to src/Mod/Path/Gui/Resources/icons/CAM_Comment.svg index 0fb296ad34..5a819b1c0d 100644 --- a/src/Mod/Path/Gui/Resources/icons/Path_Comment.svg +++ b/src/Mod/Path/Gui/Resources/icons/CAM_Comment.svg @@ -1,6 +1,6 @@ - + @@ -105,7 +105,7 @@ image/svg+xml - Path_Comment + CAM_Comment 2015-07-04 https://www.freecad.org/wiki/index.php?title=Artwork @@ -113,7 +113,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_Comment.svg + FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Comment.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/Path_Compound.svg b/src/Mod/Path/Gui/Resources/icons/CAM_Compound.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/Path_Compound.svg rename to src/Mod/Path/Gui/Resources/icons/CAM_Compound.svg index e6ab1ada00..a1c9ea1212 100644 --- a/src/Mod/Path/Gui/Resources/icons/Path_Compound.svg +++ b/src/Mod/Path/Gui/Resources/icons/CAM_Compound.svg @@ -1,6 +1,6 @@ - + @@ -154,7 +154,7 @@ image/svg+xml - Path_Compound + CAM_Compound 2015-07-04 https://www.freecad.org/wiki/index.php?title=Artwork @@ -162,7 +162,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_Compound.svg + FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Compound.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/Path_Custom.svg b/src/Mod/Path/Gui/Resources/icons/CAM_Custom.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/Path_Custom.svg rename to src/Mod/Path/Gui/Resources/icons/CAM_Custom.svg index dfa927d511..75b068f21f 100644 --- a/src/Mod/Path/Gui/Resources/icons/Path_Custom.svg +++ b/src/Mod/Path/Gui/Resources/icons/CAM_Custom.svg @@ -1,6 +1,6 @@ - + @@ -94,7 +94,7 @@ image/svg+xml - Path_Custom + CAM_Custom 2016-01-19 https://www.freecad.org/wiki/index.php?title=Artwork @@ -102,7 +102,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_Custom.svg + FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Custom.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/Path_Deburr.svg b/src/Mod/Path/Gui/Resources/icons/CAM_Deburr.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/Path_Deburr.svg rename to src/Mod/Path/Gui/Resources/icons/CAM_Deburr.svg index 988878a8b4..b0624a0a3f 100644 --- a/src/Mod/Path/Gui/Resources/icons/Path_Deburr.svg +++ b/src/Mod/Path/Gui/Resources/icons/CAM_Deburr.svg @@ -15,7 +15,7 @@ id="svg2816" version="1.1" inkscape:version="0.92.3 (2405546, 2018-03-11)" - sodipodi:docname="Path_Deburr.svg"> + sodipodi:docname="CAM_Deburr.svg"> - Path_Drilling + CAM_Deburr 2015-07-04 https://www.freecad.org/wiki/index.php?title=Artwork @@ -604,7 +604,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_Drilling.svg + FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Deburr.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/Path_Dressup.svg b/src/Mod/Path/Gui/Resources/icons/CAM_Dressup.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/Path_Dressup.svg rename to src/Mod/Path/Gui/Resources/icons/CAM_Dressup.svg index e09798b303..ccd72f8790 100644 --- a/src/Mod/Path/Gui/Resources/icons/Path_Dressup.svg +++ b/src/Mod/Path/Gui/Resources/icons/CAM_Dressup.svg @@ -1,6 +1,6 @@ - + @@ -130,7 +130,7 @@ image/svg+xml - Path_Dressup + CAM_Dressup 2015-07-04 https://www.freecad.org/wiki/index.php?title=Artwork @@ -138,7 +138,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_Dressup.svg + FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Dressup.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/Path_Drilling.svg b/src/Mod/Path/Gui/Resources/icons/CAM_Drilling.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/Path_Drilling.svg rename to src/Mod/Path/Gui/Resources/icons/CAM_Drilling.svg index 96f8d822a9..4a427b1f15 100644 --- a/src/Mod/Path/Gui/Resources/icons/Path_Drilling.svg +++ b/src/Mod/Path/Gui/Resources/icons/CAM_Drilling.svg @@ -1,6 +1,6 @@ - + @@ -111,7 +111,7 @@ image/svg+xml - Path_Drilling + CAM_Drilling 2015-07-04 https://www.freecad.org/wiki/index.php?title=Artwork @@ -119,7 +119,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_Drilling.svg + FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Drilling.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/Path_Engrave.svg b/src/Mod/Path/Gui/Resources/icons/CAM_Engrave.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/Path_Engrave.svg rename to src/Mod/Path/Gui/Resources/icons/CAM_Engrave.svg index 13a3248040..2cfc9c5184 100644 --- a/src/Mod/Path/Gui/Resources/icons/Path_Engrave.svg +++ b/src/Mod/Path/Gui/Resources/icons/CAM_Engrave.svg @@ -1,6 +1,6 @@ - + @@ -112,7 +112,7 @@ image/svg+xml - Path_Engrave + CAM_Engrave 2016-02-24 https://www.freecad.org/wiki/index.php?title=Artwork @@ -120,7 +120,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_Engrave.svg + FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Engrave.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/Path_ExportTemplate.svg b/src/Mod/Path/Gui/Resources/icons/CAM_ExportTemplate.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/Path_ExportTemplate.svg rename to src/Mod/Path/Gui/Resources/icons/CAM_ExportTemplate.svg index eef71f0aca..62b8f5d431 100644 --- a/src/Mod/Path/Gui/Resources/icons/Path_ExportTemplate.svg +++ b/src/Mod/Path/Gui/Resources/icons/CAM_ExportTemplate.svg @@ -16,7 +16,7 @@ id="svg2816" version="1.1" inkscape:version="0.92.2 (5c3e80d, 2017-08-06)" - sodipodi:docname="Path_ExportTemplate.svg"> + sodipodi:docname="CAM_ExportTemplate.svg"> - Path_Job + CAM_ExportTemplate 2016-06-27 https://www.freecad.org/wiki/index.php?title=Artwork @@ -1089,7 +1089,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_Job.svg + FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_ExportTemplate.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/Path_Helix.svg b/src/Mod/Path/Gui/Resources/icons/CAM_Helix.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/Path_Helix.svg rename to src/Mod/Path/Gui/Resources/icons/CAM_Helix.svg index a8b00c64cb..4998b4b7e8 100644 --- a/src/Mod/Path/Gui/Resources/icons/Path_Helix.svg +++ b/src/Mod/Path/Gui/Resources/icons/CAM_Helix.svg @@ -15,7 +15,7 @@ id="svg2816" version="1.1" inkscape:version="0.48.5 r10040" - sodipodi:docname="Path_Helix.svg" + sodipodi:docname="CAM_Helix.svg" inkscape:export-filename="C:\Users\Alex Gryson\Desktop\Path-Helix_64.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90"> @@ -1399,7 +1399,7 @@ [Lorenz Hüdepohl] - Path_Helix + CAM_Helix 2016-05-10 https://www.freecad.org/wiki/index.php?title=Artwork @@ -1407,7 +1407,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_Helix.svg + FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Helix.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/Path_InactiveOp.svg b/src/Mod/Path/Gui/Resources/icons/CAM_InactiveOp.svg similarity index 100% rename from src/Mod/Path/Gui/Resources/icons/Path_InactiveOp.svg rename to src/Mod/Path/Gui/Resources/icons/CAM_InactiveOp.svg diff --git a/src/Mod/Path/Gui/Resources/icons/Path_Inspect.svg b/src/Mod/Path/Gui/Resources/icons/CAM_Inspect.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/Path_Inspect.svg rename to src/Mod/Path/Gui/Resources/icons/CAM_Inspect.svg index d60819ac89..9406f85bcd 100644 --- a/src/Mod/Path/Gui/Resources/icons/Path_Inspect.svg +++ b/src/Mod/Path/Gui/Resources/icons/CAM_Inspect.svg @@ -1,6 +1,6 @@ - + @@ -190,7 +190,7 @@ image/svg+xml - Path_Inspect + CAM_Inspect 2016-01-19 https://www.freecad.org/wiki/index.php?title=Artwork @@ -198,7 +198,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_Inspect.svg + FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Inspect.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/Path_Job.svg b/src/Mod/Path/Gui/Resources/icons/CAM_Job.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/Path_Job.svg rename to src/Mod/Path/Gui/Resources/icons/CAM_Job.svg index 9a458e2360..59dcff85a0 100644 --- a/src/Mod/Path/Gui/Resources/icons/Path_Job.svg +++ b/src/Mod/Path/Gui/Resources/icons/CAM_Job.svg @@ -15,7 +15,7 @@ id="svg2816" version="1.1" inkscape:version="0.48.5 r10040" - sodipodi:docname="Path_Job.svg"> + sodipodi:docname="CAM_Job.svg"> - Path_Job + CAM_Job 2016-06-27 https://www.freecad.org/wiki/index.php?title=Artwork @@ -1129,7 +1129,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_Job.svg + FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Job.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/Path_OpActive.svg b/src/Mod/Path/Gui/Resources/icons/CAM_OpActive.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/Path_OpActive.svg rename to src/Mod/Path/Gui/Resources/icons/CAM_OpActive.svg index 4c841afcb7..28f637baae 100644 --- a/src/Mod/Path/Gui/Resources/icons/Path_OpActive.svg +++ b/src/Mod/Path/Gui/Resources/icons/CAM_OpActive.svg @@ -15,7 +15,7 @@ id="svg2726" sodipodi:version="0.32" inkscape:version="0.91 r13725" - sodipodi:docname="Path_OpActive.svg" + sodipodi:docname="CAM_OpActive.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" version="1.1"> + sodipodi:docname="CAM_OpCopy.svg"> - + @@ -125,7 +125,7 @@ image/svg+xml - Path_Pocket + CAM_Pocket 2015-07-04 https://www.freecad.org/wiki/index.php?title=Artwork @@ -133,7 +133,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_Pocket.svg + FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Pocket.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/Path_Post.svg b/src/Mod/Path/Gui/Resources/icons/CAM_Post.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/Path_Post.svg rename to src/Mod/Path/Gui/Resources/icons/CAM_Post.svg index 25fb4de91d..048d4f2520 100644 --- a/src/Mod/Path/Gui/Resources/icons/Path_Post.svg +++ b/src/Mod/Path/Gui/Resources/icons/CAM_Post.svg @@ -1,6 +1,6 @@ - + @@ -209,7 +209,7 @@ image/svg+xml - Path_Job + CAM_Post 2016-06-27 https://www.freecad.org/wiki/index.php?title=Artwork @@ -217,7 +217,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_Job.svg + FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Post.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/Path_Probe.svg b/src/Mod/Path/Gui/Resources/icons/CAM_Probe.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/Path_Probe.svg rename to src/Mod/Path/Gui/Resources/icons/CAM_Probe.svg index 6a2d992780..e8160d79ea 100644 --- a/src/Mod/Path/Gui/Resources/icons/Path_Probe.svg +++ b/src/Mod/Path/Gui/Resources/icons/CAM_Probe.svg @@ -15,7 +15,7 @@ id="svg2816" version="1.1" inkscape:version="0.91 r13725" - sodipodi:docname="Path_Probe.svg"> + sodipodi:docname="CAM_Probe.svg"> - Path_Drilling + CAM_Probe 2015-07-04 https://www.freecad.org/wiki/index.php?title=Artwork @@ -585,7 +585,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_Drilling.svg + FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Probe.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/Path_Profile.svg b/src/Mod/Path/Gui/Resources/icons/CAM_Profile.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/Path_Profile.svg rename to src/Mod/Path/Gui/Resources/icons/CAM_Profile.svg index c965e5a122..e389c453c1 100644 --- a/src/Mod/Path/Gui/Resources/icons/Path_Profile.svg +++ b/src/Mod/Path/Gui/Resources/icons/CAM_Profile.svg @@ -1,6 +1,6 @@ - + @@ -138,7 +138,7 @@ image/svg+xml - Path_Profile + CAM_Profile 2015-07-04 https://www.freecad.org/wiki/index.php?title=Artwork @@ -146,7 +146,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_Profile.svg + FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Profile.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/Path_Profile_Edges.svg b/src/Mod/Path/Gui/Resources/icons/CAM_Profile_Edges.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/Path_Profile_Edges.svg rename to src/Mod/Path/Gui/Resources/icons/CAM_Profile_Edges.svg index 2be223b0be..a12181771e 100644 --- a/src/Mod/Path/Gui/Resources/icons/Path_Profile_Edges.svg +++ b/src/Mod/Path/Gui/Resources/icons/CAM_Profile_Edges.svg @@ -1,6 +1,6 @@ - + @@ -143,7 +143,7 @@ image/svg+xml - Path_Profile_Edges + CAM_Profile_Edges_Edges 2016-10-19 https://www.freecad.org/wiki/index.php?title=Artwork @@ -151,7 +151,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_Profile_Edges.svg + FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Profile_Edges_Edges.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/Path_Profile_Face.svg b/src/Mod/Path/Gui/Resources/icons/CAM_Profile_Face.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/Path_Profile_Face.svg rename to src/Mod/Path/Gui/Resources/icons/CAM_Profile_Face.svg index 301235c2a6..128a440cfc 100644 --- a/src/Mod/Path/Gui/Resources/icons/Path_Profile_Face.svg +++ b/src/Mod/Path/Gui/Resources/icons/CAM_Profile_Face.svg @@ -1,6 +1,6 @@ - + @@ -138,7 +138,7 @@ image/svg+xml - Path_Profile_Face + CAM_Profile_Face_Face 2016-10-19 https://www.freecad.org/wiki/index.php?title=Artwork @@ -146,7 +146,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_Profile_ + FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Profile_Face_ FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/Path_Sanity.svg b/src/Mod/Path/Gui/Resources/icons/CAM_Sanity.svg similarity index 98% rename from src/Mod/Path/Gui/Resources/icons/Path_Sanity.svg rename to src/Mod/Path/Gui/Resources/icons/CAM_Sanity.svg index 380a7c6d64..4e3761405c 100644 --- a/src/Mod/Path/Gui/Resources/icons/Path_Sanity.svg +++ b/src/Mod/Path/Gui/Resources/icons/CAM_Sanity.svg @@ -1,14 +1,14 @@ - + image/svg+xml - Path_Sanity - 2016-05-15https://www.freecad.org/wiki/index.php?title=ArtworkFreeCADFreeCAD/src/Mod/Path/Gui/Resources/icons/Path_Sanity.svgFreeCAD LGPL2+https://www.gnu.org/copyleft/lesser.html[agryson] Alexander Gryson + CAM_Sanity + 2016-05-15https://www.freecad.org/wiki/index.php?title=ArtworkFreeCADFreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Sanity.svgFreeCAD LGPL2+https://www.gnu.org/copyleft/lesser.html[agryson] Alexander Gryson diff --git a/src/Mod/Path/Gui/Resources/icons/Path_SelectLoop.svg b/src/Mod/Path/Gui/Resources/icons/CAM_SelectLoop.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/Path_SelectLoop.svg rename to src/Mod/Path/Gui/Resources/icons/CAM_SelectLoop.svg index ffd12f17f6..80bcfcd18d 100644 --- a/src/Mod/Path/Gui/Resources/icons/Path_SelectLoop.svg +++ b/src/Mod/Path/Gui/Resources/icons/CAM_SelectLoop.svg @@ -1,6 +1,6 @@ - + @@ -109,7 +109,7 @@ image/svg+xml - Path_SelectLoop + CAM_SelectLoop 2016-10-19 https://www.freecad.org/wiki/index.php?title=Artwork @@ -117,7 +117,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_SelectLoop.svg + FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_SelectLoop.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/Path_Shape.svg b/src/Mod/Path/Gui/Resources/icons/CAM_Shape.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/Path_Shape.svg rename to src/Mod/Path/Gui/Resources/icons/CAM_Shape.svg index 1c6fa01fb8..75fbaddd98 100644 --- a/src/Mod/Path/Gui/Resources/icons/Path_Shape.svg +++ b/src/Mod/Path/Gui/Resources/icons/CAM_Shape.svg @@ -1,6 +1,6 @@ - + @@ -118,7 +118,7 @@ image/svg+xml - Path_Shape + CAM_Shape 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_Shape.svg + FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Shape.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/Path_SimpleCopy.svg b/src/Mod/Path/Gui/Resources/icons/CAM_SimpleCopy.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/Path_SimpleCopy.svg rename to src/Mod/Path/Gui/Resources/icons/CAM_SimpleCopy.svg index bf9422b562..6055d145bb 100644 --- a/src/Mod/Path/Gui/Resources/icons/Path_SimpleCopy.svg +++ b/src/Mod/Path/Gui/Resources/icons/CAM_SimpleCopy.svg @@ -1,6 +1,6 @@ - + @@ -114,7 +114,7 @@ image/svg+xml - Path_SimpleCopy + CAM_SimpleCopy 2016-01-23 https://www.freecad.org/wiki/index.php?title=Artwork @@ -122,7 +122,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_SimpleCopy.svg + FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_SimpleCopy.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/Path_Simulator.svg b/src/Mod/Path/Gui/Resources/icons/CAM_Simulator.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/Path_Simulator.svg rename to src/Mod/Path/Gui/Resources/icons/CAM_Simulator.svg index dc5145cd8b..aba4beaaa3 100644 --- a/src/Mod/Path/Gui/Resources/icons/Path_Simulator.svg +++ b/src/Mod/Path/Gui/Resources/icons/CAM_Simulator.svg @@ -15,7 +15,7 @@ id="svg2816" version="1.1" inkscape:version="0.92.1 r15371" - sodipodi:docname="Path_Simulator.svg"> + sodipodi:docname="CAM_Simulator.svg"> - Path_Drilling + CAM_Slot 2015-07-04 https://www.freecad.org/wiki/index.php?title=Artwork @@ -632,7 +632,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_Drilling.svg + FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Slot.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/Path_Stop.svg b/src/Mod/Path/Gui/Resources/icons/CAM_Stop.svg similarity index 96% rename from src/Mod/Path/Gui/Resources/icons/Path_Stop.svg rename to src/Mod/Path/Gui/Resources/icons/CAM_Stop.svg index 8fabf03d09..16541ba809 100644 --- a/src/Mod/Path/Gui/Resources/icons/Path_Stop.svg +++ b/src/Mod/Path/Gui/Resources/icons/CAM_Stop.svg @@ -1,6 +1,6 @@ - + @@ -17,7 +17,7 @@ image/svg+xml - Path_Stop + CAM_Stop 2015-07-04 https://www.freecad.org/wiki/index.php?title=Artwork @@ -25,7 +25,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_Stop.svg + FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Stop.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/Path_ThreadMilling.svg b/src/Mod/Path/Gui/Resources/icons/CAM_ThreadMilling.svg similarity index 100% rename from src/Mod/Path/Gui/Resources/icons/Path_ThreadMilling.svg rename to src/Mod/Path/Gui/Resources/icons/CAM_ThreadMilling.svg diff --git a/src/Mod/Path/Gui/Resources/icons/Path_ToolBit.svg b/src/Mod/Path/Gui/Resources/icons/CAM_ToolBit.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/Path_ToolBit.svg rename to src/Mod/Path/Gui/Resources/icons/CAM_ToolBit.svg index 57ef1414d5..51308dc30f 100644 --- a/src/Mod/Path/Gui/Resources/icons/Path_ToolBit.svg +++ b/src/Mod/Path/Gui/Resources/icons/CAM_ToolBit.svg @@ -15,7 +15,7 @@ id="svg2816" version="1.1" inkscape:version="0.92.4 (5da689c313, 2019-01-14)" - sodipodi:docname="Path_Tool.svg"> + sodipodi:docname="CAM_Tool.svg"> - Path_ToolTable + CAM_ToolTable 2015-07-04 https://www.freecad.org/wiki/index.php?title=Artwork @@ -874,7 +874,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_ToolTable.svg + FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_ToolTable.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/Path_ToolChange.svg b/src/Mod/Path/Gui/Resources/icons/CAM_ToolChange.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/Path_ToolChange.svg rename to src/Mod/Path/Gui/Resources/icons/CAM_ToolChange.svg index d0c39e1707..8dd11e3c20 100644 --- a/src/Mod/Path/Gui/Resources/icons/Path_ToolChange.svg +++ b/src/Mod/Path/Gui/Resources/icons/CAM_ToolChange.svg @@ -1,6 +1,6 @@ - + @@ -151,7 +151,7 @@ image/svg+xml - Path_ToolChange + CAM_ToolChange 2016-01-20 https://www.freecad.org/wiki/index.php?title=Artwork @@ -159,7 +159,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_ToolChange.svg + FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_ToolChange.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/Path_ToolController.svg b/src/Mod/Path/Gui/Resources/icons/CAM_ToolController.svg similarity index 100% rename from src/Mod/Path/Gui/Resources/icons/Path_ToolController.svg rename to src/Mod/Path/Gui/Resources/icons/CAM_ToolController.svg diff --git a/src/Mod/Path/Gui/Resources/icons/Path_ToolDuplicate.svg b/src/Mod/Path/Gui/Resources/icons/CAM_ToolDuplicate.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/Path_ToolDuplicate.svg rename to src/Mod/Path/Gui/Resources/icons/CAM_ToolDuplicate.svg index 7aab66612a..15fd95e65c 100644 --- a/src/Mod/Path/Gui/Resources/icons/Path_ToolDuplicate.svg +++ b/src/Mod/Path/Gui/Resources/icons/CAM_ToolDuplicate.svg @@ -15,7 +15,7 @@ id="svg2816" version="1.1" inkscape:version="0.92.4 (5da689c313, 2019-01-14)" - sodipodi:docname="Path_ToolDuplicate.svg"> + sodipodi:docname="CAM_ToolDuplicate.svg"> - Path_ToolChange + CAM_ToolChange 2016-01-20 https://www.freecad.org/wiki/index.php?title=Artwork @@ -745,7 +745,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_ToolChange.svg + FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_ToolChange.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/Path_ToolTable.svg b/src/Mod/Path/Gui/Resources/icons/CAM_ToolTable.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/Path_ToolTable.svg rename to src/Mod/Path/Gui/Resources/icons/CAM_ToolTable.svg index dd3eee79a8..ec73a7511c 100644 --- a/src/Mod/Path/Gui/Resources/icons/Path_ToolTable.svg +++ b/src/Mod/Path/Gui/Resources/icons/CAM_ToolTable.svg @@ -1,6 +1,6 @@ - + @@ -174,7 +174,7 @@ image/svg+xml - Path_ToolTable + CAM_ToolTable 2015-07-04 https://www.freecad.org/wiki/index.php?title=Artwork @@ -182,7 +182,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_ToolTable.svg + FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_ToolTable.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/Path_Toolpath.svg b/src/Mod/Path/Gui/Resources/icons/CAM_Toolpath.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/Path_Toolpath.svg rename to src/Mod/Path/Gui/Resources/icons/CAM_Toolpath.svg index 0e460f3e1e..7ffddf4e3e 100644 --- a/src/Mod/Path/Gui/Resources/icons/Path_Toolpath.svg +++ b/src/Mod/Path/Gui/Resources/icons/CAM_Toolpath.svg @@ -1,6 +1,6 @@ - + @@ -116,7 +116,7 @@ image/svg+xml - Path_Toolpath + CAM_Toolpath 2015-07-04 https://www.freecad.org/wiki/index.php?title=Artwork @@ -124,7 +124,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_Toolpath.svg + FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Toolpath.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/Path_Vcarve.svg b/src/Mod/Path/Gui/Resources/icons/CAM_Vcarve.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/Path_Vcarve.svg rename to src/Mod/Path/Gui/Resources/icons/CAM_Vcarve.svg index f27a178e55..74f9e44253 100644 --- a/src/Mod/Path/Gui/Resources/icons/Path_Vcarve.svg +++ b/src/Mod/Path/Gui/Resources/icons/CAM_Vcarve.svg @@ -15,7 +15,7 @@ id="svg2816" version="1.1" inkscape:version="0.92.3 (2405546, 2018-03-11)" - sodipodi:docname="Path_Vcarve.svg"> + sodipodi:docname="CAM_Vcarve.svg"> - Path_Engrave + CAM_Vcarve 2016-02-24 https://www.freecad.org/wiki/index.php?title=Artwork @@ -604,7 +604,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_Engrave.svg + FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Vcarve.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/panels/DressUpLeadInOutEdit.ui b/src/Mod/Path/Gui/Resources/panels/DressUpLeadInOutEdit.ui index 8997bf03e1..5edf0b83fa 100644 --- a/src/Mod/Path/Gui/Resources/panels/DressUpLeadInOutEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/DressUpLeadInOutEdit.ui @@ -1,7 +1,7 @@ - Path_DressupLeadInOut - + CAM_DressupLeadInOut + 0 diff --git a/src/Mod/Path/Gui/Resources/panels/ToolBitLibraryEdit.ui b/src/Mod/Path/Gui/Resources/panels/ToolBitLibraryEdit.ui index 21a0dea14d..d07da00243 100644 --- a/src/Mod/Path/Gui/Resources/panels/ToolBitLibraryEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/ToolBitLibraryEdit.ui @@ -36,7 +36,7 @@ - :/icons/Path_ToolBit.svg:/icons/Path_ToolBit.svg + :/icons/CAM_ToolBit.svg:/icons/CAM_ToolBit.svg @@ -56,7 +56,7 @@ - :/icons/Path_ToolDuplicate.svg:/icons/Path_ToolDuplicate.svg + :/icons/CAM_ToolDuplicate.svg:/icons/CAM_ToolDuplicate.svg diff --git a/src/Mod/Path/Gui/Resources/panels/ToolBitSelector.ui b/src/Mod/Path/Gui/Resources/panels/ToolBitSelector.ui index f54112a0ae..6876d3c617 100644 --- a/src/Mod/Path/Gui/Resources/panels/ToolBitSelector.ui +++ b/src/Mod/Path/Gui/Resources/panels/ToolBitSelector.ui @@ -57,7 +57,7 @@ - :/icons/Path_ToolTable.svg:/icons/Path_ToolTable.svg + :/icons/CAM_ToolTable.svg:/icons/CAM_ToolTable.svg diff --git a/src/Mod/Path/Gui/TaskDlgPathCompound.cpp b/src/Mod/Path/Gui/TaskDlgPathCompound.cpp index a5ff799522..aec3a06a08 100644 --- a/src/Mod/Path/Gui/TaskDlgPathCompound.cpp +++ b/src/Mod/Path/Gui/TaskDlgPathCompound.cpp @@ -46,7 +46,7 @@ using namespace Gui; //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ TaskWidgetPathCompound::TaskWidgetPathCompound(ViewProviderPathCompound *CompoundView,QWidget *parent) - : TaskBox(Gui::BitmapFactory().pixmap("Path_Compound"),tr("Compound paths"),true, parent) + : TaskBox(Gui::BitmapFactory().pixmap("CAM_Compound"),tr("Compound paths"),true, parent) { // we need a separate container widget to add all controls to proxy = new QWidget(this); diff --git a/src/Mod/Path/Gui/ViewProviderArea.cpp b/src/Mod/Path/Gui/ViewProviderArea.cpp index 40d0f6588a..60063e51f1 100644 --- a/src/Mod/Path/Gui/ViewProviderArea.cpp +++ b/src/Mod/Path/Gui/ViewProviderArea.cpp @@ -34,7 +34,7 @@ PROPERTY_SOURCE(PathGui::ViewProviderArea, PartGui::ViewProviderPlaneParametric) ViewProviderArea::ViewProviderArea() { - sPixmap = "Path_Area.svg"; + sPixmap = "CAM_Area.svg"; } ViewProviderArea::~ViewProviderArea() @@ -118,7 +118,7 @@ PROPERTY_SOURCE(PathGui::ViewProviderAreaView, PartGui::ViewProviderPlaneParamet ViewProviderAreaView::ViewProviderAreaView() { - sPixmap = "Path_Area_View.svg"; + sPixmap = "CAM_Area_View.svg"; } ViewProviderAreaView::~ViewProviderAreaView() diff --git a/src/Mod/Path/Gui/ViewProviderPath.cpp b/src/Mod/Path/Gui/ViewProviderPath.cpp index 63b24a4bae..d874c6d26f 100644 --- a/src/Mod/Path/Gui/ViewProviderPath.cpp +++ b/src/Mod/Path/Gui/ViewProviderPath.cpp @@ -716,7 +716,7 @@ void ViewProviderPath::recomputeBoundingBox() QIcon ViewProviderPath::getIcon() const { - return Gui::BitmapFactory().pixmap("Path_Toolpath"); + return Gui::BitmapFactory().pixmap("CAM_Toolpath"); } // Python object ----------------------------------------------------------------------- diff --git a/src/Mod/Path/Gui/ViewProviderPathCompound.cpp b/src/Mod/Path/Gui/ViewProviderPathCompound.cpp index a6d72afa0e..9c6061ab77 100644 --- a/src/Mod/Path/Gui/ViewProviderPathCompound.cpp +++ b/src/Mod/Path/Gui/ViewProviderPathCompound.cpp @@ -76,7 +76,7 @@ void ViewProviderPathCompound::dropObject(App::DocumentObject* obj) QIcon ViewProviderPathCompound::getIcon() const { - return Gui::BitmapFactory().pixmap("Path_Compound"); + return Gui::BitmapFactory().pixmap("CAM_Compound"); } // Python object ----------------------------------------------------------------------- diff --git a/src/Mod/Path/Gui/ViewProviderPathShape.cpp b/src/Mod/Path/Gui/ViewProviderPathShape.cpp index f8e559695d..d3f5fe6d20 100644 --- a/src/Mod/Path/Gui/ViewProviderPathShape.cpp +++ b/src/Mod/Path/Gui/ViewProviderPathShape.cpp @@ -36,7 +36,7 @@ PROPERTY_SOURCE(PathGui::ViewProviderPathShape, PathGui::ViewProviderPath) QIcon ViewProviderPathShape::getIcon() const { - return Gui::BitmapFactory().pixmap("Path_Shape"); + return Gui::BitmapFactory().pixmap("CAM_Shape"); } std::vector ViewProviderPathShape::claimChildren() const diff --git a/src/Mod/Path/InitGui.py b/src/Mod/Path/InitGui.py index 0124ea657c..35df96b8a0 100644 --- a/src/Mod/Path/InitGui.py +++ b/src/Mod/Path/InitGui.py @@ -92,64 +92,62 @@ class CAMWorkbench(Workbench): Path.GuiInit.Startup() # build commands list - projcmdlist = ["Path_Job", "Path_Post", "Path_Sanity"] + projcmdlist = ["CAM_Job", "CAM_Post", "CAM_Sanity"] toolcmdlist = [ - "Path_Inspect", - "Path_Simulator", - "Path_SelectLoop", - "Path_OpActiveToggle", + "CAM_Inspect", + "CAM_Simulator", + "CAM_SelectLoop", + "CAM_OpActiveToggle", ] prepcmdlist = [ - "Path_Fixture", - "Path_Comment", - "Path_Stop", - "Path_Custom", - "Path_Probe", + "CAM_Fixture", + "CAM_Comment", + "CAM_Stop", + "CAM_Custom", + "CAM_Probe", ] twodopcmdlist = [ - "Path_Profile", - "Path_Pocket_Shape", - "Path_Drilling", - "Path_MillFace", - "Path_Helix", - "Path_Adaptive", + "CAM_Profile", + "CAM_Pocket_Shape", + "CAM_Drilling", + "CAM_MillFace", + "CAM_Helix", + "CAM_Adaptive", ] - threedopcmdlist = ["Path_Pocket3D"] - engravecmdlist = ["Path_Engrave", "Path_Deburr", "Path_Vcarve"] - modcmdlist = ["Path_OperationCopy", "Path_Array", "Path_SimpleCopy"] + threedopcmdlist = ["CAM_Pocket3D"] + engravecmdlist = ["CAM_Engrave", "CAM_Deburr", "CAM_Vcarve"] + modcmdlist = ["CAM_OperationCopy", "CAM_Array", "CAM_SimpleCopy"] dressupcmdlist = [ - "Path_DressupAxisMap", - "Path_DressupPathBoundary", - "Path_DressupDogbone", - "Path_DressupDragKnife", - "Path_DressupLeadInOut", - "Path_DressupRampEntry", - "Path_DressupTag", - "Path_DressupZCorrect", + "CAM_DressupAxisMap", + "CAM_DressupPathBoundary", + "CAM_DressupDogbone", + "CAM_DressupDragKnife", + "CAM_DressupLeadInOut", + "CAM_DressupRampEntry", + "CAM_DressupTag", + "CAM_DressupZCorrect", ] extracmdlist = [] - # modcmdmore = ["Path_Hop",] - # remotecmdlist = ["Path_Remote"] specialcmdlist = [] toolcmdlist.extend(PathToolBitLibraryCmd.BarList) toolbitcmdlist = PathToolBitLibraryCmd.MenuList - engravecmdgroup = ["Path_EngraveTools"] + engravecmdgroup = ["CAM_EngraveTools"] FreeCADGui.addCommand( - "Path_EngraveTools", + "CAM_EngraveTools", PathCommandGroup( engravecmdlist, - QT_TRANSLATE_NOOP("Path_EngraveTools", "Engraving Operations"), + QT_TRANSLATE_NOOP("CAM_EngraveTools", "Engraving Operations"), ), ) threedcmdgroup = threedopcmdlist if Path.Preferences.experimentalFeaturesEnabled(): - prepcmdlist.append("Path_Shape") - extracmdlist.extend(["Path_Area", "Path_Area_Workplane"]) - specialcmdlist.append("Path_ThreadMilling") - twodopcmdlist.append("Path_Slot") + prepcmdlist.append("CAM_Shape") + extracmdlist.extend(["CAM_Area", "CAM_Area_Workplane"]) + specialcmdlist.append("CAM_ThreadMilling") + twodopcmdlist.append("CAM_Slot") if Path.Preferences.advancedOCLFeaturesEnabled(): try: @@ -159,7 +157,7 @@ class CAMWorkbench(Workbench): v = parse(r) if v >= Version("1.2.2"): - toolcmdlist.append("Path_Camotics") + toolcmdlist.append("CAM_Camotics") except (FileNotFoundError, ModuleNotFoundError): pass @@ -201,7 +199,7 @@ class CAMWorkbench(Workbench): self.appendMenu( [QT_TRANSLATE_NOOP("Workbench", "&CAM")], projcmdlist - + ["Path_ExportTemplate", "Separator"] + + ["CAM_ExportTemplate", "Separator"] + toolcmdlist + toolbitcmdlist + ["Separator"] @@ -249,7 +247,7 @@ class CAMWorkbench(Workbench): QT_TRANSLATE_NOOP("Workbench", "&CAM"), QT_TRANSLATE_NOOP("Workbench", "Utils"), ], - ["Path_PropertyBag"], + ["CAM_PropertyBag"], ) self.dressupcmds = dressupcmdlist @@ -287,18 +285,18 @@ class CAMWorkbench(Workbench): obj = FreeCADGui.Selection.getSelection()[0] if obj.isDerivedFrom("Path::Feature"): self.appendContextMenu("", "Separator") - self.appendContextMenu("", ["Path_Inspect"]) + self.appendContextMenu("", ["CAM_Inspect"]) selectedName = obj.Name if "Remote" in selectedName: self.appendContextMenu("", ["Refresh_Path"]) if "Job" in selectedName: self.appendContextMenu( - "", ["Path_ExportTemplate"] + self.toolbitctxmenu + "", ["CAM_ExportTemplate"] + self.toolbitctxmenu ) menuAppended = True if isinstance(obj.Proxy, Path.Op.Base.ObjectOp): self.appendContextMenu( - "", ["Path_OperationCopy", "Path_OpActiveToggle"] + "", ["CAM_OperationCopy", "CAM_OpActiveToggle"] ) menuAppended = True if obj.isDerivedFrom("Path::Feature"): @@ -314,7 +312,7 @@ class CAMWorkbench(Workbench): self.appendContextMenu("", [cmd]) menuAppended = True if isinstance(obj.Proxy, Path.Tool.Bit.ToolBit): - self.appendContextMenu("", ["Path_ToolBitSave", "Path_ToolBitSaveAs"]) + self.appendContextMenu("", ["CAM_ToolBitSave", "CAM_ToolBitSaveAs"]) menuAppended = True if menuAppended: self.appendContextMenu("", "Separator") diff --git a/src/Mod/Path/Path/Base/Gui/PropertyBag.py b/src/Mod/Path/Path/Base/Gui/PropertyBag.py index 1dc4b01e14..d40c95f3bc 100644 --- a/src/Mod/Path/Path/Base/Gui/PropertyBag.py +++ b/src/Mod/Path/Path/Base/Gui/PropertyBag.py @@ -436,9 +436,9 @@ class PropertyBagCreateCommand(object): def GetResources(self): return { - "MenuText": translate("Path_PropertyBag", "PropertyBag"), + "MenuText": translate("CAM_PropertyBag", "PropertyBag"), "ToolTip": translate( - "Path_PropertyBag", + "CAM_PropertyBag", "Creates an object which can be used to store reference properties.", ), } @@ -463,6 +463,6 @@ class PropertyBagCreateCommand(object): if FreeCAD.GuiUp: - FreeCADGui.addCommand("Path_PropertyBag", PropertyBagCreateCommand()) + FreeCADGui.addCommand("CAM_PropertyBag", PropertyBagCreateCommand()) FreeCAD.Console.PrintLog("Loading PathPropertyBagGui ... done\n") diff --git a/src/Mod/Path/Path/Dressup/Boundary.py b/src/Mod/Path/Path/Dressup/Boundary.py index 2305b888a3..58af8071fa 100644 --- a/src/Mod/Path/Path/Dressup/Boundary.py +++ b/src/Mod/Path/Path/Dressup/Boundary.py @@ -301,7 +301,7 @@ def Create(base, name="DressupPathBoundary"): if not base.isDerivedFrom("Path::Feature"): Path.Log.error( - translate("Path_DressupPathBoundary", "The selected object is not a path") + translate("CAM_DressupPathBoundary", "The selected object is not a path") + "\n" ) return None diff --git a/src/Mod/Path/Path/Dressup/Gui/AxisMap.py b/src/Mod/Path/Path/Dressup/Gui/AxisMap.py index 2f0e7a786d..88baf67bbb 100644 --- a/src/Mod/Path/Path/Dressup/Gui/AxisMap.py +++ b/src/Mod/Path/Path/Dressup/Gui/AxisMap.py @@ -259,11 +259,11 @@ class ViewProviderDressup: class CommandPathDressup: def GetResources(self): return { - "Pixmap": "Path_Dressup", - "MenuText": QT_TRANSLATE_NOOP("Path_DressupAxisMap", "Axis Map"), + "Pixmap": "CAM_Dressup", + "MenuText": QT_TRANSLATE_NOOP("CAM_DressupAxisMap", "Axis Map"), "Accel": "", "ToolTip": QT_TRANSLATE_NOOP( - "Path_DressupAxisMap", "Remap one axis to another." + "CAM_DressupAxisMap", "Remap one axis to another." ), } @@ -280,17 +280,17 @@ class CommandPathDressup: selection = FreeCADGui.Selection.getSelection() if len(selection) != 1: FreeCAD.Console.PrintError( - translate("Path_Dressup", "Please select one path object\n") + translate("CAM_Dressup", "Please select one path object\n") ) return if not selection[0].isDerivedFrom("Path::Feature"): FreeCAD.Console.PrintError( - translate("Path_Dressup", "The selected object is not a path\n") + translate("CAM_Dressup", "The selected object is not a path\n") ) return if selection[0].isDerivedFrom("Path::FeatureCompoundPython"): FreeCAD.Console.PrintError( - translate("Path_Dressup", "Please select a Path object") + translate("CAM_Dressup", "Please select a Path object") ) return @@ -320,6 +320,6 @@ class CommandPathDressup: if FreeCAD.GuiUp: # register the FreeCAD command - FreeCADGui.addCommand("Path_DressupAxisMap", CommandPathDressup()) + FreeCADGui.addCommand("CAM_DressupAxisMap", CommandPathDressup()) FreeCAD.Console.PrintLog("Loading PathDressup... done\n") diff --git a/src/Mod/Path/Path/Dressup/Gui/Boundary.py b/src/Mod/Path/Path/Dressup/Gui/Boundary.py index e27c0169e8..850b0fc2cc 100644 --- a/src/Mod/Path/Path/Dressup/Gui/Boundary.py +++ b/src/Mod/Path/Path/Dressup/Gui/Boundary.py @@ -259,10 +259,10 @@ def Create(base, name="DressupPathBoundary"): class CommandPathDressupPathBoundary: def GetResources(self): return { - "Pixmap": "Path_Dressup", - "MenuText": QT_TRANSLATE_NOOP("Path_DressupPathBoundary", "Boundary"), + "Pixmap": "CAM_Dressup", + "MenuText": QT_TRANSLATE_NOOP("CAM_DressupPathBoundary", "Boundary"), "ToolTip": QT_TRANSLATE_NOOP( - "Path_DressupPathBoundary", + "CAM_DressupPathBoundary", "Creates a Path Boundary Dress-up from a selected path", ), } @@ -279,7 +279,7 @@ class CommandPathDressupPathBoundary: selection = FreeCADGui.Selection.getSelection() if len(selection) != 1: Path.Log.error( - translate("Path_DressupPathBoundary", "Please select one path object") + translate("CAM_DressupPathBoundary", "Please select one path object") + "\n" ) return @@ -297,6 +297,6 @@ class CommandPathDressupPathBoundary: if FreeCAD.GuiUp: # register the FreeCAD command - FreeCADGui.addCommand("Path_DressupPathBoundary", CommandPathDressupPathBoundary()) + FreeCADGui.addCommand("CAM_DressupPathBoundary", CommandPathDressupPathBoundary()) Path.Log.notice("Loading PathDressupPathBoundaryGui... done\n") diff --git a/src/Mod/Path/Path/Dressup/Gui/Dogbone.py b/src/Mod/Path/Path/Dressup/Gui/Dogbone.py index be11dc11fa..daa90ff976 100644 --- a/src/Mod/Path/Path/Dressup/Gui/Dogbone.py +++ b/src/Mod/Path/Path/Dressup/Gui/Dogbone.py @@ -1357,10 +1357,10 @@ def Create(base, name="DogboneDressup"): class CommandDressupDogbone(object): def GetResources(self): return { - "Pixmap": "Path_Dressup", - "MenuText": QT_TRANSLATE_NOOP("Path_DressupDogbone", "Dogbone"), + "Pixmap": "CAM_Dressup", + "MenuText": QT_TRANSLATE_NOOP("CAM_DressupDogbone", "Dogbone"), "ToolTip": QT_TRANSLATE_NOOP( - "Path_DressupDogbone", + "CAM_DressupDogbone", "Creates a Dogbone Dress-up object from a selected path", ), } @@ -1378,13 +1378,13 @@ class CommandDressupDogbone(object): selection = FreeCADGui.Selection.getSelection() if len(selection) != 1: FreeCAD.Console.PrintError( - translate("Path_DressupDogbone", "Please select one path object") + "\n" + translate("CAM_DressupDogbone", "Please select one path object") + "\n" ) return baseObject = selection[0] if not baseObject.isDerivedFrom("Path::Feature"): FreeCAD.Console.PrintError( - translate("Path_DressupDogbone", "The selected object is not a path") + translate("CAM_DressupDogbone", "The selected object is not a path") + "\n" ) return @@ -1406,6 +1406,6 @@ class CommandDressupDogbone(object): # from PySide import QtGui # from pivy import coin # -# FreeCADGui.addCommand("Path_DressupDogbone", CommandDressupDogbone()) +# FreeCADGui.addCommand("CAM_DressupDogbone", CommandDressupDogbone()) FreeCAD.Console.PrintLog("Loading DressupDogbone... done\n") diff --git a/src/Mod/Path/Path/Dressup/Gui/DogboneII.py b/src/Mod/Path/Path/Dressup/Gui/DogboneII.py index 5c3ecfea27..658610af63 100644 --- a/src/Mod/Path/Path/Dressup/Gui/DogboneII.py +++ b/src/Mod/Path/Path/Dressup/Gui/DogboneII.py @@ -325,10 +325,10 @@ def Create(base, name="DressupDogbone"): class CommandDressupDogboneII(object): def GetResources(self): return { - "Pixmap": "Path_Dressup", - "MenuText": QT_TRANSLATE_NOOP("Path_DressupDogbone", "Dogbone"), + "Pixmap": "CAM_Dressup", + "MenuText": QT_TRANSLATE_NOOP("CAM_DressupDogbone", "Dogbone"), "ToolTip": QT_TRANSLATE_NOOP( - "Path_DressupDogbone", + "CAM_DressupDogbone", "Creates a Dogbone Dress-up object from a selected path", ), } @@ -346,13 +346,13 @@ class CommandDressupDogboneII(object): selection = FreeCADGui.Selection.getSelection() if len(selection) != 1: FreeCAD.Console.PrintError( - translate("Path_DressupDogbone", "Please select one path object") + "\n" + translate("CAM_DressupDogbone", "Please select one path object") + "\n" ) return baseObject = selection[0] if not baseObject.isDerivedFrom("Path::Feature"): FreeCAD.Console.PrintError( - translate("Path_DressupDogbone", "The selected object is not a path") + translate("CAM_DressupDogbone", "The selected object is not a path") + "\n" ) return @@ -373,6 +373,6 @@ if FreeCAD.GuiUp: from PySide import QtGui from pivy import coin - FreeCADGui.addCommand("Path_DressupDogbone", CommandDressupDogboneII()) + FreeCADGui.addCommand("CAM_DressupDogbone", CommandDressupDogboneII()) FreeCAD.Console.PrintLog("Loading DressupDogboneII ... done\n") diff --git a/src/Mod/Path/Path/Dressup/Gui/Dragknife.py b/src/Mod/Path/Path/Dressup/Gui/Dragknife.py index 301174b8c7..90612030fa 100644 --- a/src/Mod/Path/Path/Dressup/Gui/Dragknife.py +++ b/src/Mod/Path/Path/Dressup/Gui/Dragknife.py @@ -597,10 +597,10 @@ class ViewProviderDressup: class CommandDressupDragknife: def GetResources(self): return { - "Pixmap": "Path_Dressup", - "MenuText": QT_TRANSLATE_NOOP("Path_DressupDragKnife", "DragKnife"), + "Pixmap": "CAM_Dressup", + "MenuText": QT_TRANSLATE_NOOP("CAM_DressupDragKnife", "DragKnife"), "ToolTip": QT_TRANSLATE_NOOP( - "Path_DressupDragKnife", + "CAM_DressupDragKnife", "Modifies a path to add dragknife corner actions", ), } @@ -618,19 +618,19 @@ class CommandDressupDragknife: selection = FreeCADGui.Selection.getSelection() if len(selection) != 1: FreeCAD.Console.PrintError( - translate("Path_DressupDragKnife", "Please select one path object") + translate("CAM_DressupDragKnife", "Please select one path object") + "\n" ) return if not selection[0].isDerivedFrom("Path::Feature"): FreeCAD.Console.PrintError( - translate("Path_DressupDragKnife", "The selected object is not a path") + translate("CAM_DressupDragKnife", "The selected object is not a path") + "\n" ) return if selection[0].isDerivedFrom("Path::FeatureCompoundPython"): FreeCAD.Console.PrintError( - translate("Path_DressupDragKnife", "Please select a Path object") + translate("CAM_DressupDragKnife", "Please select a Path object") ) return @@ -663,6 +663,6 @@ class CommandDressupDragknife: if FreeCAD.GuiUp: # register the FreeCAD command - FreeCADGui.addCommand("Path_DressupDragKnife", CommandDressupDragknife()) + FreeCADGui.addCommand("CAM_DressupDragKnife", CommandDressupDragknife()) -FreeCAD.Console.PrintLog("Loading Path_DressupDragKnife... done\n") +FreeCAD.Console.PrintLog("Loading CAM_DressupDragKnife... done\n") diff --git a/src/Mod/Path/Path/Dressup/Gui/LeadInOut.py b/src/Mod/Path/Path/Dressup/Gui/LeadInOut.py index dbd2ac8620..15b4041e0f 100644 --- a/src/Mod/Path/Path/Dressup/Gui/LeadInOut.py +++ b/src/Mod/Path/Path/Dressup/Gui/LeadInOut.py @@ -49,9 +49,9 @@ else: class ObjectDressup: def __init__(self, obj): lead_styles = [ - QT_TRANSLATE_NOOP("Path_DressupLeadInOut", "Arc"), - QT_TRANSLATE_NOOP("Path_DressupLeadInOut", "Tangent"), - QT_TRANSLATE_NOOP("Path_DressupLeadInOut", "Perpendicular"), + QT_TRANSLATE_NOOP("CAM_DressupLeadInOut", "Arc"), + QT_TRANSLATE_NOOP("CAM_DressupLeadInOut", "Tangent"), + QT_TRANSLATE_NOOP("CAM_DressupLeadInOut", "Perpendicular"), ] self.obj = obj obj.addProperty( @@ -164,14 +164,14 @@ class ObjectDressup: if obj.Length <= 0: Path.Log.error( - translate("Path_DressupLeadInOut", "Length/Radius positive not Null") + translate("CAM_DressupLeadInOut", "Length/Radius positive not Null") + "\n" ) obj.Length = 0.1 if obj.LengthOut <= 0: Path.Log.error( - translate("Path_DressupLeadInOut", "Length/Radius positive not Null") + translate("CAM_DressupLeadInOut", "Length/Radius positive not Null") + "\n" ) obj.LengthOut = 0.1 @@ -460,10 +460,10 @@ class ViewProviderDressup: class CommandPathDressupLeadInOut: def GetResources(self): return { - "Pixmap": "Path_Dressup", - "MenuText": QT_TRANSLATE_NOOP("Path_DressupLeadInOut", "LeadInOut"), + "Pixmap": "CAM_Dressup", + "MenuText": QT_TRANSLATE_NOOP("CAM_DressupLeadInOut", "LeadInOut"), "ToolTip": QT_TRANSLATE_NOOP( - "Path_DressupLeadInOut", + "CAM_DressupLeadInOut", "Creates a Cutter Radius Compensation G41/G42 Entry Dressup object from a selected path", ), } @@ -479,20 +479,20 @@ class CommandPathDressupLeadInOut: selection = FreeCADGui.Selection.getSelection() if len(selection) != 1: Path.Log.error( - translate("Path_DressupLeadInOut", "Please select one path object") + translate("CAM_DressupLeadInOut", "Please select one path object") + "\n" ) return baseObject = selection[0] if not baseObject.isDerivedFrom("Path::Feature"): Path.Log.error( - translate("Path_DressupLeadInOut", "The selected object is not a path") + translate("CAM_DressupLeadInOut", "The selected object is not a path") + "\n" ) return if baseObject.isDerivedFrom("Path::FeatureCompoundPython"): Path.Log.error( - translate("Path_DressupLeadInOut", "Please select a Profile object") + translate("CAM_DressupLeadInOut", "Please select a Profile object") ) return @@ -521,6 +521,6 @@ class CommandPathDressupLeadInOut: if App.GuiUp: # register the FreeCAD command - FreeCADGui.addCommand("Path_DressupLeadInOut", CommandPathDressupLeadInOut()) + FreeCADGui.addCommand("CAM_DressupLeadInOut", CommandPathDressupLeadInOut()) -Path.Log.notice("Loading Path_DressupLeadInOut... done\n") +Path.Log.notice("Loading CAM_DressupLeadInOut... done\n") diff --git a/src/Mod/Path/Path/Dressup/Gui/RampEntry.py b/src/Mod/Path/Path/Dressup/Gui/RampEntry.py index ec79e763ce..5963d27dc6 100644 --- a/src/Mod/Path/Path/Dressup/Gui/RampEntry.py +++ b/src/Mod/Path/Path/Dressup/Gui/RampEntry.py @@ -128,25 +128,25 @@ class ObjectDressup: enums = { "Method": [ - (translate("Path_DressupRampEntry", "RampMethod1"), "RampMethod1"), - (translate("Path_DressupRampEntry", "RampMethod2"), "RampMethod2"), - (translate("Path_DressupRampEntry", "RampMethod3"), "RampMethod3"), - (translate("Path_DressupRampEntry", "Helix"), "Helix"), + (translate("CAM_DressupRampEntry", "RampMethod1"), "RampMethod1"), + (translate("CAM_DressupRampEntry", "RampMethod2"), "RampMethod2"), + (translate("CAM_DressupRampEntry", "RampMethod3"), "RampMethod3"), + (translate("CAM_DressupRampEntry", "Helix"), "Helix"), ], "RampFeedRate": [ ( - translate("Path_DressupRampEntry", "Horizontal Feed Rate"), + translate("CAM_DressupRampEntry", "Horizontal Feed Rate"), "Horizontal Feed Rate", ), ( - translate("Path_DressupRampEntry", "Vertical Feed Rate"), + translate("CAM_DressupRampEntry", "Vertical Feed Rate"), "Vertical Feed Rate", ), ( - translate("Path_DressupRampEntry", "Ramp Feed Rate"), + translate("CAM_DressupRampEntry", "Ramp Feed Rate"), "Ramp Feed Rate", ), - (translate("Path_DressupRampEntry", "Custom"), "Custom"), + (translate("CAM_DressupRampEntry", "Custom"), "Custom"), ], } @@ -894,10 +894,10 @@ class ViewProviderDressup: class CommandPathDressupRampEntry: def GetResources(self): return { - "Pixmap": "Path_Dressup", - "MenuText": QT_TRANSLATE_NOOP("Path_DressupRampEntry", "RampEntry"), + "Pixmap": "CAM_Dressup", + "MenuText": QT_TRANSLATE_NOOP("CAM_DressupRampEntry", "RampEntry"), "ToolTip": QT_TRANSLATE_NOOP( - "Path_DressupRampEntry", + "CAM_DressupRampEntry", "Creates a Ramp Entry Dress-up object from a selected path", ), } @@ -914,20 +914,20 @@ class CommandPathDressupRampEntry: selection = FreeCADGui.Selection.getSelection() if len(selection) != 1: Path.Log.error( - translate("Path_DressupRampEntry", "Please select one path object") + translate("CAM_DressupRampEntry", "Please select one path object") + "\n" ) return baseObject = selection[0] if not baseObject.isDerivedFrom("Path::Feature"): Path.Log.error( - translate("Path_DressupRampEntry", "The selected object is not a path") + translate("CAM_DressupRampEntry", "The selected object is not a path") + "\n" ) return if baseObject.isDerivedFrom("Path::FeatureCompoundPython"): Path.Log.error( - translate("Path_DressupRampEntry", "Please select a Profile object") + translate("CAM_DressupRampEntry", "Please select a Profile object") ) return @@ -956,6 +956,6 @@ class CommandPathDressupRampEntry: if FreeCAD.GuiUp: # register the FreeCAD command - FreeCADGui.addCommand("Path_DressupRampEntry", CommandPathDressupRampEntry()) + FreeCADGui.addCommand("CAM_DressupRampEntry", CommandPathDressupRampEntry()) -Path.Log.notice("Loading Path_DressupRampEntry... done\n") +Path.Log.notice("Loading CAM_DressupRampEntry... done\n") diff --git a/src/Mod/Path/Path/Dressup/Gui/TagPreferences.py b/src/Mod/Path/Path/Dressup/Gui/TagPreferences.py index ad48f46dc8..9d30390c55 100644 --- a/src/Mod/Path/Path/Dressup/Gui/TagPreferences.py +++ b/src/Mod/Path/Path/Dressup/Gui/TagPreferences.py @@ -89,7 +89,7 @@ class HoldingTagPreferences: self.form = FreeCADGui.PySideUic.loadUi( ":/preferences/PathDressupHoldingTags.ui" ) - self.label = translate("Path_DressupTag", "Holding Tag") + self.label = translate("CAM_DressupTag", "Holding Tag") def loadSettings(self): self.form.ifWidth.setText( diff --git a/src/Mod/Path/Path/Dressup/Gui/Tags.py b/src/Mod/Path/Path/Dressup/Gui/Tags.py index b0c4d2affd..30744160ca 100644 --- a/src/Mod/Path/Path/Dressup/Gui/Tags.py +++ b/src/Mod/Path/Path/Dressup/Gui/Tags.py @@ -378,7 +378,7 @@ class PathDressupTagViewProvider: def debugDisplay(self): # if False and addDebugDisplay(): # if not hasattr(self.vobj, 'Debug'): - # self.vobj.addProperty('App::PropertyLink', 'Debug', 'Debug', QT_TRANSLATE_NOOP('Path_DressupTag', 'Some elements for debugging')) + # self.vobj.addProperty('App::PropertyLink', 'Debug', 'Debug', QT_TRANSLATE_NOOP('CAM_DressupTag', 'Some elements for debugging')) # dbg = self.vobj.Object.Document.addObject('App::DocumentObjectGroup', 'TagDebug') # self.vobj.Debug = dbg # return True @@ -562,10 +562,10 @@ def Create(baseObject, name="DressupTag"): class CommandPathDressupTag: def GetResources(self): return { - "Pixmap": "Path_Dressup", - "MenuText": QT_TRANSLATE_NOOP("Path_DressupTag", "Tag"), + "Pixmap": "CAM_Dressup", + "MenuText": QT_TRANSLATE_NOOP("CAM_DressupTag", "Tag"), "ToolTip": QT_TRANSLATE_NOOP( - "Path_DressupTag", "Creates a Tag Dress-up object from a selected path" + "CAM_DressupTag", "Creates a Tag Dress-up object from a selected path" ), } @@ -581,7 +581,7 @@ class CommandPathDressupTag: selection = FreeCADGui.Selection.getSelection() if len(selection) != 1: Path.Log.error( - translate("Path_DressupTag", "Please select one path object") + "\n" + translate("CAM_DressupTag", "Please select one path object") + "\n" ) return baseObject = selection[0] @@ -598,6 +598,6 @@ class CommandPathDressupTag: if FreeCAD.GuiUp: # register the FreeCAD command - FreeCADGui.addCommand("Path_DressupTag", CommandPathDressupTag()) + FreeCADGui.addCommand("CAM_DressupTag", CommandPathDressupTag()) Path.Log.notice("Loading PathDressupTagGui... done\n") diff --git a/src/Mod/Path/Path/Dressup/Gui/ZCorrect.py b/src/Mod/Path/Path/Dressup/Gui/ZCorrect.py index bee53d9428..79c9e061bf 100644 --- a/src/Mod/Path/Path/Dressup/Gui/ZCorrect.py +++ b/src/Mod/Path/Path/Dressup/Gui/ZCorrect.py @@ -289,9 +289,9 @@ class TaskPanel: def SetProbePointFileName(self): filename = QtGui.QFileDialog.getOpenFileName( self.form, - translate("Path_Probe", "Select Probe Point File"), + translate("CAM_Probe", "Select Probe Point File"), None, - translate("Path_Probe", "All Files (*.*)"), + translate("CAM_Probe", "All Files (*.*)"), ) if filename and filename[0]: self.obj.probefile = str(filename[0]) @@ -342,11 +342,11 @@ class ViewProviderDressup: class CommandPathDressup: def GetResources(self): return { - "Pixmap": "Path_Dressup", - "MenuText": QT_TRANSLATE_NOOP("Path_DressupZCorrect", "Z Depth Correction"), + "Pixmap": "CAM_Dressup", + "MenuText": QT_TRANSLATE_NOOP("CAM_DressupZCorrect", "Z Depth Correction"), "Accel": "", "ToolTip": QT_TRANSLATE_NOOP( - "Path_DressupZCorrect", "Use Probe Map to correct Z depth" + "CAM_DressupZCorrect", "Use Probe Map to correct Z depth" ), } @@ -362,17 +362,17 @@ class CommandPathDressup: selection = FreeCADGui.Selection.getSelection() if len(selection) != 1: FreeCAD.Console.PrintError( - translate("Path_Dressup", "Please select one path object\n") + translate("CAM_Dressup", "Please select one path object\n") ) return if not selection[0].isDerivedFrom("Path::Feature"): FreeCAD.Console.PrintError( - translate("Path_Dressup", "The selected object is not a path\n") + translate("CAM_Dressup", "The selected object is not a path\n") ) return if selection[0].isDerivedFrom("Path::FeatureCompoundPython"): FreeCAD.Console.PrintError( - translate("Path_Dressup", "Please select a Path object") + translate("CAM_Dressup", "Please select a Path object") ) return @@ -399,6 +399,6 @@ class CommandPathDressup: if FreeCAD.GuiUp: # register the FreeCAD command - FreeCADGui.addCommand("Path_DressupZCorrect", CommandPathDressup()) + FreeCADGui.addCommand("CAM_DressupZCorrect", CommandPathDressup()) FreeCAD.Console.PrintLog("Loading PathDressup... done\n") diff --git a/src/Mod/Path/Path/Dressup/Tags.py b/src/Mod/Path/Path/Dressup/Tags.py index 0bcb01639f..f9b24ec2d2 100644 --- a/src/Mod/Path/Path/Dressup/Tags.py +++ b/src/Mod/Path/Path/Dressup/Tags.py @@ -1301,7 +1301,7 @@ class ObjectTagDressup: except ValueError: Path.Log.error( translate( - "Path_DressupTag", + "CAM_DressupTag", "Cannot insert holding tags for this path - please select a Profile path", ) + "\n" @@ -1354,12 +1354,12 @@ def Create(baseObject, name="DressupTag"): """ if not baseObject.isDerivedFrom("Path::Feature"): Path.Log.error( - translate("Path_DressupTag", "The selected object is not a path") + "\n" + translate("CAM_DressupTag", "The selected object is not a path") + "\n" ) return None if baseObject.isDerivedFrom("Path::FeatureCompoundPython"): - Path.Log.error(translate("Path_DressupTag", "Please select a Profile object")) + Path.Log.error(translate("CAM_DressupTag", "Please select a Profile object")) return None obj = FreeCAD.ActiveDocument.addObject("Path::FeaturePython", name) @@ -1370,4 +1370,4 @@ def Create(baseObject, name="DressupTag"): return obj -Path.Log.notice("Loading Path_DressupTag... done\n") +Path.Log.notice("Loading CAM_DressupTag... done\n") diff --git a/src/Mod/Path/Path/Main/Gui/Camotics.py b/src/Mod/Path/Path/Main/Gui/Camotics.py index fb9e1ecd3e..1e18f6fbff 100644 --- a/src/Mod/Path/Path/Main/Gui/Camotics.py +++ b/src/Mod/Path/Path/Main/Gui/Camotics.py @@ -310,10 +310,10 @@ class CamoticsSimulation(QtCore.QObject): class CommandCamoticsSimulate: def GetResources(self): return { - "Pixmap": "Path_Camotics", - "MenuText": QT_TRANSLATE_NOOP("Path_Camotics", "Camotics"), + "Pixmap": "CAM_Camotics", + "MenuText": QT_TRANSLATE_NOOP("CAM_Camotics", "Camotics"), "Accel": "P, C", - "ToolTip": QT_TRANSLATE_NOOP("Path_Camotics", "Simulate using Camotics"), + "ToolTip": QT_TRANSLATE_NOOP("CAM_Camotics", "Simulate using Camotics"), "CmdType": "ForEdit", } @@ -332,7 +332,7 @@ class CommandCamoticsSimulate: if FreeCAD.GuiUp: - FreeCADGui.addCommand("Path_Camotics", CommandCamoticsSimulate()) + FreeCADGui.addCommand("CAM_Camotics", CommandCamoticsSimulate()) FreeCAD.Console.PrintLog("Loading PathCamoticsSimulateGui ... done\n") diff --git a/src/Mod/Path/Path/Main/Gui/Fixture.py b/src/Mod/Path/Path/Main/Gui/Fixture.py index 605d692192..6761a0d320 100644 --- a/src/Mod/Path/Path/Main/Gui/Fixture.py +++ b/src/Mod/Path/Path/Main/Gui/Fixture.py @@ -150,9 +150,9 @@ class CommandPathFixture: def GetResources(self): return { "Pixmap": "Path_Datums", - "MenuText": QT_TRANSLATE_NOOP("Path_Fixture", "Fixture"), + "MenuText": QT_TRANSLATE_NOOP("CAM_Fixture", "Fixture"), "ToolTip": QT_TRANSLATE_NOOP( - "Path_Fixture", "Creates a Fixture Offset" + "CAM_Fixture", "Creates a Fixture Offset" ), } @@ -186,7 +186,7 @@ PathUtils.addToJob(obj) if FreeCAD.GuiUp: # register the FreeCAD command - FreeCADGui.addCommand("Path_Fixture", CommandPathFixture()) + FreeCADGui.addCommand("CAM_Fixture", CommandPathFixture()) FreeCAD.Console.PrintLog("Loading PathFixture... done\n") diff --git a/src/Mod/Path/Path/Main/Gui/Inspect.py b/src/Mod/Path/Path/Main/Gui/Inspect.py index 3648674744..4a7bda2a14 100644 --- a/src/Mod/Path/Path/Main/Gui/Inspect.py +++ b/src/Mod/Path/Path/Main/Gui/Inspect.py @@ -139,7 +139,7 @@ class GCodeEditorDialog(QtGui.QDialog): lab = QtGui.QLabel() lab.setText( translate( - "Path_Inspect", + "CAM_Inspect", "Note: This dialog shows Path Commands in FreeCAD base units (mm/s). \n Values will be converted to the desired unit during post processing.", ) ) @@ -264,11 +264,11 @@ def show(obj): class CommandPathInspect: def GetResources(self): return { - "Pixmap": "Path_Inspect", - "MenuText": QT_TRANSLATE_NOOP("Path_Inspect", "Inspect Path Commands"), + "Pixmap": "CAM_Inspect", + "MenuText": QT_TRANSLATE_NOOP("CAM_Inspect", "Inspect Path Commands"), "Accel": "P, I", "ToolTip": QT_TRANSLATE_NOOP( - "Path_Inspect", "Inspects the contents of a Path object" + "CAM_Inspect", "Inspects the contents of a Path object" ), } @@ -281,13 +281,13 @@ class CommandPathInspect: selection = FreeCADGui.Selection.getSelection() if len(selection) != 1: FreeCAD.Console.PrintError( - translate("Path_Inspect", "Please select exactly one path object") + translate("CAM_Inspect", "Please select exactly one path object") + "\n" ) return if not (selection[0].isDerivedFrom("Path::Feature")): FreeCAD.Console.PrintError( - translate("Path_Inspect", "Please select exactly one path object") + translate("CAM_Inspect", "Please select exactly one path object") + "\n" ) return @@ -303,4 +303,4 @@ class CommandPathInspect: if FreeCAD.GuiUp: # register the FreeCAD command - FreeCADGui.addCommand("Path_Inspect", CommandPathInspect()) + FreeCADGui.addCommand("CAM_Inspect", CommandPathInspect()) diff --git a/src/Mod/Path/Path/Main/Gui/Job.py b/src/Mod/Path/Path/Main/Gui/Job.py index faa6b1c2e9..584fd9d222 100644 --- a/src/Mod/Path/Path/Main/Gui/Job.py +++ b/src/Mod/Path/Path/Main/Gui/Job.py @@ -198,7 +198,7 @@ class ViewProvider: self.unsetEdit(None, None) def getIcon(self): - return ":/icons/Path_Job.svg" + return ":/icons/CAM_Job.svg" def claimChildren(self): children = [] @@ -280,7 +280,7 @@ class ViewProvider: Path.Log.track() for action in menu.actions(): menu.removeAction(action) - action = QtGui.QAction(translate("Path_Job", "Edit"), menu) + action = QtGui.QAction(translate("CAM_Job", "Edit"), menu) action.triggered.connect(self.setEdit) menu.addAction(action) @@ -523,7 +523,7 @@ class StockCreateCylinderEdit(StockEdit): self.form.stockCylinderHeight.text() ) else: - Path.Log.error(translate("Path_Job", "Stock not a cylinder!")) + Path.Log.error(translate("CAM_Job", "Stock not a cylinder!")) except Exception: pass @@ -940,9 +940,9 @@ class TaskPanel: def setPostProcessorOutputFile(self): filename = QtGui.QFileDialog.getSaveFileName( self.form, - translate("Path_Job", "Select Output File"), + translate("CAM_Job", "Select Output File"), None, - translate("Path_Job", "All Files (*.*)"), + translate("CAM_Job", "All Files (*.*)"), ) if filename and filename[0]: self.obj.PostProcessorOutputFile = str(filename[0]) @@ -1322,7 +1322,7 @@ class TaskPanel: setupFromExisting() else: Path.Log.error( - translate("Path_Job", "Unsupported stock object %s") + translate("CAM_Job", "Unsupported stock object %s") % self.obj.Stock.Label ) else: @@ -1338,7 +1338,7 @@ class TaskPanel: index = -1 else: Path.Log.error( - translate("Path_Job", "Unsupported stock type %s (%d)") + translate("CAM_Job", "Unsupported stock type %s (%d)") % (self.form.stock.currentText(), index) ) self.stockEdit.activate(self.obj, index == -1) @@ -1430,7 +1430,7 @@ class TaskPanel: def jobModelEdit(self): dialog = PathJobDlg.JobCreate() - dialog.setupTitle(translate("Path_Job", "Model Selection")) + dialog.setupTitle(translate("CAM_Job", "Model Selection")) dialog.setupModel(self.obj) if dialog.exec_() == 1: models = dialog.getModels() @@ -1617,10 +1617,10 @@ class TaskPanel: def _displayWarningWindow(msg): """Display window with warning message and Add action button. Return action state.""" - txtHeader = translate("Path_Job", "Warning") - txtPleaseAddOne = translate("Path_Job", "Please add one.") - txtOk = translate("Path_Job", "Ok") - txtAdd = translate("Path_Job", "Add") + txtHeader = translate("CAM_Job", "Warning") + txtPleaseAddOne = translate("CAM_Job", "Please add one.") + txtOk = translate("CAM_Job", "Ok") + txtAdd = translate("CAM_Job", "Add") msgbox = QtGui.QMessageBox( QtGui.QMessageBox.Warning, txtHeader, msg + " " + txtPleaseAddOne @@ -1632,14 +1632,14 @@ class TaskPanel: # Check if at least on base model is present if len(self.obj.Model.Group) == 0: self.form.setCurrentIndex(0) # Change tab to General tab - no_model_txt = translate("Path_Job", "This job has no base model.") + no_model_txt = translate("CAM_Job", "This job has no base model.") if _displayWarningWindow(no_model_txt) == 1: self.jobModelEdit() # Check if at least one tool is present if len(self.obj.Tools.Group) == 0: self.form.setCurrentIndex(3) # Change tab to Tools tab - no_tool_txt = translate("Path_Job", "This job has no tool.") + no_tool_txt = translate("CAM_Job", "This job has no tool.") if _displayWarningWindow(no_tool_txt) == 1: self.toolControllerAdd() diff --git a/src/Mod/Path/Path/Main/Gui/JobCmd.py b/src/Mod/Path/Path/Main/Gui/JobCmd.py index 965f75d077..03d37a9463 100644 --- a/src/Mod/Path/Path/Main/Gui/JobCmd.py +++ b/src/Mod/Path/Path/Main/Gui/JobCmd.py @@ -53,10 +53,10 @@ class CommandJobCreate: def GetResources(self): return { - "Pixmap": "Path_Job", - "MenuText": QT_TRANSLATE_NOOP("Path_Job", "Job"), + "Pixmap": "CAM_Job", + "MenuText": QT_TRANSLATE_NOOP("CAM_Job", "Job"), "Accel": "P, J", - "ToolTip": QT_TRANSLATE_NOOP("Path_Job", "Creates a Path Job"), + "ToolTip": QT_TRANSLATE_NOOP("CAM_Job", "Creates a Path Job"), } def IsActive(self): @@ -97,10 +97,10 @@ class CommandJobTemplateExport: def GetResources(self): return { - "Pixmap": "Path_ExportTemplate", - "MenuText": QT_TRANSLATE_NOOP("Path_ExportTemplate", "Export Template"), + "Pixmap": "CAM_ExportTemplate", + "MenuText": QT_TRANSLATE_NOOP("CAM_ExportTemplate", "Export Template"), "ToolTip": QT_TRANSLATE_NOOP( - "Path_ExportTemplate", + "CAM_ExportTemplate", "Exports Path Job as a template to be used for other jobs", ), } @@ -197,7 +197,7 @@ class CommandJobTemplateExport: if FreeCAD.GuiUp: # register the FreeCAD command - FreeCADGui.addCommand("Path_Job", CommandJobCreate()) - FreeCADGui.addCommand("Path_ExportTemplate", CommandJobTemplateExport()) + FreeCADGui.addCommand("CAM_Job", CommandJobCreate()) + FreeCADGui.addCommand("CAM_ExportTemplate", CommandJobTemplateExport()) FreeCAD.Console.PrintLog("Loading PathJobCmd... done\n") diff --git a/src/Mod/Path/Path/Main/Gui/JobDlg.py b/src/Mod/Path/Path/Main/Gui/JobDlg.py index 0a0b5b3bad..464fe34acc 100644 --- a/src/Mod/Path/Path/Main/Gui/JobDlg.py +++ b/src/Mod/Path/Path/Main/Gui/JobDlg.py @@ -85,9 +85,9 @@ class JobCreate: preferences().SetBool("WarningSuppressVelocity", True) self.dialog = FreeCADGui.PySideUic.loadUi(":/panels/DlgJobCreate.ui") - self.itemsSolid = QtGui.QStandardItem(translate("Path_Job", "Solids")) - self.items2D = QtGui.QStandardItem(translate("Path_Job", "2D")) - self.itemsJob = QtGui.QStandardItem(translate("Path_Job", "Jobs")) + self.itemsSolid = QtGui.QStandardItem(translate("CAM_Job", "Solids")) + self.items2D = QtGui.QStandardItem(translate("CAM_Job", "2D")) + self.itemsJob = QtGui.QStandardItem(translate("CAM_Job", "Jobs")) self.dialog.templateGroup.hide() self.dialog.modelGroup.hide() # debugging support @@ -354,7 +354,7 @@ class JobTemplateExport: stockType = PathStock.StockType.FromStock(job.Stock) if stockType == PathStock.StockType.FromBase: seHint = translate( - "Path_Job", "Base -/+ %.2f/%.2f %.2f/%.2f %.2f/%.2f" + "CAM_Job", "Base -/+ %.2f/%.2f %.2f/%.2f %.2f/%.2f" ) % ( job.Stock.ExtXneg, job.Stock.ExtXpos, @@ -365,13 +365,13 @@ class JobTemplateExport: ) self.dialog.stockPlacement.setChecked(False) elif stockType == PathStock.StockType.CreateBox: - seHint = translate("Path_Job", "Box: %.2f x %.2f x %.2f") % ( + seHint = translate("CAM_Job", "Box: %.2f x %.2f x %.2f") % ( job.Stock.Length, job.Stock.Width, job.Stock.Height, ) elif stockType == PathStock.StockType.CreateCylinder: - seHint = translate("Path_Job:", "Cylinder: %.2f x %.2f") % ( + seHint = translate("CAM_Job:", "Cylinder: %.2f x %.2f") % ( job.Stock.Radius, job.Stock.Height, ) @@ -380,7 +380,7 @@ class JobTemplateExport: else: # Existing Solid seHint = "-" - Path.Log.error(translate("Path_Job", "Unsupported stock type")) + Path.Log.error(translate("CAM_Job", "Unsupported stock type")) self.dialog.stockExtentHint.setText(seHint) spHint = "%s" % job.Stock.Placement self.dialog.stockPlacementHint.setText(spHint) diff --git a/src/Mod/Path/Path/Main/Gui/Sanity.py b/src/Mod/Path/Path/Main/Gui/Sanity.py index 98a08dfb3c..d094732d5a 100644 --- a/src/Mod/Path/Path/Main/Gui/Sanity.py +++ b/src/Mod/Path/Path/Main/Gui/Sanity.py @@ -120,13 +120,13 @@ class CommandPathSanity: def GetResources(self): return { - "Pixmap": "Path_Sanity", + "Pixmap": "CAM_Sanity", "MenuText": QT_TRANSLATE_NOOP( - "Path_Sanity", "Check the path job for common errors" + "CAM_Sanity", "Check the path job for common errors" ), "Accel": "P, S", "ToolTip": QT_TRANSLATE_NOOP( - "Path_Sanity", "Check the path job for common errors" + "CAM_Sanity", "Check the path job for common errors" ), } @@ -211,38 +211,38 @@ class CommandPathSanity: """ generates an asciidoc file with the report information """ - Title = translate("Path_Sanity", "Setup Report for FreeCAD Job") - ToC = translate("Path_Sanity", "Table of Contents") - PartInfoHeading = translate("Path_Sanity", "Part Information") - RunSumHeading = translate("Path_Sanity", "Run Summary") - RoughStkHeading = translate("Path_Sanity", "Rough Stock") - ToolDataHeading = translate("Path_Sanity", "Tool Data") - OutputHeading = translate("Path_Sanity", "Output") - FixturesHeading = translate("Path_Sanity", "Fixtures") - SquawksHeading = translate("Path_Sanity", "Squawks") + Title = translate("CAM_Sanity", "Setup Report for FreeCAD Job") + ToC = translate("CAM_Sanity", "Table of Contents") + PartInfoHeading = translate("CAM_Sanity", "Part Information") + RunSumHeading = translate("CAM_Sanity", "Run Summary") + RoughStkHeading = translate("CAM_Sanity", "Rough Stock") + ToolDataHeading = translate("CAM_Sanity", "Tool Data") + OutputHeading = translate("CAM_Sanity", "Output") + FixturesHeading = translate("CAM_Sanity", "Fixtures") + SquawksHeading = translate("CAM_Sanity", "Squawks") - PartLabel = translate("Path_Sanity", "Base Object(s)") - SequenceLabel = translate("Path_Sanity", "Job Sequence") - DescriptionLabel = translate("Path_Sanity", "Job Description") - JobTypeLabel = translate("Path_Sanity", "Job Type") - CADLabel = translate("Path_Sanity", "CAD File Name") - LastSaveLabel = translate("Path_Sanity", "Last Save Date") - CustomerLabel = translate("Path_Sanity", "Customer") - DesignerLabel = translate("Path_Sanity", "Designer") + PartLabel = translate("CAM_Sanity", "Base Object(s)") + SequenceLabel = translate("CAM_Sanity", "Job Sequence") + DescriptionLabel = translate("CAM_Sanity", "Job Description") + JobTypeLabel = translate("CAM_Sanity", "Job Type") + CADLabel = translate("CAM_Sanity", "CAD File Name") + LastSaveLabel = translate("CAM_Sanity", "Last Save Date") + CustomerLabel = translate("CAM_Sanity", "Customer") + DesignerLabel = translate("CAM_Sanity", "Designer") b = data["baseData"] d = data["designData"] jobname = d["JobLabel"] - opLabel = translate("Path_Sanity", "Operation") - zMinLabel = translate("Path_Sanity", "Minimum Z Height") - zMaxLabel = translate("Path_Sanity", "Maximum Z Height") - cycleTimeLabel = translate("Path_Sanity", "Cycle Time") + opLabel = translate("CAM_Sanity", "Operation") + zMinLabel = translate("CAM_Sanity", "Minimum Z Height") + zMaxLabel = translate("CAM_Sanity", "Maximum Z Height") + cycleTimeLabel = translate("CAM_Sanity", "Cycle Time") - coolantLabel = translate("Path_Sanity", "Coolant") - jobTotalLabel = translate("Path_Sanity", "TOTAL JOB") + coolantLabel = translate("CAM_Sanity", "Coolant") + jobTotalLabel = translate("CAM_Sanity", "TOTAL JOB") d = data["toolData"] - toolLabel = translate("Path_Sanity", "Tool Number") + toolLabel = translate("CAM_Sanity", "Tool Number") imageCounter = 1 reportHtmlTemplate = """ @@ -505,40 +505,40 @@ class CommandPathSanity: """ - descriptionLabel = translate("Path_Sanity", "Description") - manufLabel = translate("Path_Sanity", "Manufacturer") - partNumberLabel = translate("Path_Sanity", "Part Number") - urlLabel = translate("Path_Sanity", "URL") - inspectionNotesLabel = translate("Path_Sanity", "Inspection Notes") - opLabel = translate("Path_Sanity", "Operation") - tcLabel = translate("Path_Sanity", "Tool Controller") - feedLabel = translate("Path_Sanity", "Feed Rate") - speedLabel = translate("Path_Sanity", "Spindle Speed") - shapeLabel = translate("Path_Sanity", "Tool Shape") - diameterLabel = translate("Path_Sanity", "Tool Diameter") + descriptionLabel = translate("CAM_Sanity", "Description") + manufLabel = translate("CAM_Sanity", "Manufacturer") + partNumberLabel = translate("CAM_Sanity", "Part Number") + urlLabel = translate("CAM_Sanity", "URL") + inspectionNotesLabel = translate("CAM_Sanity", "Inspection Notes") + opLabel = translate("CAM_Sanity", "Operation") + tcLabel = translate("CAM_Sanity", "Tool Controller") + feedLabel = translate("CAM_Sanity", "Feed Rate") + speedLabel = translate("CAM_Sanity", "Spindle Speed") + shapeLabel = translate("CAM_Sanity", "Tool Shape") + diameterLabel = translate("CAM_Sanity", "Tool Diameter") - xDimLabel = translate("Path_Sanity", "X Size") - yDimLabel = translate("Path_Sanity", "Y Size") - zDimLabel = translate("Path_Sanity", "Z Size") - materialLabel = translate("Path_Sanity", "Material") + xDimLabel = translate("CAM_Sanity", "X Size") + yDimLabel = translate("CAM_Sanity", "Y Size") + zDimLabel = translate("CAM_Sanity", "Z Size") + materialLabel = translate("CAM_Sanity", "Material") - offsetsLabel = translate("Path_Sanity", "Work Offsets") - orderByLabel = translate("Path_Sanity", "Order By") - datumLabel = translate("Path_Sanity", "Part Datum") + offsetsLabel = translate("CAM_Sanity", "Work Offsets") + orderByLabel = translate("CAM_Sanity", "Order By") + datumLabel = translate("CAM_Sanity", "Part Datum") - gcodeFileLabel = translate("Path_Sanity", "G-code File") - lastpostLabel = translate("Path_Sanity", "Last Post Process Date") - stopsLabel = translate("Path_Sanity", "Stops") - programmerLabel = translate("Path_Sanity", "Programmer") - machineLabel = translate("Path_Sanity", "Machine") - postLabel = translate("Path_Sanity", "Postprocessor") - flagsLabel = translate("Path_Sanity", "Post Processor Flags") - fileSizeLabel = translate("Path_Sanity", "File Size (kB)") - lineCountLabel = translate("Path_Sanity", "Line Count") + gcodeFileLabel = translate("CAM_Sanity", "G-code File") + lastpostLabel = translate("CAM_Sanity", "Last Post Process Date") + stopsLabel = translate("CAM_Sanity", "Stops") + programmerLabel = translate("CAM_Sanity", "Programmer") + machineLabel = translate("CAM_Sanity", "Machine") + postLabel = translate("CAM_Sanity", "Postprocessor") + flagsLabel = translate("CAM_Sanity", "Post Processor Flags") + fileSizeLabel = translate("CAM_Sanity", "File Size (kB)") + lineCountLabel = translate("CAM_Sanity", "Line Count") - noteLabel = translate("Path_Sanity", "Note") - operatorLabel = translate("Path_Sanity", "Operator") - dateLabel = translate("Path_Sanity", "Date") + noteLabel = translate("CAM_Sanity", "Note") + operatorLabel = translate("CAM_Sanity", "Operator") + dateLabel = translate("CAM_Sanity", "Date") d = data["runData"] reportHtmlTemplate += """ @@ -1326,7 +1326,7 @@ class CommandPathSanity: self.squawk( "PathSanity", translate( - "Path_Sanity", + "CAM_Sanity", "Tool number {} is a legacy tool. Legacy tools not \ supported by Path-Sanity", ).format(TC.ToolNumber), @@ -1339,7 +1339,7 @@ class CommandPathSanity: self.squawk( "PathSanity", translate( - "Path_Sanity", "Tool number {} used by multiple tools" + "CAM_Sanity", "Tool number {} used by multiple tools" ).format(TC.ToolNumber), squawkType="CAUTION", ) @@ -1367,7 +1367,7 @@ class CommandPathSanity: self.squawk( "PathSanity", translate( - "Path_Sanity", "Tool Controller '{}' has no spindlespeed" + "CAM_Sanity", "Tool Controller '{}' has no spindlespeed" ).format(TC.Label), squawkType="WARNING", ) @@ -1395,7 +1395,7 @@ class CommandPathSanity: self.squawk( "PathSanity", translate( - "Path_Sanity", "Tool Controller '{}' is not used" + "CAM_Sanity", "Tool Controller '{}' is not used" ).format(TC.Label), squawkType="WARNING", ) @@ -1491,7 +1491,7 @@ class CommandPathSanity: if data["material"] == "Not Specified": self.squawk( "PathSanity", - translate("Path_Sanity", "Consider Specifying the Stock Material"), + translate("CAM_Sanity", "Consider Specifying the Stock Material"), squawkType="TIP", ) @@ -1582,7 +1582,7 @@ class CommandPathSanity: data["linecount"] = str(0) self.squawk( "PathSanity", - translate("Path_Sanity", "The Job has not been post-processed"), + translate("CAM_Sanity", "The Job has not been post-processed"), ) else: data["filesize"] = str( @@ -1601,4 +1601,4 @@ class CommandPathSanity: if FreeCAD.GuiUp: # register the FreeCAD command - FreeCADGui.addCommand("Path_Sanity", CommandPathSanity()) + FreeCADGui.addCommand("CAM_Sanity", CommandPathSanity()) diff --git a/src/Mod/Path/Path/Main/Gui/Sanity_Caution.svg b/src/Mod/Path/Path/Main/Gui/Sanity_Caution.svg index 14d0e452bc..ef4b4a545e 100644 --- a/src/Mod/Path/Path/Main/Gui/Sanity_Caution.svg +++ b/src/Mod/Path/Path/Main/Gui/Sanity_Caution.svg @@ -42,7 +42,7 @@ image/svg+xml - Path_Stop + CAM_Sanity_Caution 2015-07-04 https://www.freecad.org/wiki/index.php?title=Artwork @@ -50,7 +50,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_Stop.svg + FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Sanity_Caution.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Path/Main/Gui/Simulator.py b/src/Mod/Path/Path/Main/Gui/Simulator.py index 2135ece479..0e4b53cf43 100644 --- a/src/Mod/Path/Path/Main/Gui/Simulator.py +++ b/src/Mod/Path/Path/Main/Gui/Simulator.py @@ -627,11 +627,11 @@ class PathSimulation: class CommandPathSimulate: def GetResources(self): return { - "Pixmap": "Path_Simulator", - "MenuText": QtCore.QT_TRANSLATE_NOOP("Path_Simulator", "CAM Simulator"), + "Pixmap": "CAM_Simulator", + "MenuText": QtCore.QT_TRANSLATE_NOOP("CAM_Simulator", "CAM Simulator"), "Accel": "P, M", "ToolTip": QtCore.QT_TRANSLATE_NOOP( - "Path_Simulator", "Simulate G-code on stock" + "CAM_Simulator", "Simulate G-code on stock" ), } @@ -649,5 +649,5 @@ class CommandPathSimulate: if FreeCAD.GuiUp: # register the FreeCAD command - FreeCADGui.addCommand("Path_Simulator", CommandPathSimulate()) + FreeCADGui.addCommand("CAM_Simulator", CommandPathSimulate()) FreeCAD.Console.PrintLog("Loading PathSimulator Gui... done\n") diff --git a/src/Mod/Path/Path/Main/Job.py b/src/Mod/Path/Path/Main/Job.py index 816f6494d3..ec8d633367 100644 --- a/src/Mod/Path/Path/Main/Job.py +++ b/src/Mod/Path/Path/Main/Job.py @@ -252,15 +252,15 @@ class ObjectJob: enums = { "OrderOutputBy": [ - (translate("Path_Job", "Fixture"), "Fixture"), - (translate("Path_Job", "Tool"), "Tool"), - (translate("Path_Job", "Operation"), "Operation"), + (translate("CAM_Job", "Fixture"), "Fixture"), + (translate("CAM_Job", "Tool"), "Tool"), + (translate("CAM_Job", "Operation"), "Operation"), ], "JobType": [ - (translate("Path_Job", "2D"), "2D"), - (translate("Path_Job", "2.5D"), "2.5D"), - (translate("Path_Job", "Lathe"), "Lathe"), - (translate("Path_Job", "Multiaxis"), "Multiaxis"), + (translate("CAM_Job", "2D"), "2D"), + (translate("CAM_Job", "2.5D"), "2.5D"), + (translate("CAM_Job", "Lathe"), "Lathe"), + (translate("CAM_Job", "Multiaxis"), "Multiaxis"), ], } diff --git a/src/Mod/Path/Path/Op/Adaptive.py b/src/Mod/Path/Path/Op/Adaptive.py index c5069cebbf..6db4b24eab 100644 --- a/src/Mod/Path/Path/Op/Adaptive.py +++ b/src/Mod/Path/Path/Op/Adaptive.py @@ -910,12 +910,12 @@ class PathAdaptive(PathOp.ObjectOp): # Enumeration lists for App::PropertyEnumeration properties enums = { "Side": [ - (translate("Path_Adaptive", "Outside"), "Outside"), - (translate("Path_Adaptive", "Inside"), "Inside"), + (translate("CAM_Adaptive", "Outside"), "Outside"), + (translate("CAM_Adaptive", "Inside"), "Inside"), ], # this is the direction that the profile runs "OperationType": [ - (translate("Path_Adaptive", "Clearing"), "Clearing"), - (translate("Path_Adaptive", "Profiling"), "Profiling"), + (translate("CAM_Adaptive", "Clearing"), "Clearing"), + (translate("CAM_Adaptive", "Profiling"), "Profiling"), ], # side of profile that cutter is on in relation to direction of profile } diff --git a/src/Mod/Path/Path/Op/Custom.py b/src/Mod/Path/Path/Op/Custom.py index d823d3fca6..1171645700 100644 --- a/src/Mod/Path/Path/Op/Custom.py +++ b/src/Mod/Path/Path/Op/Custom.py @@ -28,7 +28,7 @@ import Path.Op.Base as PathOp from PySide.QtCore import QT_TRANSLATE_NOOP -__title__ = "Path Custom Operation" +__title__ = "CAM Custom Operation" __author__ = "sliptonic (Brad Collette)" __url__ = "https://www.freecad.org" __doc__ = "Path Custom object and FreeCAD command" diff --git a/src/Mod/Path/Path/Op/Drilling.py b/src/Mod/Path/Path/Op/Drilling.py index 36f5573f13..a2e1f401b2 100644 --- a/src/Mod/Path/Path/Op/Drilling.py +++ b/src/Mod/Path/Path/Op/Drilling.py @@ -66,13 +66,13 @@ class ObjectDrilling(PathCircularHoleBase.ObjectOp): # Enumeration lists for App::PropertyEnumeration properties enums = { "RetractMode": [ - (translate("Path_Drilling", "G98"), "G98"), - (translate("Path_Drilling", "G99"), "G99"), + (translate("CAM_Drilling", "G98"), "G98"), + (translate("CAM_Drilling", "G99"), "G99"), ], # How high to retract after a drilling move "ExtraOffset": [ - (translate("Path_Drilling", "None"), "None"), - (translate("Path_Drilling", "Drill Tip"), "Drill Tip"), - (translate("Path_Drilling", "2x Drill Tip"), "2x Drill Tip"), + (translate("CAM_Drilling", "None"), "None"), + (translate("CAM_Drilling", "Drill Tip"), "Drill Tip"), + (translate("CAM_Drilling", "2x Drill Tip"), "2x Drill Tip"), ], # extra drilling depth to clear drill taper } diff --git a/src/Mod/Path/Path/Op/Gui/Adaptive.py b/src/Mod/Path/Path/Op/Gui/Adaptive.py index a51c80c509..42941b33f7 100644 --- a/src/Mod/Path/Path/Op/Gui/Adaptive.py +++ b/src/Mod/Path/Path/Op/Gui/Adaptive.py @@ -171,8 +171,8 @@ Command = PathOpGui.SetupOperation( "Adaptive", PathAdaptive.Create, TaskPanelOpPage, - "Path_Adaptive", - QtCore.QT_TRANSLATE_NOOP("Path_Adaptive", "Adaptive"), - QtCore.QT_TRANSLATE_NOOP("Path_Adaptive", "Adaptive clearing and profiling"), + "CAM_Adaptive", + QtCore.QT_TRANSLATE_NOOP("CAM_Adaptive", "Adaptive"), + QtCore.QT_TRANSLATE_NOOP("CAM_Adaptive", "Adaptive clearing and profiling"), PathAdaptive.SetupProperties, ) diff --git a/src/Mod/Path/Path/Op/Gui/Array.py b/src/Mod/Path/Path/Op/Gui/Array.py index 48537bd750..e9399ef8ae 100644 --- a/src/Mod/Path/Path/Op/Gui/Array.py +++ b/src/Mod/Path/Path/Op/Gui/Array.py @@ -448,10 +448,10 @@ class ViewProviderArray: class CommandPathArray: def GetResources(self): return { - "Pixmap": "Path_Array", - "MenuText": QT_TRANSLATE_NOOP("Path_Array", "Array"), + "Pixmap": "CAM_Array", + "MenuText": QT_TRANSLATE_NOOP("CAM_Array", "Array"), "ToolTip": QT_TRANSLATE_NOOP( - "Path_Array", "Creates an array from selected path(s)" + "CAM_Array", "Creates an array from selected path(s)" ), } @@ -471,7 +471,7 @@ class CommandPathArray: if not (sel.isDerivedFrom("Path::Feature")): FreeCAD.Console.PrintError( translate( - "Path_Array", "Arrays can be created only from Path operations." + "CAM_Array", "Arrays can be created only from Path operations." ) + "\n" ) @@ -502,4 +502,4 @@ class CommandPathArray: if FreeCAD.GuiUp: # register the FreeCAD command - FreeCADGui.addCommand("Path_Array", CommandPathArray()) + FreeCADGui.addCommand("CAM_Array", CommandPathArray()) diff --git a/src/Mod/Path/Path/Op/Gui/Base.py b/src/Mod/Path/Path/Op/Gui/Base.py index 0de7699b48..bb369015ae 100644 --- a/src/Mod/Path/Path/Op/Gui/Base.py +++ b/src/Mod/Path/Path/Op/Gui/Base.py @@ -159,7 +159,7 @@ class ViewProvider(object): if self.Object.Active: return self.OpIcon else: - return ":/icons/Path_OpActive.svg" + return ":/icons/CAM_OpActive.svg" def getTaskPanelOpPage(self, obj): """getTaskPanelOpPage(obj) ... use the stored information to instantiate the receiver op's page controller.""" @@ -1461,7 +1461,7 @@ def SetupOperation( ) command = CommandPathOp(res) - FreeCADGui.addCommand("Path_%s" % name.replace(" ", "_"), command) + FreeCADGui.addCommand("CAM_%s" % name.replace(" ", "_"), command) if setupProperties is not None: PathSetupSheet.RegisterOperation(name, objFactory, setupProperties) @@ -1469,6 +1469,6 @@ def SetupOperation( return command -FreeCADGui.addCommand("Path_SetStartPoint", CommandSetStartPoint()) +FreeCADGui.addCommand("CAM_SetStartPoint", CommandSetStartPoint()) FreeCAD.Console.PrintLog("Loading PathOpGui... done\n") diff --git a/src/Mod/Path/Path/Op/Gui/Comment.py b/src/Mod/Path/Path/Op/Gui/Comment.py index ae04273043..2db5b2468c 100644 --- a/src/Mod/Path/Path/Op/Gui/Comment.py +++ b/src/Mod/Path/Path/Op/Gui/Comment.py @@ -81,7 +81,7 @@ class _ViewProviderComment: return None def getIcon(self): # optional - return ":/icons/Path_Comment.svg" + return ":/icons/CAM_Comment.svg" def onChanged(self, vobj, prop): # optional mode = 2 @@ -99,10 +99,10 @@ class _ViewProviderComment: class CommandPathComment: def GetResources(self): return { - "Pixmap": "Path_Comment", - "MenuText": QT_TRANSLATE_NOOP("Path_Comment", "Comment"), + "Pixmap": "CAM_Comment", + "MenuText": QT_TRANSLATE_NOOP("CAM_Comment", "Comment"), "ToolTip": QT_TRANSLATE_NOOP( - "Path_Comment", "Add a Comment to your CNC program" + "CAM_Comment", "Add a Comment to your CNC program" ), } @@ -133,7 +133,7 @@ PathUtils.addToJob(obj) if FreeCAD.GuiUp: # register the FreeCAD command - FreeCADGui.addCommand("Path_Comment", CommandPathComment()) + FreeCADGui.addCommand("CAM_Comment", CommandPathComment()) FreeCAD.Console.PrintLog("Loading PathComment... done\n") diff --git a/src/Mod/Path/Path/Op/Gui/Custom.py b/src/Mod/Path/Path/Op/Gui/Custom.py index f2b18a9297..ec0530d58a 100644 --- a/src/Mod/Path/Path/Op/Gui/Custom.py +++ b/src/Mod/Path/Path/Op/Gui/Custom.py @@ -68,9 +68,9 @@ Command = PathOpGui.SetupOperation( "Custom", PathCustom.Create, TaskPanelOpPage, - "Path_Custom", - QT_TRANSLATE_NOOP("Path_Custom", "Custom"), - QT_TRANSLATE_NOOP("Path_Custom", "Create custom G-code snippet"), + "CAM_Custom", + QT_TRANSLATE_NOOP("CAM_Custom", "Custom"), + QT_TRANSLATE_NOOP("CAM_Custom", "Create custom G-code snippet"), PathCustom.SetupProperties, ) diff --git a/src/Mod/Path/Path/Op/Gui/Deburr.py b/src/Mod/Path/Path/Op/Gui/Deburr.py index acdf7b3191..c1c0f6e786 100644 --- a/src/Mod/Path/Path/Op/Gui/Deburr.py +++ b/src/Mod/Path/Path/Op/Gui/Deburr.py @@ -141,10 +141,10 @@ Command = PathOpGui.SetupOperation( "Deburr", PathDeburr.Create, TaskPanelOpPage, - "Path_Deburr", - QT_TRANSLATE_NOOP("Path_Deburr", "Deburr"), + "CAM_Deburr", + QT_TRANSLATE_NOOP("CAM_Deburr", "Deburr"), QT_TRANSLATE_NOOP( - "Path_Deburr", "Creates a Deburr Path along Edges or around Faces" + "CAM_Deburr", "Creates a Deburr Path along Edges or around Faces" ), PathDeburr.SetupProperties, ) diff --git a/src/Mod/Path/Path/Op/Gui/Drilling.py b/src/Mod/Path/Path/Op/Gui/Drilling.py index b13b2051a8..51dfa6bfab 100644 --- a/src/Mod/Path/Path/Op/Gui/Drilling.py +++ b/src/Mod/Path/Path/Op/Gui/Drilling.py @@ -185,10 +185,10 @@ Command = PathOpGui.SetupOperation( "Drilling", PathDrilling.Create, TaskPanelOpPage, - "Path_Drilling", - QtCore.QT_TRANSLATE_NOOP("Path_Drilling", "Drilling"), + "CAM_Drilling", + QtCore.QT_TRANSLATE_NOOP("CAM_Drilling", "Drilling"), QtCore.QT_TRANSLATE_NOOP( - "Path_Drilling", + "CAM_Drilling", "Creates a Path Drilling object from the features of a base object", ), PathDrilling.SetupProperties, diff --git a/src/Mod/Path/Path/Op/Gui/Engrave.py b/src/Mod/Path/Path/Op/Gui/Engrave.py index 0d31305cf1..e884aa8baf 100644 --- a/src/Mod/Path/Path/Op/Gui/Engrave.py +++ b/src/Mod/Path/Path/Op/Gui/Engrave.py @@ -168,10 +168,10 @@ Command = PathOpGui.SetupOperation( "Engrave", PathEngrave.Create, TaskPanelOpPage, - "Path_Engrave", - QtCore.QT_TRANSLATE_NOOP("Path_Engrave", "Engrave"), + "CAM_Engrave", + QtCore.QT_TRANSLATE_NOOP("CAM_Engrave", "Engrave"), QtCore.QT_TRANSLATE_NOOP( - "Path_Engrave", "Creates an Engraving Path around a Draft ShapeString" + "CAM_Engrave", "Creates an Engraving Path around a Draft ShapeString" ), PathEngrave.SetupProperties, ) diff --git a/src/Mod/Path/Path/Op/Gui/Helix.py b/src/Mod/Path/Path/Op/Gui/Helix.py index 75eedd4e84..762686d4d3 100644 --- a/src/Mod/Path/Path/Op/Gui/Helix.py +++ b/src/Mod/Path/Path/Op/Gui/Helix.py @@ -108,10 +108,10 @@ Command = PathOpGui.SetupOperation( "Helix", PathHelix.Create, TaskPanelOpPage, - "Path_Helix", - QT_TRANSLATE_NOOP("Path_Helix", "Helix"), + "CAM_Helix", + QT_TRANSLATE_NOOP("CAM_Helix", "Helix"), QT_TRANSLATE_NOOP( - "Path_Helix", "Creates a Path Helix from the features of a base object" + "CAM_Helix", "Creates a Path Helix from the features of a base object" ), PathHelix.SetupProperties, ) diff --git a/src/Mod/Path/Path/Op/Gui/MillFace.py b/src/Mod/Path/Path/Op/Gui/MillFace.py index 471596a6e4..684a1acf95 100644 --- a/src/Mod/Path/Path/Op/Gui/MillFace.py +++ b/src/Mod/Path/Path/Op/Gui/MillFace.py @@ -73,9 +73,9 @@ Command = PathOpGui.SetupOperation( PathMillFace.Create, TaskPanelOpPage, "Path_Face", - QT_TRANSLATE_NOOP("Path_MillFace", "Face"), + QT_TRANSLATE_NOOP("CAM_MillFace", "Face"), QT_TRANSLATE_NOOP( - "Path_MillFace", "Create a Facing Operation from a model or face" + "CAM_MillFace", "Create a Facing Operation from a model or face" ), PathMillFace.SetupProperties, ) diff --git a/src/Mod/Path/Path/Op/Gui/Pocket.py b/src/Mod/Path/Path/Op/Gui/Pocket.py index 2890dfd41f..45f698e770 100644 --- a/src/Mod/Path/Path/Op/Gui/Pocket.py +++ b/src/Mod/Path/Path/Op/Gui/Pocket.py @@ -54,9 +54,9 @@ Command = PathOpGui.SetupOperation( PathPocket.Create, TaskPanelOpPage, "Path_3DPocket", - QT_TRANSLATE_NOOP("Path_Pocket3D", "3D Pocket"), + QT_TRANSLATE_NOOP("CAM_Pocket3D", "3D Pocket"), QT_TRANSLATE_NOOP( - "Path_Pocket3D", "Creates a Path 3D Pocket from a face or faces" + "CAM_Pocket3D", "Creates a Path 3D Pocket from a face or faces" ), PathPocket.SetupProperties, ) diff --git a/src/Mod/Path/Path/Op/Gui/PocketShape.py b/src/Mod/Path/Path/Op/Gui/PocketShape.py index f7f7ac4e3d..d050d00050 100644 --- a/src/Mod/Path/Path/Op/Gui/PocketShape.py +++ b/src/Mod/Path/Path/Op/Gui/PocketShape.py @@ -66,10 +66,10 @@ Command = PathOpGui.SetupOperation( "Pocket Shape", PathPocketShape.Create, TaskPanelOpPage, - "Path_Pocket", - QT_TRANSLATE_NOOP("Path_Pocket_Shape", "Pocket Shape"), + "CAM_Pocket", + QT_TRANSLATE_NOOP("CAM_Pocket_Shape", "Pocket Shape"), QT_TRANSLATE_NOOP( - "Path_Pocket_Shape", "Creates a Path Pocket object from a face or faces" + "CAM_Pocket_Shape", "Creates a Path Pocket object from a face or faces" ), PathPocketShape.SetupProperties, ) diff --git a/src/Mod/Path/Path/Op/Gui/Probe.py b/src/Mod/Path/Path/Op/Gui/Probe.py index 47cebcfd5c..48c4a199c4 100644 --- a/src/Mod/Path/Path/Op/Gui/Probe.py +++ b/src/Mod/Path/Path/Op/Gui/Probe.py @@ -90,9 +90,9 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage): def SetOutputFileName(self): filename = QtGui.QFileDialog.getSaveFileName( self.form, - translate("Path_Probe", "Select Output File"), + translate("CAM_Probe", "Select Output File"), None, - translate("Path_Probe", "All Files (*.*)"), + translate("CAM_Probe", "All Files (*.*)"), ) if filename and filename[0]: self.obj.OutputFileName = str(filename[0]) @@ -103,9 +103,9 @@ Command = PathOpGui.SetupOperation( "Probe", PathProbe.Create, TaskPanelOpPage, - "Path_Probe", - QtCore.QT_TRANSLATE_NOOP("Path_Probe", "Probe"), - QtCore.QT_TRANSLATE_NOOP("Path_Probe", "Create a Probing Grid from a job stock"), + "CAM_Probe", + QtCore.QT_TRANSLATE_NOOP("CAM_Probe", "Probe"), + QtCore.QT_TRANSLATE_NOOP("CAM_Probe", "Create a Probing Grid from a job stock"), PathProbe.SetupProperties, ) diff --git a/src/Mod/Path/Path/Op/Gui/SimpleCopy.py b/src/Mod/Path/Path/Op/Gui/SimpleCopy.py index 9edf59a619..eada2c45a6 100644 --- a/src/Mod/Path/Path/Op/Gui/SimpleCopy.py +++ b/src/Mod/Path/Path/Op/Gui/SimpleCopy.py @@ -34,10 +34,10 @@ translate = FreeCAD.Qt.translate class CommandPathSimpleCopy: def GetResources(self): return { - "Pixmap": "Path_SimpleCopy", - "MenuText": QT_TRANSLATE_NOOP("Path_SimpleCopy", "Simple Copy"), + "Pixmap": "CAM_SimpleCopy", + "MenuText": QT_TRANSLATE_NOOP("CAM_SimpleCopy", "Simple Copy"), "ToolTip": QT_TRANSLATE_NOOP( - "Path_SimpleCopy", "Creates a non-parametric copy of another path" + "CAM_SimpleCopy", "Creates a non-parametric copy of another path" ), } @@ -55,13 +55,13 @@ class CommandPathSimpleCopy: selection = FreeCADGui.Selection.getSelection() if len(selection) != 1: FreeCAD.Console.PrintError( - translate("Path_SimpleCopy", "Please select exactly one path object") + translate("CAM_SimpleCopy", "Please select exactly one path object") + "\n" ) return if not (selection[0].isDerivedFrom("Path::Feature")): FreeCAD.Console.PrintError( - translate("Path_SimpleCopy", "Please select exactly one path object") + translate("CAM_SimpleCopy", "Please select exactly one path object") + "\n" ) return @@ -88,4 +88,4 @@ class CommandPathSimpleCopy: if FreeCAD.GuiUp: # register the FreeCAD command - FreeCADGui.addCommand("Path_SimpleCopy", CommandPathSimpleCopy()) + FreeCADGui.addCommand("CAM_SimpleCopy", CommandPathSimpleCopy()) diff --git a/src/Mod/Path/Path/Op/Gui/Slot.py b/src/Mod/Path/Path/Op/Gui/Slot.py index 0dc2a57edb..7395f35148 100644 --- a/src/Mod/Path/Path/Op/Gui/Slot.py +++ b/src/Mod/Path/Path/Op/Gui/Slot.py @@ -277,10 +277,10 @@ Command = PathOpGui.SetupOperation( "Slot", PathSlot.Create, TaskPanelOpPage, - "Path_Slot", - QtCore.QT_TRANSLATE_NOOP("Path_Slot", "Slot"), + "CAM_Slot", + QtCore.QT_TRANSLATE_NOOP("CAM_Slot", "Slot"), QtCore.QT_TRANSLATE_NOOP( - "Path_Slot", "Create a Slot operation from selected geometry or custom points." + "CAM_Slot", "Create a Slot operation from selected geometry or custom points." ), PathSlot.SetupProperties, ) diff --git a/src/Mod/Path/Path/Op/Gui/Stop.py b/src/Mod/Path/Path/Op/Gui/Stop.py index 89d1ac0588..92d4efcc12 100644 --- a/src/Mod/Path/Path/Op/Gui/Stop.py +++ b/src/Mod/Path/Path/Op/Gui/Stop.py @@ -88,7 +88,7 @@ class _ViewProviderStop: return None def getIcon(self): # optional - return ":/icons/Path_Stop.svg" + return ":/icons/CAM_Stop.svg" def onChanged(self, vobj, prop): # optional mode = 2 @@ -106,10 +106,10 @@ class _ViewProviderStop: class CommandPathStop: def GetResources(self): return { - "Pixmap": "Path_Stop", - "MenuText": QT_TRANSLATE_NOOP("Path_Stop", "Stop"), + "Pixmap": "CAM_Stop", + "MenuText": QT_TRANSLATE_NOOP("CAM_Stop", "Stop"), "ToolTip": QT_TRANSLATE_NOOP( - "Path_Stop", "Add Optional or Mandatory Stop to the program" + "CAM_Stop", "Add Optional or Mandatory Stop to the program" ), } @@ -143,7 +143,7 @@ PathUtils.addToJob(obj) if FreeCAD.GuiUp: # register the FreeCAD command - FreeCADGui.addCommand("Path_Stop", CommandPathStop()) + FreeCADGui.addCommand("CAM_Stop", CommandPathStop()) FreeCAD.Console.PrintLog("Loading PathStop... done\n") diff --git a/src/Mod/Path/Path/Op/Gui/ThreadMilling.py b/src/Mod/Path/Path/Op/Gui/ThreadMilling.py index a0a57883dc..c542a57766 100644 --- a/src/Mod/Path/Path/Op/Gui/ThreadMilling.py +++ b/src/Mod/Path/Path/Op/Gui/ThreadMilling.py @@ -249,10 +249,10 @@ Command = PathOpGui.SetupOperation( "ThreadMilling", PathThreadMilling.Create, TaskPanelOpPage, - "Path_ThreadMilling", - QT_TRANSLATE_NOOP("Path_ThreadMilling", "Thread Milling"), + "CAM_ThreadMilling", + QT_TRANSLATE_NOOP("CAM_ThreadMilling", "Thread Milling"), QT_TRANSLATE_NOOP( - "Path_ThreadMilling", + "CAM_ThreadMilling", "Creates a Path Thread Milling operation from features of a base object", ), PathThreadMilling.SetupProperties, diff --git a/src/Mod/Path/Path/Op/Gui/Vcarve.py b/src/Mod/Path/Path/Op/Gui/Vcarve.py index 4b06bc0145..861d972793 100644 --- a/src/Mod/Path/Path/Op/Gui/Vcarve.py +++ b/src/Mod/Path/Path/Op/Gui/Vcarve.py @@ -162,9 +162,9 @@ Command = PathOpGui.SetupOperation( "Vcarve", PathVcarve.Create, TaskPanelOpPage, - "Path_Vcarve", - QtCore.QT_TRANSLATE_NOOP("Path_Vcarve", "Vcarve"), - QtCore.QT_TRANSLATE_NOOP("Path_Vcarve", "Creates a medial line engraving path"), + "CAM_Vcarve", + QtCore.QT_TRANSLATE_NOOP("CAM_Vcarve", "Vcarve"), + QtCore.QT_TRANSLATE_NOOP("CAM_Vcarve", "Creates a medial line engraving path"), PathVcarve.SetupProperties, ) diff --git a/src/Mod/Path/Path/Op/Helix.py b/src/Mod/Path/Path/Op/Helix.py index 114328a018..8f7cd8557b 100644 --- a/src/Mod/Path/Path/Op/Helix.py +++ b/src/Mod/Path/Path/Op/Helix.py @@ -68,8 +68,8 @@ class ObjectHelix(PathCircularHoleBase.ObjectOp): # Enumeration lists for App::PropertyEnumeration properties enums = { "Direction": [ - (translate("Path_Helix", "CW"), "CW"), - (translate("Path_Helix", "CCW"), "CCW"), + (translate("CAM_Helix", "CW"), "CW"), + (translate("CAM_Helix", "CCW"), "CCW"), ], # this is the direction that the profile runs "StartSide": [ (translate("PathProfile", "Outside"), "Outside"), diff --git a/src/Mod/Path/Path/Op/MillFace.py b/src/Mod/Path/Path/Op/MillFace.py index 977c54cf0b..4dd7c47d41 100644 --- a/src/Mod/Path/Path/Op/MillFace.py +++ b/src/Mod/Path/Path/Op/MillFace.py @@ -65,10 +65,10 @@ class ObjectFace(PathPocketBase.ObjectPocket): enums = { "BoundaryShape": [ - (translate("Path_Pocket", "Boundbox"), "Boundbox"), - (translate("Path_Pocket", "Face Region"), "Face Region"), - (translate("Path_Pocket", "Perimeter"), "Perimeter"), - (translate("Path_Pocket", "Stock"), "Stock"), + (translate("CAM_Pocket", "Boundbox"), "Boundbox"), + (translate("CAM_Pocket", "Face Region"), "Face Region"), + (translate("CAM_Pocket", "Perimeter"), "Perimeter"), + (translate("CAM_Pocket", "Stock"), "Stock"), ], } diff --git a/src/Mod/Path/Path/Op/Pocket.py b/src/Mod/Path/Path/Op/Pocket.py index 76dd910086..45e930fbd5 100644 --- a/src/Mod/Path/Path/Op/Pocket.py +++ b/src/Mod/Path/Path/Op/Pocket.py @@ -114,8 +114,8 @@ class ObjectPocket(PathPocketBase.ObjectPocket): enums = { "HandleMultipleFeatures": [ - (translate("Path_Pocket", "Collectively"), "Collectively"), - (translate("Path_Pocket", "Individually"), "Individually"), + (translate("CAM_Pocket", "Collectively"), "Collectively"), + (translate("CAM_Pocket", "Individually"), "Individually"), ], } diff --git a/src/Mod/Path/Path/Op/PocketBase.py b/src/Mod/Path/Path/Op/PocketBase.py index 9dc30836de..cd60aaeba1 100644 --- a/src/Mod/Path/Path/Op/PocketBase.py +++ b/src/Mod/Path/Path/Op/PocketBase.py @@ -58,19 +58,19 @@ class ObjectPocket(PathAreaOp.ObjectOp): enums = { "CutMode": [ - (translate("Path_Pocket", "Climb"), "Climb"), - (translate("Path_Pocket", "Conventional"), "Conventional"), + (translate("CAM_Pocket", "Climb"), "Climb"), + (translate("CAM_Pocket", "Conventional"), "Conventional"), ], # this is the direction that the profile runs "StartAt": [ - (translate("Path_Pocket", "Center"), "Center"), - (translate("Path_Pocket", "Edge"), "Edge"), + (translate("CAM_Pocket", "Center"), "Center"), + (translate("CAM_Pocket", "Edge"), "Edge"), ], "OffsetPattern": [ - (translate("Path_Pocket", "ZigZag"), "ZigZag"), - (translate("Path_Pocket", "Offset"), "Offset"), - (translate("Path_Pocket", "ZigZagOffset"), "ZigZagOffset"), - (translate("Path_Pocket", "Line"), "Line"), - (translate("Path_Pocket", "Grid"), "Grid"), + (translate("CAM_Pocket", "ZigZag"), "ZigZag"), + (translate("CAM_Pocket", "Offset"), "Offset"), + (translate("CAM_Pocket", "ZigZagOffset"), "ZigZagOffset"), + (translate("CAM_Pocket", "Line"), "Line"), + (translate("CAM_Pocket", "Grid"), "Grid"), ], # Fill Pattern } diff --git a/src/Mod/Path/Path/Op/Slot.py b/src/Mod/Path/Path/Op/Slot.py index 7792fceca3..49716bfbd8 100644 --- a/src/Mod/Path/Path/Op/Slot.py +++ b/src/Mod/Path/Path/Op/Slot.py @@ -101,9 +101,9 @@ class ObjectSlot(PathOp.ObjectOp): setattr(obj, k, [t[1] for t in tupList]) if warn: - newPropMsg = translate("Path_Slot", "New property added to") + newPropMsg = translate("CAM_Slot", "New property added to") newPropMsg += ' "{}": {}'.format(obj.Label, self.addNewProps) + ". " - newPropMsg += translate("Path_Slot", "Check default value(s).") + newPropMsg += translate("CAM_Slot", "Check default value(s).") FreeCAD.Console.PrintWarning(newPropMsg + "\n") self.propertiesReady = True @@ -251,38 +251,38 @@ class ObjectSlot(PathOp.ObjectOp): enums = { "CutPattern": [ - (translate("Path_Slot", "Line"), "Line"), - (translate("Path_Slot", "ZigZag"), "ZigZag"), + (translate("CAM_Slot", "Line"), "Line"), + (translate("CAM_Slot", "ZigZag"), "ZigZag"), ], "LayerMode": [ - (translate("Path_Slot", "Single-pass"), "Single-pass"), - (translate("Path_Slot", "Multi-pass"), "Multi-pass"), + (translate("CAM_Slot", "Single-pass"), "Single-pass"), + (translate("CAM_Slot", "Multi-pass"), "Multi-pass"), ], "PathOrientation": [ - (translate("Path_Slot", "Start to End"), "Start to End"), - (translate("Path_Slot", "Perpendicular"), "Perpendicular"), + (translate("CAM_Slot", "Start to End"), "Start to End"), + (translate("CAM_Slot", "Perpendicular"), "Perpendicular"), ], "Reference1": [ - (translate("Path_Slot", "Center of Mass"), "Center of Mass"), + (translate("CAM_Slot", "Center of Mass"), "Center of Mass"), ( - translate("Path_Slot", "Center of Bounding Box"), + translate("CAM_Slot", "Center of Bounding Box"), "Center of BoundBox", ), - (translate("Path_Slot", "Lowest Point"), "Lowest Point"), - (translate("Path_Slot", "Highest Point"), "Highest Point"), - (translate("Path_Slot", "Long Edge"), "Long Edge"), - (translate("Path_Slot", "Short Edge"), "Short Edge"), - (translate("Path_Slot", "Vertex"), "Vertex"), + (translate("CAM_Slot", "Lowest Point"), "Lowest Point"), + (translate("CAM_Slot", "Highest Point"), "Highest Point"), + (translate("CAM_Slot", "Long Edge"), "Long Edge"), + (translate("CAM_Slot", "Short Edge"), "Short Edge"), + (translate("CAM_Slot", "Vertex"), "Vertex"), ], "Reference2": [ - (translate("Path_Slot", "Center of Mass"), "Center of Mass"), + (translate("CAM_Slot", "Center of Mass"), "Center of Mass"), ( - translate("Path_Slot", "Center of Bounding Box"), + translate("CAM_Slot", "Center of Bounding Box"), "Center of BoundBox", ), - (translate("Path_Slot", "Lowest Point"), "Lowest Point"), - (translate("Path_Slot", "Highest Point"), "Highest Point"), - (translate("Path_Slot", "Vertex"), "Vertex"), + (translate("CAM_Slot", "Lowest Point"), "Lowest Point"), + (translate("CAM_Slot", "Highest Point"), "Highest Point"), + (translate("CAM_Slot", "Vertex"), "Vertex"), ], } @@ -600,7 +600,7 @@ class ObjectSlot(PathOp.ObjectOp): featureCount = 0 if not hasattr(obj, "Base"): - msg = translate("Path_Slot", "No Base Geometry object in the operation.") + msg = translate("CAM_Slot", "No Base Geometry object in the operation.") FreeCAD.Console.PrintError(msg + "\n") return False @@ -609,14 +609,14 @@ class ObjectSlot(PathOp.ObjectOp): p1 = obj.CustomPoint1 p2 = obj.CustomPoint2 if p1 == p2: - msg = translate("Path_Slot", "Custom points are identical.") + msg = translate("CAM_Slot", "Custom points are identical.") FreeCAD.Console.PrintError(msg + "\n") return False elif p1.z == p2.z: pnts = (p1, p2) featureCount = 2 else: - msg = translate("Path_Slot", "Custom points not at same Z height.") + msg = translate("CAM_Slot", "Custom points not at same Z height.") FreeCAD.Console.PrintError(msg + "\n") return False else: @@ -672,7 +672,7 @@ class ObjectSlot(PathOp.ObjectOp): ) if newRadius <= 0: msg = translate( - "Path_Slot", + "CAM_Slot", "Current Extend Radius value produces negative arc radius.", ) FreeCAD.Console.PrintError(msg + "\n") @@ -691,7 +691,7 @@ class ObjectSlot(PathOp.ObjectOp): # Complete circle if obj.ExtendPathStart.Value != 0 or obj.ExtendPathEnd.Value != 0: msg = translate( - "Path_Slot", "No path extensions available for full circles." + "CAM_Slot", "No path extensions available for full circles." ) FreeCAD.Console.PrintWarning(msg + "\n") else: @@ -720,7 +720,7 @@ class ObjectSlot(PathOp.ObjectOp): if self._arcCollisionCheck(obj, p1, p2, self.arcCenter, self.newRadius): msg = obj.Label + " " - msg += translate("Path_Slot", "operation collides with model.") + msg += translate("CAM_Slot", "operation collides with model.") FreeCAD.Console.PrintError(msg + "\n") # Path.Log.warning('Unable to create G-code. _makeArcGCode() is incomplete.') @@ -832,7 +832,7 @@ class ObjectSlot(PathOp.ObjectOp): if edg1_len != edg2_len: msg = obj.Label + " " msg += translate( - "Path_Slot", "Verify slot path start and end points." + "CAM_Slot", "Verify slot path start and end points." ) FreeCAD.Console.PrintWarning(msg + "\n") else: @@ -868,7 +868,7 @@ class ObjectSlot(PathOp.ObjectOp): if self._lineCollisionCheck(obj, p1, p2): msg = obj.Label + " " - msg += translate("Path_Slot", "operation collides with model.") + msg += translate("CAM_Slot", "operation collides with model.") FreeCAD.Console.PrintWarning(msg + "\n") cmds = self._makeLineGCode(obj, p1, p2) @@ -965,7 +965,7 @@ class ObjectSlot(PathOp.ObjectOp): pnts = self._processSingleComplexFace(obj, shape_1) if not pnts: - msg = translate("Path_Slot", "The selected face is inaccessible.") + msg = translate("CAM_Slot", "The selected face is inaccessible.") FreeCAD.Console.PrintError(msg + "\n") return False @@ -982,7 +982,7 @@ class ObjectSlot(PathOp.ObjectOp): elif cat1 == "Vert": msg = translate( - "Path_Slot", + "CAM_Slot", "Only a vertex selected. Add another feature to the Base Geometry.", ) FreeCAD.Console.PrintError(msg + "\n") @@ -1009,7 +1009,7 @@ class ObjectSlot(PathOp.ObjectOp): # Reject triangular faces if len(shape.Edges) < 4: msg = translate( - "Path_Slot", "A single selected face must have four edges minimum." + "CAM_Slot", "A single selected face must have four edges minimum." ) FreeCAD.Console.PrintError(msg + "\n") return False @@ -1067,7 +1067,7 @@ class ObjectSlot(PathOp.ObjectOp): Path.Log.debug(" -parallel_edge_flags: {}".format(parallel_edge_flags)) if pairCnt == 0: - msg = translate("Path_Slot", "No parallel edges identified.") + msg = translate("CAM_Slot", "No parallel edges identified.") FreeCAD.Console.PrintError(msg + "\n") return False elif pairCnt == 1: @@ -1091,7 +1091,7 @@ class ObjectSlot(PathOp.ObjectOp): same = parallel_edge_pairs[0] else: msg = "Reference1 " - msg += translate("Path_Slot", "value error.") + msg += translate("CAM_Slot", "value error.") FreeCAD.Console.PrintError(msg + "\n") return False @@ -1138,7 +1138,7 @@ class ObjectSlot(PathOp.ObjectOp): (p1, p2) = self._getCutSidePoints(obj, v0, v1, a1, a2, b1, b2) msg = obj.Label + " " - msg += translate("Path_Slot", "Verify slot path start and end points.") + msg += translate("CAM_Slot", "Verify slot path start and end points.") FreeCAD.Console.PrintWarning(msg + "\n") return (p1, p2) @@ -1153,7 +1153,7 @@ class ObjectSlot(PathOp.ObjectOp): def oversizedTool(holeDiam): # Test if tool larger than opening if self.tool.Diameter > holeDiam: - msg = translate("Path_Slot", "Current tool larger than arc diameter.") + msg = translate("CAM_Slot", "Current tool larger than arc diameter.") FreeCAD.Console.PrintError(msg + "\n") return True return False @@ -1238,7 +1238,7 @@ class ObjectSlot(PathOp.ObjectOp): return (p1, p2) else: msg = translate( - "Path_Slot", + "CAM_Slot", "Failed, slot from edge only accepts lines, arcs and circles.", ) FreeCAD.Console.PrintError(msg + "\n") @@ -1259,7 +1259,7 @@ class ObjectSlot(PathOp.ObjectOp): feature1 = self._processFeature(obj, shape_1, sub1, 1) if not feature1: - msg = translate("Path_Slot", "Failed to determine point 1 from") + msg = translate("CAM_Slot", "Failed to determine point 1 from") FreeCAD.Console.PrintError(msg + " {}.\n".format(sub1)) return False (p1, dYdX1, shpType) = feature1 @@ -1269,7 +1269,7 @@ class ObjectSlot(PathOp.ObjectOp): feature2 = self._processFeature(obj, shape_2, sub2, 2) if not feature2: - msg = translate("Path_Slot", "Failed to determine point 2 from") + msg = translate("CAM_Slot", "Failed to determine point 2 from") FreeCAD.Console.PrintError(msg + " {}.\n".format(sub2)) return False (p2, dYdX2, shpType) = feature2 @@ -1282,7 +1282,7 @@ class ObjectSlot(PathOp.ObjectOp): Path.Log.debug("dYdX1, dYdX2: {}, {}".format(dYdX1, dYdX2)) if not self._isParallel(dYdX1, dYdX2): if self.shapeType1 != "Edge" or self.shapeType2 != "Edge": - msg = translate("Path_Slot", "Selected geometry not parallel.") + msg = translate("CAM_Slot", "Selected geometry not parallel.") FreeCAD.Console.PrintError(msg + "\n") return False @@ -1402,7 +1402,7 @@ class ObjectSlot(PathOp.ObjectOp): # FreeCAD.Console.PrintMessage('{} normal {}.\n'.format(sub, norm)) if norm.z != 0: msg = translate( - "Path_Slot", "The selected face is not oriented vertically:" + "CAM_Slot", "The selected face is not oriented vertically:" ) FreeCAD.Console.PrintError(msg + " {}.\n".format(sub)) return False @@ -1916,7 +1916,7 @@ class ObjectSlot(PathOp.ObjectOp): # Path.Log.debug('arcRadius, newRadius: {}, {}'.format(arcRadius, newRadius)) if newRadius <= 0: msg = translate( - "Path_Slot", "Current offset value produces negative radius." + "CAM_Slot", "Current offset value produces negative radius." ) FreeCAD.Console.PrintError(msg + "\n") return False @@ -1930,7 +1930,7 @@ class ObjectSlot(PathOp.ObjectOp): # Path.Log.debug('arcRadius, newRadius: {}, {}'.format(arcRadius, newRadius)) if newRadius <= 0: msg = translate( - "Path_Slot", "Current offset value produces negative radius." + "CAM_Slot", "Current offset value produces negative radius." ) FreeCAD.Console.PrintError(msg + "\n") return False diff --git a/src/Mod/Path/Path/Op/ThreadMilling.py b/src/Mod/Path/Path/Op/ThreadMilling.py index f2305672b2..025a68430f 100644 --- a/src/Mod/Path/Path/Op/ThreadMilling.py +++ b/src/Mod/Path/Path/Op/ThreadMilling.py @@ -242,59 +242,59 @@ class ObjectThreadMilling(PathCircularHoleBase.ObjectOp): enums = { "ThreadType": [ ( - translate("Path_ThreadMilling", "Custom External"), + translate("CAM_ThreadMilling", "Custom External"), ThreadTypeCustomExternal, ), ( - translate("Path_ThreadMilling", "Custom Internal"), + translate("CAM_ThreadMilling", "Custom Internal"), ThreadTypeCustomInternal, ), ( - translate("Path_ThreadMilling", "Imperial External (2A)"), + translate("CAM_ThreadMilling", "Imperial External (2A)"), ThreadTypeImperialExternal2A, ), ( - translate("Path_ThreadMilling", "Imperial External (3A)"), + translate("CAM_ThreadMilling", "Imperial External (3A)"), ThreadTypeImperialExternal3A, ), ( - translate("Path_ThreadMilling", "Imperial Internal (2B)"), + translate("CAM_ThreadMilling", "Imperial Internal (2B)"), ThreadTypeImperialInternal2B, ), ( - translate("Path_ThreadMilling", "Imperial Internal (3B)"), + translate("CAM_ThreadMilling", "Imperial Internal (3B)"), ThreadTypeImperialInternal3B, ), ( - translate("Path_ThreadMilling", "Metric External (4G6G)"), + translate("CAM_ThreadMilling", "Metric External (4G6G)"), ThreadTypeMetricExternal4G6G, ), ( - translate("Path_ThreadMilling", "Metric External (6G)"), + translate("CAM_ThreadMilling", "Metric External (6G)"), ThreadTypeMetricExternal6G, ), ( - translate("Path_ThreadMilling", "Metric Internal (6H)"), + translate("CAM_ThreadMilling", "Metric Internal (6H)"), ThreadTypeMetricInternal6H, ), ], "ThreadOrientation": [ ( - translate("Path_ThreadMilling", "LeftHand"), + translate("CAM_ThreadMilling", "LeftHand"), LeftHand, ), ( - translate("Path_ThreadMilling", "RightHand"), + translate("CAM_ThreadMilling", "RightHand"), RightHand, ), ], "Direction": [ ( - translate("Path_ThreadMilling", "Climb"), + translate("CAM_ThreadMilling", "Climb"), DirectionClimb, ), ( - translate("Path_ThreadMilling", "Conventional"), + translate("CAM_ThreadMilling", "Conventional"), DirectionConventional, ), ], diff --git a/src/Mod/Path/Path/Op/Vcarve.py b/src/Mod/Path/Path/Op/Vcarve.py index a40523c9df..85ec3727e8 100644 --- a/src/Mod/Path/Path/Op/Vcarve.py +++ b/src/Mod/Path/Path/Op/Vcarve.py @@ -353,7 +353,7 @@ class ObjectVcarve(PathEngraveBase.ObjectOp): if not hasattr(obj.ToolController.Tool, "CuttingEdgeAngle"): Path.Log.error( translate( - "Path_Vcarve", + "CAM_Vcarve", "VCarve requires an engraving cutter with a cutting edge angle", ) ) @@ -361,7 +361,7 @@ class ObjectVcarve(PathEngraveBase.ObjectOp): if obj.ToolController.Tool.CuttingEdgeAngle >= 180.0: Path.Log.error( translate( - "Path_Vcarve", "Engraver cutting edge angle must be < 180 degrees." + "CAM_Vcarve", "Engraver cutting edge angle must be < 180 degrees." ) ) return diff --git a/src/Mod/Path/Path/Post/Command.py b/src/Mod/Path/Path/Post/Command.py index 4d6d01574f..042fcd4689 100644 --- a/src/Mod/Path/Path/Post/Command.py +++ b/src/Mod/Path/Path/Post/Command.py @@ -468,10 +468,10 @@ class CommandPathPost: def GetResources(self): return { - "Pixmap": "Path_Post", - "MenuText": QT_TRANSLATE_NOOP("Path_Post", "Post Process"), + "Pixmap": "CAM_Post", + "MenuText": QT_TRANSLATE_NOOP("CAM_Post", "Post Process"), "Accel": "P, P", - "ToolTip": QT_TRANSLATE_NOOP("Path_Post", "Post Process the selected Job"), + "ToolTip": QT_TRANSLATE_NOOP("CAM_Post", "Post Process the selected Job"), } def IsActive(self): @@ -618,6 +618,6 @@ class CommandPathPost: if FreeCAD.GuiUp: # register the FreeCAD command - FreeCADGui.addCommand("Path_Post", CommandPathPost()) + FreeCADGui.addCommand("CAM_Post", CommandPathPost()) FreeCAD.Console.PrintLog("Loading PathPost... done\n") diff --git a/src/Mod/Path/Path/Tool/Controller.py b/src/Mod/Path/Path/Tool/Controller.py index e910be6eaa..dc7856f9c3 100644 --- a/src/Mod/Path/Path/Tool/Controller.py +++ b/src/Mod/Path/Path/Tool/Controller.py @@ -128,9 +128,9 @@ class ToolController: # Enumeration lists for App::PropertyEnumeration properties enums = { "SpindleDir": [ - (translate("Path_ToolController", "Forward"), "Forward"), - (translate("Path_ToolController", "Reverse"), "Reverse"), - (translate("Path_ToolController", "None"), "None"), + (translate("CAM_ToolController", "Forward"), "Forward"), + (translate("CAM_ToolController", "Reverse"), "Reverse"), + (translate("CAM_ToolController", "None"), "None"), ], # this is the direction that the profile runs } diff --git a/src/Mod/Path/Path/Tool/Gui/Bit.py b/src/Mod/Path/Path/Tool/Gui/Bit.py index c50b168579..7fc3bf4cbc 100644 --- a/src/Mod/Path/Path/Tool/Gui/Bit.py +++ b/src/Mod/Path/Path/Tool/Gui/Bit.py @@ -68,7 +68,7 @@ class ViewProvider(object): pixmap = QtGui.QPixmap() pixmap.loadFromData(png, "PNG") return QtGui.QIcon(pixmap) - return ":/icons/Path_ToolBit.svg" + return ":/icons/CAM_ToolBit.svg" def dumps(self): return None diff --git a/src/Mod/Path/Path/Tool/Gui/BitCmd.py b/src/Mod/Path/Path/Tool/Gui/BitCmd.py index 2cc53ad1c2..2d80a13062 100644 --- a/src/Mod/Path/Path/Tool/Gui/BitCmd.py +++ b/src/Mod/Path/Path/Tool/Gui/BitCmd.py @@ -45,10 +45,10 @@ class CommandToolBitCreate: def GetResources(self): return { - "Pixmap": "Path_ToolBit", - "MenuText": QT_TRANSLATE_NOOP("Path_ToolBitCreate", "Create Tool"), + "Pixmap": "CAM_ToolBit", + "MenuText": QT_TRANSLATE_NOOP("CAM_ToolBitCreate", "Create Tool"), "ToolTip": QT_TRANSLATE_NOOP( - "Path_ToolBitCreate", "Creates a new ToolBit object" + "CAM_ToolBitCreate", "Creates a new ToolBit object" ), } @@ -70,14 +70,14 @@ class CommandToolBitSave: def GetResources(self): if self.saveAs: - menuTxt = QT_TRANSLATE_NOOP("Path_ToolBitSaveAs", "Save Tool as...") + menuTxt = QT_TRANSLATE_NOOP("CAM_ToolBitSaveAs", "Save Tool as...") else: - menuTxt = QT_TRANSLATE_NOOP("Path_ToolBitSave", "Save Tool") + menuTxt = QT_TRANSLATE_NOOP("CAM_ToolBitSave", "Save Tool") return { - "Pixmap": "Path_ToolBit", + "Pixmap": "CAM_ToolBit", "MenuText": menuTxt, "ToolTip": QT_TRANSLATE_NOOP( - "Path_ToolBitSave", "Save an existing ToolBit object to a file" + "CAM_ToolBitSave", "Save an existing ToolBit object to a file" ), } @@ -134,10 +134,10 @@ class CommandToolBitLoad: def GetResources(self): return { - "Pixmap": "Path_ToolBit", - "MenuText": QT_TRANSLATE_NOOP("Path_ToolBitLoad", "Load Tool"), + "Pixmap": "CAM_ToolBit", + "MenuText": QT_TRANSLATE_NOOP("CAM_ToolBitLoad", "Load Tool"), "ToolTip": QT_TRANSLATE_NOOP( - "Path_ToolBitLoad", "Load an existing ToolBit object from a file" + "CAM_ToolBitLoad", "Load an existing ToolBit object from a file" ), } @@ -156,16 +156,16 @@ class CommandToolBitLoad: if FreeCAD.GuiUp: - FreeCADGui.addCommand("Path_ToolBitCreate", CommandToolBitCreate()) - FreeCADGui.addCommand("Path_ToolBitLoad", CommandToolBitLoad()) - FreeCADGui.addCommand("Path_ToolBitSave", CommandToolBitSave(False)) - FreeCADGui.addCommand("Path_ToolBitSaveAs", CommandToolBitSave(True)) + FreeCADGui.addCommand("CAM_ToolBitCreate", CommandToolBitCreate()) + FreeCADGui.addCommand("CAM_ToolBitLoad", CommandToolBitLoad()) + FreeCADGui.addCommand("CAM_ToolBitSave", CommandToolBitSave(False)) + FreeCADGui.addCommand("CAM_ToolBitSaveAs", CommandToolBitSave(True)) CommandList = [ - "Path_ToolBitCreate", - "Path_ToolBitLoad", - "Path_ToolBitSave", - "Path_ToolBitSaveAs", + "CAM_ToolBitCreate", + "CAM_ToolBitLoad", + "CAM_ToolBitSave", + "CAM_ToolBitSaveAs", ] FreeCAD.Console.PrintLog("Loading PathToolBitCmd... done\n") diff --git a/src/Mod/Path/Path/Tool/Gui/BitLibrary.py b/src/Mod/Path/Path/Tool/Gui/BitLibrary.py index 25c5f17916..f97f60ba6c 100644 --- a/src/Mod/Path/Path/Tool/Gui/BitLibrary.py +++ b/src/Mod/Path/Path/Tool/Gui/BitLibrary.py @@ -74,14 +74,14 @@ def checkWorkingDir(): ret = qm.question( None, "", - translate("Path_ToolBit", "Toolbit working directory not set up. Do that now?"), + translate("CAM_ToolBit", "Toolbit working directory not set up. Do that now?"), qm.Yes | qm.No, ) if ret == qm.No: return False - msg = translate("Path_ToolBit", "Choose a writable location for your toolbits") + msg = translate("CAM_ToolBit", "Choose a writable location for your toolbits") while not dirOK(): workingdir = PySide.QtGui.QFileDialog.getExistingDirectory( None, msg, Path.Preferences.filePath() @@ -120,7 +120,7 @@ def checkWorkingDir(): None, "", translate( - "Path_ToolBit", + "CAM_ToolBit", "Toolbit Working directory {} needs these sudirectories:\n {} \n Create them?", ).format(workingdir, needed), qm.Yes | qm.No, @@ -140,7 +140,7 @@ def checkWorkingDir(): None, "", translate( - "Path_ToolBit", "Copy example files to new {} directory?" + "CAM_ToolBit", "Copy example files to new {} directory?" ).format(dir), qm.Yes | qm.No, ) @@ -331,7 +331,7 @@ class ModelFactory(object): libItem = PySide.QtGui.QStandardItem(fn) libItem.setToolTip(loc) libItem.setData(libFile, _PathRole) - libItem.setIcon(PySide.QtGui.QPixmap(":/icons/Path_ToolTable.svg")) + libItem.setIcon(PySide.QtGui.QPixmap(":/icons/CAM_ToolTable.svg")) model.appendRow(libItem) Path.Log.debug("model rows: {}".format(model.rowCount())) @@ -663,11 +663,11 @@ class ToolBitLibrary(object): print("all done") def libraryNew(self): - TooltableTypeJSON = translate("Path_ToolBit", "Tooltable JSON (*.fctl)") + TooltableTypeJSON = translate("CAM_ToolBit", "Tooltable JSON (*.fctl)") filename = PySide.QtGui.QFileDialog.getSaveFileName( self.form, - translate("Path_ToolBit", "Save toolbit library"), + translate("CAM_ToolBit", "Save toolbit library"), Path.Preferences.lastPathToolLibrary(), "{}".format(TooltableTypeJSON), ) @@ -791,13 +791,13 @@ class ToolBitLibrary(object): def librarySaveAs(self, path): - TooltableTypeJSON = translate("Path_ToolBit", "Tooltable JSON (*.fctl)") - TooltableTypeLinuxCNC = translate("Path_ToolBit", "LinuxCNC tooltable (*.tbl)") - TooltableTypeCamotics = translate("Path_ToolBit", "Camotics tooltable (*.json)") + TooltableTypeJSON = translate("CAM_ToolBit", "Tooltable JSON (*.fctl)") + TooltableTypeLinuxCNC = translate("CAM_ToolBit", "LinuxCNC tooltable (*.tbl)") + TooltableTypeCamotics = translate("CAM_ToolBit", "Camotics tooltable (*.json)") filename = PySide.QtGui.QFileDialog.getSaveFileName( self.form, - translate("Path_ToolBit", "Save toolbit library"), + translate("CAM_ToolBit", "Save toolbit library"), Path.Preferences.lastPathToolLibrary(), "{};;{};;{}".format( TooltableTypeJSON, TooltableTypeLinuxCNC, TooltableTypeCamotics diff --git a/src/Mod/Path/Path/Tool/Gui/BitLibraryCmd.py b/src/Mod/Path/Path/Tool/Gui/BitLibraryCmd.py index d141894220..53e2a447b7 100644 --- a/src/Mod/Path/Path/Tool/Gui/BitLibraryCmd.py +++ b/src/Mod/Path/Path/Tool/Gui/BitLibraryCmd.py @@ -44,9 +44,9 @@ class CommandToolBitSelectorOpen: def GetResources(self): return { - "Pixmap": "Path_ToolTable", - "MenuText": QT_TRANSLATE_NOOP("Path_ToolBitDock", "ToolBit Dock"), - "ToolTip": QT_TRANSLATE_NOOP("Path_ToolBitDock", "Toggle the Toolbit Dock"), + "Pixmap": "CAM_ToolTable", + "MenuText": QT_TRANSLATE_NOOP("CAM_ToolBitDock", "ToolBit Dock"), + "ToolTip": QT_TRANSLATE_NOOP("CAM_ToolBitDock", "Toggle the Toolbit Dock"), "Accel": "P, T", "CmdType": "ForEdit", } @@ -71,12 +71,12 @@ class CommandToolBitLibraryOpen: def GetResources(self): return { - "Pixmap": "Path_ToolTable", + "Pixmap": "CAM_ToolTable", "MenuText": QT_TRANSLATE_NOOP( - "Path_ToolBitLibraryOpen", "ToolBit Library editor" + "CAM_ToolBitLibraryOpen", "ToolBit Library editor" ), "ToolTip": QT_TRANSLATE_NOOP( - "Path_ToolBitLibraryOpen", "Open an editor to manage ToolBit libraries" + "CAM_ToolBitLibraryOpen", "Open an editor to manage ToolBit libraries" ), "CmdType": "ForEdit", } @@ -93,10 +93,10 @@ class CommandToolBitLibraryOpen: if FreeCAD.GuiUp: - FreeCADGui.addCommand("Path_ToolBitLibraryOpen", CommandToolBitLibraryOpen()) - FreeCADGui.addCommand("Path_ToolBitDock", CommandToolBitSelectorOpen()) + FreeCADGui.addCommand("CAM_ToolBitLibraryOpen", CommandToolBitLibraryOpen()) + FreeCADGui.addCommand("CAM_ToolBitDock", CommandToolBitSelectorOpen()) -BarList = ["Path_ToolBitDock"] -MenuList = ["Path_ToolBitLibraryOpen", "Path_ToolBitDock"] +BarList = ["CAM_ToolBitDock"] +MenuList = ["CAM_ToolBitLibraryOpen", "CAM_ToolBitDock"] FreeCAD.Console.PrintLog("Loading PathToolBitLibraryCmd... done\n") diff --git a/src/Mod/Path/Path/Tool/Gui/Controller.py b/src/Mod/Path/Path/Tool/Gui/Controller.py index df3af5a54f..1ece3e3c45 100644 --- a/src/Mod/Path/Path/Tool/Gui/Controller.py +++ b/src/Mod/Path/Path/Tool/Gui/Controller.py @@ -71,7 +71,7 @@ class ViewProvider: return None def getIcon(self): - return ":/icons/Path_ToolController.svg" + return ":/icons/CAM_ToolController.svg" def onChanged(self, vobj, prop): mode = 2 @@ -140,9 +140,9 @@ class CommandPathToolController(object): return { "Pixmap": "Path_LengthOffset", "MenuText": QT_TRANSLATE_NOOP( - "Path_ToolController", "Add Tool Controller to the Job" + "CAM_ToolController", "Add Tool Controller to the Job" ), - "ToolTip": QT_TRANSLATE_NOOP("Path_ToolController", "Add Tool Controller"), + "ToolTip": QT_TRANSLATE_NOOP("CAM_ToolController", "Add Tool Controller"), } def selectedJob(self): @@ -360,6 +360,6 @@ class DlgToolControllerEdit: if FreeCAD.GuiUp: # register the FreeCAD command - FreeCADGui.addCommand("Path_ToolController", CommandPathToolController()) + FreeCADGui.addCommand("CAM_ToolController", CommandPathToolController()) FreeCAD.Console.PrintLog("Loading PathToolControllerGui... done\n") diff --git a/src/Mod/Path/PathCommands.py b/src/Mod/Path/PathCommands.py index f109d299b7..34db4c977a 100644 --- a/src/Mod/Path/PathCommands.py +++ b/src/Mod/Path/PathCommands.py @@ -55,11 +55,11 @@ class _CommandSelectLoop: def GetResources(self): return { - "Pixmap": "Path_SelectLoop", - "MenuText": QT_TRANSLATE_NOOP("Path_SelectLoop", "Finish Selecting Loop"), + "Pixmap": "CAM_SelectLoop", + "MenuText": QT_TRANSLATE_NOOP("CAM_SelectLoop", "Finish Selecting Loop"), "Accel": "P, L", "ToolTip": QT_TRANSLATE_NOOP( - "Path_SelectLoop", "Complete the selection of edges that form a loop" + "CAM_SelectLoop", "Complete the selection of edges that form a loop" ), "CmdType": "ForEdit", } @@ -117,8 +117,8 @@ class _CommandSelectLoop: elif FreeCAD.GuiUp: QtGui.QMessageBox.information( None, - QT_TRANSLATE_NOOP("Path_SelectLoop", "Feature Completion"), - QT_TRANSLATE_NOOP("Path_SelectLoop", "Closed loop detection failed."), + QT_TRANSLATE_NOOP("CAM_SelectLoop", "Feature Completion"), + QT_TRANSLATE_NOOP("CAM_SelectLoop", "Closed loop detection failed."), ) def formsPartOfALoop(self, obj, sub, names): @@ -137,7 +137,7 @@ class _CommandSelectLoop: if FreeCAD.GuiUp: - FreeCADGui.addCommand("Path_SelectLoop", _CommandSelectLoop()) + FreeCADGui.addCommand("CAM_SelectLoop", _CommandSelectLoop()) class _ToggleOperation: @@ -145,13 +145,13 @@ class _ToggleOperation: def GetResources(self): return { - "Pixmap": "Path_OpActive", + "Pixmap": "CAM_OpActive", "MenuText": QT_TRANSLATE_NOOP( - "Path_OpActiveToggle", "Toggle the Active State of the Operation" + "CAM_OpActiveToggle", "Toggle the Active State of the Operation" ), "Accel": "P, X", "ToolTip": QT_TRANSLATE_NOOP( - "Path_OpActiveToggle", "Toggle the Active State of the Operation" + "CAM_OpActiveToggle", "Toggle the Active State of the Operation" ), "CmdType": "ForEdit", } @@ -180,7 +180,7 @@ class _ToggleOperation: if FreeCAD.GuiUp: - FreeCADGui.addCommand("Path_OpActiveToggle", _ToggleOperation()) + FreeCADGui.addCommand("CAM_OpActiveToggle", _ToggleOperation()) class _CopyOperation: @@ -188,12 +188,12 @@ class _CopyOperation: def GetResources(self): return { - "Pixmap": "Path_OpCopy", + "Pixmap": "CAM_OpCopy", "MenuText": QT_TRANSLATE_NOOP( - "Path_OperationCopy", "Copy the operation in the job" + "CAM_OperationCopy", "Copy the operation in the job" ), "ToolTip": QT_TRANSLATE_NOOP( - "Path_OperationCopy", "Copy the operation in the job" + "CAM_OperationCopy", "Copy the operation in the job" ), "CmdType": "ForEdit", } @@ -216,7 +216,7 @@ class _CopyOperation: if FreeCAD.GuiUp: - FreeCADGui.addCommand("Path_OperationCopy", _CopyOperation()) + FreeCADGui.addCommand("CAM_OperationCopy", _CopyOperation()) # \c findShape() is referenced from Gui/Command.cpp and used by Path.Area commands.