diff --git a/src/Mod/Path/Gui/DlgSettingsPathColor.ui b/src/Mod/Path/Gui/DlgSettingsPathColor.ui index c549b2d2e1..a43fc80a68 100644 --- a/src/Mod/Path/Gui/DlgSettingsPathColor.ui +++ b/src/Mod/Path/Gui/DlgSettingsPathColor.ui @@ -23,6 +23,41 @@ Default Path colors + + + + The default line thickness for new shapes + + + px + + + 9 + + + 1 + + + DefaultPathLineWidth + + + Mod/Path + + + + + + + + 182 + 0 + + + + Path highlight color + + + @@ -36,6 +71,39 @@ + + + + The default line color for new shapes + + + + 255 + 255 + 255 + + + + DefaultBBoxNormalColor + + + Mod/Path + + + + + + + + 182 + 0 + + + + Bounding box normal color + + + @@ -56,8 +124,28 @@ - - + + + + The default line color for new shapes + + + + 170 + 0 + 0 + + + + DefaultRapidPathColor + + + Mod/Path + + + + + 182 @@ -65,32 +153,56 @@ - Default pathline width + Probe path color - - + + + + + 182 + 0 + + + + Rapid path color + + + + + - The default line thickness for new shapes + The default line color for new shapes - - px - - - 9 - - - 1 + + + 255 + 125 + 0 + - DefaultPathLineWidth + DefaultHighlightPathColor Mod/Path + + + + + 182 + 0 + + + + Bounding box selection color + + + @@ -124,8 +236,8 @@ - - + + 182 @@ -133,40 +245,7 @@ - Rapid path color - - - - - - - The default line color for new shapes - - - - 170 - 0 - 0 - - - - DefaultRapidPathColor - - - Mod/Path - - - - - - - - 182 - 0 - - - - Probe Path color + Default pathline width @@ -190,103 +269,7 @@ - - - - Machine extents color - - - - - - - DefaultExtentsColor - - - Mod/Path - - - - - - - - 182 - 0 - - - - Path Highlight Color - - - - - - - The default line color for new shapes - - - - 255 - 125 - 0 - - - - DefaultHighlightPathColor - - - Mod/Path - - - - - - - - 182 - 0 - - - - Bounding Box Normal Color - - - - - - The default line color for new shapes - - - - 255 - 255 - 255 - - - - DefaultBBoxNormalColor - - - Mod/Path - - - - - - - - 182 - 0 - - - - Bounding Box Selection Color - - - - The default line color for new shapes @@ -307,39 +290,8 @@ - label_6 - DefaultNormalPathColor - label_9 - DefaultPathLineWidth - label_10 - DefaultPathMarkerColor - label_7 - DefaultRapidPathColor - label - DefaultExtentsColor - label_8 - DefaultProbePathColor - label_11 - DefaultHighlightPathColor - label_13 - DefaultBBoxNormalColor - label_14 - DefaultBBoxSelectionColor - - - - Qt::Horizontal - - - - 7 - 220 - - - - @@ -449,6 +401,19 @@ + + + + Qt::Horizontal + + + + 7 + 220 + + + + diff --git a/src/Mod/Path/Gui/Resources/panels/PageOpPocketExtEdit.ui b/src/Mod/Path/Gui/Resources/panels/PageOpPocketExtEdit.ui index 8d9e7331c5..edfde2d390 100644 --- a/src/Mod/Path/Gui/Resources/panels/PageOpPocketExtEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/PageOpPocketExtEdit.ui @@ -62,7 +62,7 @@ - Extend the corner between two edges of a pocket. If selected adjacent edges are combined + Extend the corner between two edges of a pocket. Selected adjacent edges are combined. Extend Corners diff --git a/src/Mod/Path/Gui/Resources/panels/PathEdit.ui b/src/Mod/Path/Gui/Resources/panels/PathEdit.ui index 25b51edaeb..968dca7e82 100644 --- a/src/Mod/Path/Gui/Resources/panels/PathEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/PathEdit.ui @@ -139,7 +139,7 @@ Enter a path and optionally file name (see below) to be used as the default for the post processor export. -The following substitutions are performed before the name is resolved at the time of the post-processing: +The following substitutions are performed before the name is resolved at the time of the post processing: Substitution allows the following: %D ... directory of the active document %d ... name of the active document (with extension) @@ -397,7 +397,7 @@ FreeCAD has no knowledge of where a particular coordinate system exists within t If multiple coordinate systems are in use, setting this to TRUE will cause the gcode to be written to multiple output files as controlled by the 'order by' property. For example, if ordering by Fixture, the first output file will be for the first fixture and separate file for the second. - <html><head/><body><p>If True, post-processing will create multiple output files based on the <span style=" font-style:italic;">order by</span> setting. + <html><head/><body><p>If True, post processing will create multiple output files based on the <span style=" font-style:italic;">order by</span> setting. For example, if <span style=" font-style:italic;">order by</span> is set to Tool, the first output file will contain the first tool change and all operations, in all coordinate systems, that can be done with that tool before the next tool change is called. diff --git a/src/Mod/Path/Gui/Resources/preferences/Advanced.ui b/src/Mod/Path/Gui/Resources/preferences/Advanced.ui index 707889fdcd..ffd8d2ea74 100644 --- a/src/Mod/Path/Gui/Resources/preferences/Advanced.ui +++ b/src/Mod/Path/Gui/Resources/preferences/Advanced.ui @@ -6,7 +6,7 @@ 0 0 - 512 + 487 691 @@ -64,7 +64,7 @@ Suppress warning whenever a Path selection mode is activated - Suppress Velocity warning + Suppress feed rate warning false @@ -102,43 +102,23 @@ - + 0 0 - Open CAMlib + OpenCAMLib - - - - 0 - 0 - + + + If OpenCAMLib is installed with Python bindings it can be used by some additional 3D operations. NOTE: Enabling OpenCAMLib here requires a restart of FreeCAD to take effect. - - Qt::ScrollBarAlwaysOff - - - Qt::ScrollBarAlwaysOff - - - QAbstractScrollArea::AdjustToContents - - + true - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'DejaVu Sans'; font-size:12pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans'; font-size:16pt;">If openCAMlib is installed with its python interface it can be used by some additional 3d operations.</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans'; font-size:16pt;">Changing this value requires a restart of FreeCAD to take effect.</span></p></body></html> - diff --git a/src/Mod/Path/Gui/Resources/preferences/PathJob.ui b/src/Mod/Path/Gui/Resources/preferences/PathJob.ui index 600af530d5..86f5d8c5e0 100644 --- a/src/Mod/Path/Gui/Resources/preferences/PathJob.ui +++ b/src/Mod/Path/Gui/Resources/preferences/PathJob.ui @@ -185,8 +185,8 @@ If left empty no template will be preselected. - Enter a path and optionally file name (see below) to be used as the default for the post-processor export. -The following substitutions are performed before the name is resolved at the time of the post-processing: + Enter a path and optionally file name (see below) to be used as the default for the post processor export. +The following substitutions are performed before the name is resolved at the time of the post processing: Substitution allows the following: %D ... directory of the active document %d ... name of the active document (with extension) diff --git a/src/Mod/Path/Path/Main/Gui/Inspect.py b/src/Mod/Path/Path/Main/Gui/Inspect.py index 5074c7807a..3648674744 100644 --- a/src/Mod/Path/Path/Main/Gui/Inspect.py +++ b/src/Mod/Path/Path/Main/Gui/Inspect.py @@ -140,7 +140,7 @@ class GCodeEditorDialog(QtGui.QDialog): lab.setText( translate( "Path_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.", + "Note: This dialog shows Path Commands in FreeCAD base units (mm/s). \n Values will be converted to the desired unit during post processing.", ) ) lab.setWordWrap(True) diff --git a/src/Mod/Path/Path/Main/Job.py b/src/Mod/Path/Path/Main/Job.py index 16731669d1..ff1acd87f4 100644 --- a/src/Mod/Path/Path/Main/Job.py +++ b/src/Mod/Path/Path/Main/Job.py @@ -133,14 +133,14 @@ class ObjectJob: "App::PropertyString", "LastPostProcessDate", "Output", - QT_TRANSLATE_NOOP("App::Property", "Last Time the Job was post-processed"), + QT_TRANSLATE_NOOP("App::Property", "Last Time the Job was post processed"), ) obj.setEditorMode("LastPostProcessDate", 2) # Hide obj.addProperty( "App::PropertyString", "LastPostProcessOutput", "Output", - QT_TRANSLATE_NOOP("App::Property", "Last Time the Job was post-processed"), + QT_TRANSLATE_NOOP("App::Property", "Last Time the Job was post processed"), ) obj.setEditorMode("LastPostProcessOutput", 2) # Hide