kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Change command names and icons

Browse Source
This commit is contained in:
Brad Collette
2024-02-25 17:10:16 -07:00
committed by sliptonic
parent ef88b8986f
commit 460d7e611a
111 changed files with 618 additions and 620 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/Mod/Path/Gui/Command.cpp
View File

@@ -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)

80
src/Mod/Path/Gui/Resources/Path.qrc
View File

@@ -1,12 +1,12 @@
<RCC>
<qresource>
<file>icons/Path_Adaptive.svg</file>
<file>icons/CAM_Adaptive.svg</file>
<file>icons/Path_3DPocket.svg</file>
<file>icons/Path_3DSurface.svg</file>
<file>icons/Path_Area_View.svg</file>
<file>icons/Path_Area_Workplane.svg</file>
<file>icons/Path_Area.svg</file>
<file>icons/Path_Array.svg</file>
<file>icons/CAM_Area_View.svg</file>
<file>icons/CAM_Area_Workplane.svg</file>
<file>icons/CAM_Area.svg</file>
<file>icons/CAM_Array.svg</file>
<file>icons/Path_Axis.svg</file>
<file>icons/Path_BFastForward.svg</file>
<file>icons/Path_BPause.svg</file>
@@ -14,61 +14,61 @@
<file>icons/Path_BStep.svg</file>
<file>icons/Path_BStop.svg</file>
<file>icons/Path_BaseGeometry.svg</file>
<file>icons/Path_Camotics.svg</file>
<file>icons/Path_Comment.svg</file>
<file>icons/Path_Compound.svg</file>
<file>icons/CAM_Camotics.svg</file>
<file>icons/CAM_Comment.svg</file>
<file>icons/CAM_Compound.svg</file>
<file>icons/Path_Contour.svg</file>
<file>icons/Path_Copy.svg</file>
<file>icons/Path_Custom.svg</file>
<file>icons/CAM_Custom.svg</file>
<file>icons/Path_Datums.svg</file>
<file>icons/Path_Deburr.svg</file>
<file>icons/CAM_Deburr.svg</file>
<file>icons/Path_Depths.svg</file>
<file>icons/Path_Dressup.svg</file>
<file>icons/Path_Drilling.svg</file>
<file>icons/Path_Engrave.svg</file>
<file>icons/Path_ExportTemplate.svg</file>
<file>icons/CAM_Dressup.svg</file>
<file>icons/CAM_Drilling.svg</file>
<file>icons/CAM_Engrave.svg</file>
<file>icons/CAM_ExportTemplate.svg</file>
<file>icons/Path_Face.svg</file>
<file>icons/Path_FacePocket.svg</file>
<file>icons/Path_FaceProfile.svg</file>
<file>icons/Path_Heights.svg</file>
<file>icons/Path_Helix.svg</file>
<file>icons/CAM_Helix.svg</file>
<file>icons/Path_Hop.svg</file>
<file>icons/Path_Inspect.svg</file>
<file>icons/Path_Job.svg</file>
<file>icons/CAM_Inspect.svg</file>
<file>icons/CAM_Job.svg</file>
<file>icons/Path_Kurve.svg</file>
<file>icons/Path_LengthOffset.svg</file>
<file>icons/Path_Machine.svg</file>
<file>icons/Path_MachineLathe.svg</file>
<file>icons/Path_MachineMill.svg</file>
<file>icons/Path_OpActive.svg</file>
<file>icons/Path_OpCopy.svg</file>
<file>icons/CAM_OpActive.svg</file>
<file>icons/CAM_OpCopy.svg</file>
<file>icons/Path_OperationA.svg</file>
<file>icons/Path_OperationB.svg</file>
<file>icons/Path_Plane.svg</file>
<file>icons/Path_Pocket.svg</file>
<file>icons/Path_Post.svg</file>
<file>icons/Path_Probe.svg</file>
<file>icons/Path_Profile_Edges.svg</file>
<file>icons/Path_Profile_Face.svg</file>
<file>icons/Path_Profile.svg</file>
<file>icons/Path_Sanity.svg</file>
<file>icons/Path_SelectLoop.svg</file>
<file>icons/CAM_Pocket.svg</file>
<file>icons/CAM_Post.svg</file>
<file>icons/CAM_Probe.svg</file>
<file>icons/CAM_Profile_Edges.svg</file>
<file>icons/CAM_Profile_Face.svg</file>
<file>icons/CAM_Profile.svg</file>
<file>icons/CAM_Sanity.svg</file>
<file>icons/CAM_SelectLoop.svg</file>
<file>icons/Path_SetupSheet.svg</file>
<file>icons/Path_Shape.svg</file>
<file>icons/Path_SimpleCopy.svg</file>
<file>icons/Path_Simulator.svg</file>
<file>icons/Path_Slot.svg</file>
<file>icons/CAM_Shape.svg</file>
<file>icons/CAM_SimpleCopy.svg</file>
<file>icons/CAM_Simulator.svg</file>
<file>icons/CAM_Slot.svg</file>
<file>icons/Path_Speed.svg</file>
<file>icons/Path_Stock.svg</file>
<file>icons/Path_Stop.svg</file>
<file>icons/Path_ThreadMilling.svg</file>
<file>icons/Path_ToolBit.svg</file>
<file>icons/Path_ToolChange.svg</file>
<file>icons/Path_ToolController.svg</file>
<file>icons/Path_ToolDuplicate.svg</file>
<file>icons/Path_Toolpath.svg</file>
<file>icons/Path_ToolTable.svg</file>
<file>icons/Path_Vcarve.svg</file>
<file>icons/CAM_Stop.svg</file>
<file>icons/CAM_ThreadMilling.svg</file>
<file>icons/CAM_ToolBit.svg</file>
<file>icons/CAM_ToolChange.svg</file>
<file>icons/CAM_ToolController.svg</file>
<file>icons/CAM_ToolDuplicate.svg</file>
<file>icons/CAM_Toolpath.svg</file>
<file>icons/CAM_ToolTable.svg</file>
<file>icons/CAM_Vcarve.svg</file>
<file>icons/Path_Waterline.svg</file>
<file>icons/arrow-ccw.svg</file>
<file>icons/arrow-cw.svg</file>

2
src/Mod/Path/Gui/Resources/icons/Path_Adaptive.svg → src/Mod/Path/Gui/Resources/icons/CAM_Adaptive.svg
View File

@@ -15,7 +15,7 @@
id="svg2816"
version="1.1"
inkscape:version="0.91 r13725"
sodipodi:docname="Path_Adaptive.svg">
sodipodi:docname="CAM_Adaptive.svg">
<defs
id="defs2818">
<linearGradient
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 22 KiB

0
src/Mod/Path/Gui/Resources/icons/Path_Area.svg → src/Mod/Path/Gui/Resources/icons/CAM_Area.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 22 KiB

0
src/Mod/Path/Gui/Resources/icons/Path_Area_View.svg → src/Mod/Path/Gui/Resources/icons/CAM_Area_View.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 24 KiB

0
src/Mod/Path/Gui/Resources/icons/Path_Area_Workplane.svg → src/Mod/Path/Gui/Resources/icons/CAM_Area_Workplane.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 23 KiB

6
src/Mod/Path/Gui/Resources/icons/Path_Array.svg → src/Mod/Path/Gui/Resources/icons/CAM_Array.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 21 KiB

6
src/Mod/Path/Gui/Resources/icons/Path_Camotics.svg → src/Mod/Path/Gui/Resources/icons/CAM_Camotics.svg
View File

@@ -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 @@
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
<dc:title>Path_Drilling</dc:title>
<dc:title>CAM_Camotics</dc:title>
<dc:date>2015-07-04</dc:date>
<dc:relation>https://www.freecad.org/wiki/index.php?title=Artwork</dc:relation>
<dc:publisher>
@@ -584,7 +584,7 @@
<dc:title>FreeCAD</dc:title>
</cc:Agent>
</dc:publisher>
<dc:identifier>FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_Drilling.svg</dc:identifier>
<dc:identifier>FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Camotics.svg</dc:identifier>
<dc:rights>
<cc:Agent>
<dc:title>FreeCAD LGPL2+</dc:title>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 21 KiB

6
src/Mod/Path/Gui/Resources/icons/Path_Comment.svg → src/Mod/Path/Gui/Resources/icons/CAM_Comment.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

6
src/Mod/Path/Gui/Resources/icons/Path_Compound.svg → src/Mod/Path/Gui/Resources/icons/CAM_Compound.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 29 KiB

6
src/Mod/Path/Gui/Resources/icons/Path_Custom.svg → src/Mod/Path/Gui/Resources/icons/CAM_Custom.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 25 KiB

6
src/Mod/Path/Gui/Resources/icons/Path_Deburr.svg → src/Mod/Path/Gui/Resources/icons/CAM_Deburr.svg
View File

@@ -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">
<defs
id="defs2818">
<linearGradient
@@ -596,7 +596,7 @@
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
<dc:title>Path_Drilling</dc:title>
<dc:title>CAM_Deburr</dc:title>
<dc:date>2015-07-04</dc:date>
<dc:relation>https://www.freecad.org/wiki/index.php?title=Artwork</dc:relation>
<dc:publisher>
@@ -604,7 +604,7 @@
<dc:title>FreeCAD</dc:title>
</cc:Agent>
</dc:publisher>
<dc:identifier>FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_Drilling.svg</dc:identifier>
<dc:identifier>FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Deburr.svg</dc:identifier>
<dc:rights>
<cc:Agent>
<dc:title>FreeCAD LGPL2+</dc:title>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 23 KiB

6
src/Mod/Path/Gui/Resources/icons/Path_Dressup.svg → src/Mod/Path/Gui/Resources/icons/CAM_Dressup.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 24 KiB

6
src/Mod/Path/Gui/Resources/icons/Path_Drilling.svg → src/Mod/Path/Gui/Resources/icons/CAM_Drilling.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB

6
src/Mod/Path/Gui/Resources/icons/Path_Engrave.svg → src/Mod/Path/Gui/Resources/icons/CAM_Engrave.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB

6
src/Mod/Path/Gui/Resources/icons/Path_ExportTemplate.svg → src/Mod/Path/Gui/Resources/icons/CAM_ExportTemplate.svg
View File

@@ -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">
<defs
id="defs2818">
<linearGradient
@@ -1081,7 +1081,7 @@
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
<dc:title>Path_Job</dc:title>
<dc:title>CAM_ExportTemplate</dc:title>
<dc:date>2016-06-27</dc:date>
<dc:relation>https://www.freecad.org/wiki/index.php?title=Artwork</dc:relation>
<dc:publisher>
@@ -1089,7 +1089,7 @@
<dc:title>FreeCAD</dc:title>
</cc:Agent>
</dc:publisher>
<dc:identifier>FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_Job.svg</dc:identifier>
<dc:identifier>FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_ExportTemplate.svg</dc:identifier>
<dc:rights>
<cc:Agent>
<dc:title>FreeCAD LGPL2+</dc:title>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 38 KiB

After

Width:  |  Height:  |  Size: 38 KiB

6
src/Mod/Path/Gui/Resources/icons/Path_Helix.svg → src/Mod/Path/Gui/Resources/icons/CAM_Helix.svg
View File

@@ -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 @@
<dc:title>[Lorenz Hüdepohl]</dc:title>
</cc:Agent>
</dc:creator>
<dc:title>Path_Helix</dc:title>
<dc:title>CAM_Helix</dc:title>
<dc:date>2016-05-10</dc:date>
<dc:relation>https://www.freecad.org/wiki/index.php?title=Artwork</dc:relation>
<dc:publisher>
@@ -1407,7 +1407,7 @@
<dc:title>FreeCAD</dc:title>
</cc:Agent>
</dc:publisher>
<dc:identifier>FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_Helix.svg</dc:identifier>
<dc:identifier>FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Helix.svg</dc:identifier>
<dc:rights>
<cc:Agent>
<dc:title>FreeCAD LGPL2+</dc:title>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 48 KiB

After

Width:  |  Height:  |  Size: 48 KiB

0
src/Mod/Path/Gui/Resources/icons/Path_InactiveOp.svg → src/Mod/Path/Gui/Resources/icons/CAM_InactiveOp.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

6
src/Mod/Path/Gui/Resources/icons/Path_Inspect.svg → src/Mod/Path/Gui/Resources/icons/CAM_Inspect.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 32 KiB

6
src/Mod/Path/Gui/Resources/icons/Path_Job.svg → src/Mod/Path/Gui/Resources/icons/CAM_Job.svg
View File

@@ -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">
<defs
id="defs2818">
<linearGradient
@@ -1121,7 +1121,7 @@
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
<dc:title>Path_Job</dc:title>
<dc:title>CAM_Job</dc:title>
<dc:date>2016-06-27</dc:date>
<dc:relation>https://www.freecad.org/wiki/index.php?title=Artwork</dc:relation>
<dc:publisher>
@@ -1129,7 +1129,7 @@
<dc:title>FreeCAD</dc:title>
</cc:Agent>
</dc:publisher>
<dc:identifier>FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_Job.svg</dc:identifier>
<dc:identifier>FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Job.svg</dc:identifier>
<dc:rights>
<cc:Agent>
<dc:title>FreeCAD LGPL2+</dc:title>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 40 KiB

After

Width:  |  Height:  |  Size: 40 KiB

2
src/Mod/Path/Gui/Resources/icons/Path_OpActive.svg → src/Mod/Path/Gui/Resources/icons/CAM_OpActive.svg
View File

@@ -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">
<defs
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

2
src/Mod/Path/Gui/Resources/icons/Path_OpCopy.svg → src/Mod/Path/Gui/Resources/icons/CAM_OpCopy.svg
View File

@@ -15,7 +15,7 @@
id="svg2816"
version="1.1"
inkscape:version="0.91 r13725"
sodipodi:docname="Path_OpCopy.svg">
sodipodi:docname="CAM_OpCopy.svg">
<defs
id="defs2818">
<linearGradient
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 26 KiB

6
src/Mod/Path/Gui/Resources/icons/Path_Pocket.svg → src/Mod/Path/Gui/Resources/icons/CAM_Pocket.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 25 KiB

6
src/Mod/Path/Gui/Resources/icons/Path_Post.svg → src/Mod/Path/Gui/Resources/icons/CAM_Post.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 31 KiB

6
src/Mod/Path/Gui/Resources/icons/Path_Probe.svg → src/Mod/Path/Gui/Resources/icons/CAM_Probe.svg
View File

@@ -15,7 +15,7 @@
id="svg2816"
version="1.1"
inkscape:version="0.91 r13725"
sodipodi:docname="Path_Probe.svg">
sodipodi:docname="CAM_Probe.svg">
<defs
id="defs2818">
<linearGradient
@@ -577,7 +577,7 @@
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
<dc:title>Path_Drilling</dc:title>
<dc:title>CAM_Probe</dc:title>
<dc:date>2015-07-04</dc:date>
<dc:relation>https://www.freecad.org/wiki/index.php?title=Artwork</dc:relation>
<dc:publisher>
@@ -585,7 +585,7 @@
<dc:title>FreeCAD</dc:title>
</cc:Agent>
</dc:publisher>
<dc:identifier>FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_Drilling.svg</dc:identifier>
<dc:identifier>FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Probe.svg</dc:identifier>
<dc:rights>
<cc:Agent>
<dc:title>FreeCAD LGPL2+</dc:title>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 23 KiB

6
src/Mod/Path/Gui/Resources/icons/Path_Profile.svg → src/Mod/Path/Gui/Resources/icons/CAM_Profile.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 27 KiB

After

Width:  |  Height:  |  Size: 27 KiB

6
src/Mod/Path/Gui/Resources/icons/Path_Profile_Edges.svg → src/Mod/Path/Gui/Resources/icons/CAM_Profile_Edges.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 28 KiB

6
src/Mod/Path/Gui/Resources/icons/Path_Profile_Face.svg → src/Mod/Path/Gui/Resources/icons/CAM_Profile_Face.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 27 KiB

After

Width:  |  Height:  |  Size: 27 KiB

6
src/Mod/Path/Gui/Resources/icons/Path_Sanity.svg → src/Mod/Path/Gui/Resources/icons/CAM_Sanity.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 28 KiB

6
src/Mod/Path/Gui/Resources/icons/Path_SelectLoop.svg → src/Mod/Path/Gui/Resources/icons/CAM_SelectLoop.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

6
src/Mod/Path/Gui/Resources/icons/Path_Shape.svg → src/Mod/Path/Gui/Resources/icons/CAM_Shape.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 22 KiB

6
src/Mod/Path/Gui/Resources/icons/Path_SimpleCopy.svg → src/Mod/Path/Gui/Resources/icons/CAM_SimpleCopy.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

2
src/Mod/Path/Gui/Resources/icons/Path_Simulator.svg → src/Mod/Path/Gui/Resources/icons/CAM_Simulator.svg
View File

@@ -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">
<defs
id="defs2818">
<linearGradient
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 51 KiB

After

Width:  |  Height:  |  Size: 51 KiB

6
src/Mod/Path/Gui/Resources/icons/Path_Slot.svg → src/Mod/Path/Gui/Resources/icons/CAM_Slot.svg
View File

@@ -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_Slot.svg"
sodipodi:docname="CAM_Slot.svg"
inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
version="1.1"
id="svg2816"
@@ -624,7 +624,7 @@
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
<dc:title>Path_Drilling</dc:title>
<dc:title>CAM_Slot</dc:title>
<dc:date>2015-07-04</dc:date>
<dc:relation>https://www.freecad.org/wiki/index.php?title=Artwork</dc:relation>
<dc:publisher>
@@ -632,7 +632,7 @@
<dc:title>FreeCAD</dc:title>
</cc:Agent>
</dc:publisher>
<dc:identifier>FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_Drilling.svg</dc:identifier>
<dc:identifier>FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Slot.svg</dc:identifier>
<dc:rights>
<cc:Agent>
<dc:title>FreeCAD LGPL2+</dc:title>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 26 KiB

6
src/Mod/Path/Gui/Resources/icons/Path_Stop.svg → src/Mod/Path/Gui/Resources/icons/CAM_Stop.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

0
src/Mod/Path/Gui/Resources/icons/Path_ThreadMilling.svg → src/Mod/Path/Gui/Resources/icons/CAM_ThreadMilling.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 52 KiB

After

Width:  |  Height:  |  Size: 52 KiB

6
src/Mod/Path/Gui/Resources/icons/Path_ToolBit.svg → src/Mod/Path/Gui/Resources/icons/CAM_ToolBit.svg
View File

@@ -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">
<defs
id="defs2818">
<linearGradient
@@ -866,7 +866,7 @@
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
<dc:title>Path_ToolTable</dc:title>
<dc:title>CAM_ToolTable</dc:title>
<dc:date>2015-07-04</dc:date>
<dc:relation>https://www.freecad.org/wiki/index.php?title=Artwork</dc:relation>
<dc:publisher>
@@ -874,7 +874,7 @@
<dc:title>FreeCAD</dc:title>
</cc:Agent>
</dc:publisher>
<dc:identifier>FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_ToolTable.svg</dc:identifier>
<dc:identifier>FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_ToolTable.svg</dc:identifier>
<dc:rights>
<cc:Agent>
<dc:title>FreeCAD LGPL2+</dc:title>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 29 KiB

6
src/Mod/Path/Gui/Resources/icons/Path_ToolChange.svg → src/Mod/Path/Gui/Resources/icons/CAM_ToolChange.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 24 KiB

0
src/Mod/Path/Gui/Resources/icons/Path_ToolController.svg → src/Mod/Path/Gui/Resources/icons/CAM_ToolController.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB

6
src/Mod/Path/Gui/Resources/icons/Path_ToolDuplicate.svg → src/Mod/Path/Gui/Resources/icons/CAM_ToolDuplicate.svg
View File

@@ -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">
<defs
id="defs2818">
<linearGradient
@@ -737,7 +737,7 @@
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
<dc:title>Path_ToolChange</dc:title>
<dc:title>CAM_ToolChange</dc:title>
<dc:date>2016-01-20</dc:date>
<dc:relation>https://www.freecad.org/wiki/index.php?title=Artwork</dc:relation>
<dc:publisher>
@@ -745,7 +745,7 @@
<dc:title>FreeCAD</dc:title>
</cc:Agent>
</dc:publisher>
<dc:identifier>FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_ToolChange.svg</dc:identifier>
<dc:identifier>FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_ToolChange.svg</dc:identifier>
<dc:rights>
<cc:Agent>
<dc:title>FreeCAD LGPL2+</dc:title>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 29 KiB

6
src/Mod/Path/Gui/Resources/icons/Path_ToolTable.svg → src/Mod/Path/Gui/Resources/icons/CAM_ToolTable.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 29 KiB

6
src/Mod/Path/Gui/Resources/icons/Path_Toolpath.svg → src/Mod/Path/Gui/Resources/icons/CAM_Toolpath.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 21 KiB

6
src/Mod/Path/Gui/Resources/icons/Path_Vcarve.svg → src/Mod/Path/Gui/Resources/icons/CAM_Vcarve.svg
View File

@@ -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">
<defs
id="defs2818">
<linearGradient
@@ -596,7 +596,7 @@
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
<dc:title>Path_Engrave</dc:title>
<dc:title>CAM_Vcarve</dc:title>
<dc:date>2016-02-24</dc:date>
<dc:relation>https://www.freecad.org/wiki/index.php?title=Artwork</dc:relation>
<dc:publisher>
@@ -604,7 +604,7 @@
<dc:title>FreeCAD</dc:title>
</cc:Agent>
</dc:publisher>
<dc:identifier>FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_Engrave.svg</dc:identifier>
<dc:identifier>FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Vcarve.svg</dc:identifier>
<dc:rights>
<cc:Agent>
<dc:title>FreeCAD LGPL2+</dc:title>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 23 KiB

4
src/Mod/Path/Gui/Resources/panels/DressUpLeadInOutEdit.ui
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>Path_DressupLeadInOut</class>
<widget class="QWidget" name="Path_DressupLeadInOut">
<class>CAM_DressupLeadInOut</class>
<widget class="QWidget" name="CAM_DressupLeadInOut">
<property name="geometry">
<rect>
<x>0</x>

4
src/Mod/Path/Gui/Resources/panels/ToolBitLibraryEdit.ui
View File

@@ -36,7 +36,7 @@
</property>
<property name="icon">
<iconset resource="../Path.qrc">
<normaloff>:/icons/Path_ToolBit.svg</normaloff>:/icons/Path_ToolBit.svg</iconset>
<normaloff>:/icons/CAM_ToolBit.svg</normaloff>:/icons/CAM_ToolBit.svg</iconset>
</property>
</widget>
</item>
@@ -56,7 +56,7 @@
</property>
<property name="icon">
<iconset resource="../Path.qrc">
<normaloff>:/icons/Path_ToolDuplicate.svg</normaloff>:/icons/Path_ToolDuplicate.svg</iconset>
<normaloff>:/icons/CAM_ToolDuplicate.svg</normaloff>:/icons/CAM_ToolDuplicate.svg</iconset>
</property>
</widget>
</item>

2
src/Mod/Path/Gui/Resources/panels/ToolBitSelector.ui
View File

@@ -57,7 +57,7 @@
</property>
<property name="icon">
<iconset resource="../Path.qrc">
<normaloff>:/icons/Path_ToolTable.svg</normaloff>:/icons/Path_ToolTable.svg</iconset>
<normaloff>:/icons/CAM_ToolTable.svg</normaloff>:/icons/CAM_ToolTable.svg</iconset>
</property>
<property name="iconSize">
<size>

2
src/Mod/Path/Gui/TaskDlgPathCompound.cpp
View File

@@ -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);

4
src/Mod/Path/Gui/ViewProviderArea.cpp
View File

@@ -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()

2
src/Mod/Path/Gui/ViewProviderPath.cpp
View File

@@ -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 -----------------------------------------------------------------------

2
src/Mod/Path/Gui/ViewProviderPathCompound.cpp
View File

@@ -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 -----------------------------------------------------------------------

2
src/Mod/Path/Gui/ViewProviderPathShape.cpp
View File

@@ -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<App::DocumentObject*> ViewProviderPathShape::claimChildren() const

84
src/Mod/Path/InitGui.py
View File

@@ -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")

6
src/Mod/Path/Path/Base/Gui/PropertyBag.py
View File

@@ -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")

2
src/Mod/Path/Path/Dressup/Boundary.py
View File

@@ -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

14
src/Mod/Path/Path/Dressup/Gui/AxisMap.py
View File

@@ -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")

10
src/Mod/Path/Path/Dressup/Gui/Boundary.py
View File

@@ -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")

12
src/Mod/Path/Path/Dressup/Gui/Dogbone.py
View File

@@ -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")

12
src/Mod/Path/Path/Dressup/Gui/DogboneII.py
View File

@@ -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")

16
src/Mod/Path/Path/Dressup/Gui/Dragknife.py
View File

@@ -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")

26
src/Mod/Path/Path/Dressup/Gui/LeadInOut.py
View File

@@ -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")

32
src/Mod/Path/Path/Dressup/Gui/RampEntry.py
View File

@@ -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")

2
src/Mod/Path/Path/Dressup/Gui/TagPreferences.py
View File

@@ -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(

12
src/Mod/Path/Path/Dressup/Gui/Tags.py
View File

@@ -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")

18
src/Mod/Path/Path/Dressup/Gui/ZCorrect.py
View File

@@ -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")

8
src/Mod/Path/Path/Dressup/Tags.py
View File

@@ -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")

8
src/Mod/Path/Path/Main/Gui/Camotics.py
View File

@@ -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")

6
src/Mod/Path/Path/Main/Gui/Fixture.py
View File

@@ -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")

14
src/Mod/Path/Path/Main/Gui/Inspect.py
View File

@@ -139,7 +139,7 @@ class GCodeEditorDialog(QtGui.QDialog):
lab = QtGui.QLabel()
lab.setText(
translate(
"Path_Inspect",
"CAM_Inspect",
"<b>Note</b>: 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())

28
src/Mod/Path/Path/Main/Gui/Job.py
View File

@@ -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()

16
src/Mod/Path/Path/Main/Gui/JobCmd.py
View File

@@ -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")

14
src/Mod/Path/Path/Main/Gui/JobDlg.py
View File

@@ -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)

128
src/Mod/Path/Path/Main/Gui/Sanity.py
View File

@@ -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:
</tr>
</table>"""
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())

4
src/Mod/Path/Path/Main/Gui/Sanity_Caution.svg
View File

@@ -42,7 +42,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title>Path_Stop</dc:title>
<dc:title>CAM_Sanity_Caution</dc:title>
<dc:date>2015-07-04</dc:date>
<dc:relation>https://www.freecad.org/wiki/index.php?title=Artwork</dc:relation>
<dc:publisher>
@@ -50,7 +50,7 @@
<dc:title>FreeCAD</dc:title>
</cc:Agent>
</dc:publisher>
<dc:identifier>FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_Stop.svg</dc:identifier>
<dc:identifier>FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Sanity_Caution.svg</dc:identifier>
<dc:rights>
<cc:Agent>
<dc:title>FreeCAD LGPL2+</dc:title>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

8
src/Mod/Path/Path/Main/Gui/Simulator.py
View File

@@ -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")

14
src/Mod/Path/Path/Main/Job.py
View File

@@ -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"),
],
}

8
src/Mod/Path/Path/Op/Adaptive.py
View File

@@ -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
}

2
src/Mod/Path/Path/Op/Custom.py
View File

@@ -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"

10
src/Mod/Path/Path/Op/Drilling.py
View File

@@ -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
}

6
src/Mod/Path/Path/Op/Gui/Adaptive.py
View File

@@ -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,
)

10
src/Mod/Path/Path/Op/Gui/Array.py
View File

@@ -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())

6
src/Mod/Path/Path/Op/Gui/Base.py
View File

@@ -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")

10
src/Mod/Path/Path/Op/Gui/Comment.py
View File

@@ -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")

6
src/Mod/Path/Path/Op/Gui/Custom.py
View File

@@ -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,
)

6
src/Mod/Path/Path/Op/Gui/Deburr.py
View File

@@ -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,
)

6
src/Mod/Path/Path/Op/Gui/Drilling.py
View File

@@ -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,

6
src/Mod/Path/Path/Op/Gui/Engrave.py
View File

@@ -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,
)

6
src/Mod/Path/Path/Op/Gui/Helix.py
View File

@@ -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,
)

4
src/Mod/Path/Path/Op/Gui/MillFace.py
View File

@@ -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,
)

4
src/Mod/Path/Path/Op/Gui/Pocket.py
View File

@@ -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,
)

6
src/Mod/Path/Path/Op/Gui/PocketShape.py
View File

@@ -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,
)

10
src/Mod/Path/Path/Op/Gui/Probe.py
View File

@@ -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,
)

12
src/Mod/Path/Path/Op/Gui/SimpleCopy.py
View File

@@ -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())

6
src/Mod/Path/Path/Op/Gui/Slot.py
View File

@@ -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,
)

10
src/Mod/Path/Path/Op/Gui/Stop.py
View File

@@ -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")

6
src/Mod/Path/Path/Op/Gui/ThreadMilling.py
View File

@@ -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,

6
src/Mod/Path/Path/Op/Gui/Vcarve.py
View File

@@ -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,
)

4
src/Mod/Path/Path/Op/Helix.py
View File

@@ -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"),

8
src/Mod/Path/Path/Op/MillFace.py
View File

@@ -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"),
],
}

4
src/Mod/Path/Path/Op/Pocket.py
View File

@@ -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"),
],
}

18
src/Mod/Path/Path/Op/PocketBase.py
View File

@@ -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
}

Some files were not shown because too many files have changed in this diff Show More