From 5b1cbd7b60f34c5f036271169854b64f533717aa Mon Sep 17 00:00:00 2001 From: Chris Hennes Date: Mon, 28 Mar 2022 10:02:39 -0500 Subject: [PATCH] Path: PR4556 Step 2: remove native=true --- .../Path/Gui/Resources/panels/DlgJobCreate.ui | 2 +- .../Path/Gui/Resources/panels/DlgToolEdit.ui | 2 +- .../Resources/panels/DressupPathBoundary.ui | 2 +- .../Gui/Resources/panels/HoldingTagsEdit.ui | 4 ++-- .../Resources/panels/PageBaseLocationEdit.ui | 2 +- .../Gui/Resources/panels/PageOpDeburrEdit.ui | 4 ++-- .../Resources/panels/PageOpDrillingEdit.ui | 2 +- .../Gui/Resources/panels/PageOpEngraveEdit.ui | 2 +- .../Gui/Resources/panels/PageOpHelixEdit.ui | 2 +- .../Resources/panels/PageOpPocketExtEdit.ui | 6 +++--- .../Resources/panels/PageOpPocketFullEdit.ui | 6 +++--- .../Resources/panels/PageOpProfileFullEdit.ui | 4 ++-- .../Gui/Resources/panels/PageOpSurfaceEdit.ui | 6 +++--- .../Gui/Resources/panels/PageOpVcarveEdit.ui | 2 +- .../Resources/panels/PageOpWaterlineEdit.ui | 2 +- src/Mod/Path/Gui/Resources/panels/PathEdit.ui | 20 +++++++++---------- .../Path/Gui/Resources/panels/PointEdit.ui | 2 +- .../Path/Gui/Resources/panels/PropertyBag.ui | 2 +- .../Resources/panels/ToolBitLibraryEdit.ui | 2 +- .../Gui/Resources/panels/ToolBitSelector.ui | 2 +- .../Path/Gui/Resources/panels/ToolEditor.ui | 2 +- .../Gui/Resources/preferences/Advanced.ui | 10 +++++----- .../Path/Gui/Resources/preferences/PathJob.ui | 10 +++++----- 23 files changed, 49 insertions(+), 49 deletions(-) diff --git a/src/Mod/Path/Gui/Resources/panels/DlgJobCreate.ui b/src/Mod/Path/Gui/Resources/panels/DlgJobCreate.ui index c8802bb6ac..3aa3512f2c 100644 --- a/src/Mod/Path/Gui/Resources/panels/DlgJobCreate.ui +++ b/src/Mod/Path/Gui/Resources/panels/DlgJobCreate.ui @@ -15,7 +15,7 @@ - + diff --git a/src/Mod/Path/Gui/Resources/panels/DlgToolEdit.ui b/src/Mod/Path/Gui/Resources/panels/DlgToolEdit.ui index ac0eae95c2..31fee3ce64 100644 --- a/src/Mod/Path/Gui/Resources/panels/DlgToolEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/DlgToolEdit.ui @@ -15,7 +15,7 @@ - + diff --git a/src/Mod/Path/Gui/Resources/panels/DressupPathBoundary.ui b/src/Mod/Path/Gui/Resources/panels/DressupPathBoundary.ui index afb57b95c1..203eed64e7 100644 --- a/src/Mod/Path/Gui/Resources/panels/DressupPathBoundary.ui +++ b/src/Mod/Path/Gui/Resources/panels/DressupPathBoundary.ui @@ -24,7 +24,7 @@ 0 - + diff --git a/src/Mod/Path/Gui/Resources/panels/HoldingTagsEdit.ui b/src/Mod/Path/Gui/Resources/panels/HoldingTagsEdit.ui index e70f85dc40..27a2ca8ca2 100644 --- a/src/Mod/Path/Gui/Resources/panels/HoldingTagsEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/HoldingTagsEdit.ui @@ -15,7 +15,7 @@ - + 0 @@ -61,7 +61,7 @@ - + QFormLayout::AllNonFixedFieldsGrow diff --git a/src/Mod/Path/Gui/Resources/panels/PageBaseLocationEdit.ui b/src/Mod/Path/Gui/Resources/panels/PageBaseLocationEdit.ui index 7b944b3a5d..9130644540 100644 --- a/src/Mod/Path/Gui/Resources/panels/PageBaseLocationEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/PageBaseLocationEdit.ui @@ -32,7 +32,7 @@ - + diff --git a/src/Mod/Path/Gui/Resources/panels/PageOpDeburrEdit.ui b/src/Mod/Path/Gui/Resources/panels/PageOpDeburrEdit.ui index 9cea10b7ef..5e05f83cbe 100644 --- a/src/Mod/Path/Gui/Resources/panels/PageOpDeburrEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/PageOpDeburrEdit.ui @@ -160,7 +160,7 @@ - + 125 @@ -353,7 +353,7 @@ - + diff --git a/src/Mod/Path/Gui/Resources/panels/PageOpDrillingEdit.ui b/src/Mod/Path/Gui/Resources/panels/PageOpDrillingEdit.ui index daf7d1f3c1..5103b81c39 100644 --- a/src/Mod/Path/Gui/Resources/panels/PageOpDrillingEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/PageOpDrillingEdit.ui @@ -61,7 +61,7 @@ - + diff --git a/src/Mod/Path/Gui/Resources/panels/PageOpEngraveEdit.ui b/src/Mod/Path/Gui/Resources/panels/PageOpEngraveEdit.ui index 28ca2833de..b160aa973e 100644 --- a/src/Mod/Path/Gui/Resources/panels/PageOpEngraveEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/PageOpEngraveEdit.ui @@ -55,7 +55,7 @@ - + diff --git a/src/Mod/Path/Gui/Resources/panels/PageOpHelixEdit.ui b/src/Mod/Path/Gui/Resources/panels/PageOpHelixEdit.ui index 52e5468f8f..9e32794f90 100644 --- a/src/Mod/Path/Gui/Resources/panels/PageOpHelixEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/PageOpHelixEdit.ui @@ -68,7 +68,7 @@ - + diff --git a/src/Mod/Path/Gui/Resources/panels/PageOpPocketExtEdit.ui b/src/Mod/Path/Gui/Resources/panels/PageOpPocketExtEdit.ui index 5076d0db7e..0feaa657ee 100644 --- a/src/Mod/Path/Gui/Resources/panels/PageOpPocketExtEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/PageOpPocketExtEdit.ui @@ -32,7 +32,7 @@ - + 0 @@ -47,7 +47,7 @@ 0 - + @@ -118,7 +118,7 @@ - + diff --git a/src/Mod/Path/Gui/Resources/panels/PageOpPocketFullEdit.ui b/src/Mod/Path/Gui/Resources/panels/PageOpPocketFullEdit.ui index df014a5d7b..38962afb60 100644 --- a/src/Mod/Path/Gui/Resources/panels/PageOpPocketFullEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/PageOpPocketFullEdit.ui @@ -55,7 +55,7 @@ - + @@ -75,7 +75,7 @@ - + QFormLayout::AllNonFixedFieldsGrow @@ -214,7 +214,7 @@ - + diff --git a/src/Mod/Path/Gui/Resources/panels/PageOpProfileFullEdit.ui b/src/Mod/Path/Gui/Resources/panels/PageOpProfileFullEdit.ui index 3f8dc294cb..0449e795e8 100644 --- a/src/Mod/Path/Gui/Resources/panels/PageOpProfileFullEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/PageOpProfileFullEdit.ui @@ -55,7 +55,7 @@ - + @@ -119,7 +119,7 @@ - + diff --git a/src/Mod/Path/Gui/Resources/panels/PageOpSurfaceEdit.ui b/src/Mod/Path/Gui/Resources/panels/PageOpSurfaceEdit.ui index 0fd348c8eb..a0e7a70165 100644 --- a/src/Mod/Path/Gui/Resources/panels/PageOpSurfaceEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/PageOpSurfaceEdit.ui @@ -55,7 +55,7 @@ - + @@ -82,7 +82,7 @@ - <html><head/><body><p>Additional offset to the selected bounding box along the X axis."</p></body></html> + <html><head/><body><p>Additional offset to the selected bounding box along the X axis."</p></body></html> mm @@ -92,7 +92,7 @@ - <html><head/><body><p>Additional offset to the selected bounding box along the Y axis."</p></body></html> + <html><head/><body><p>Additional offset to the selected bounding box along the Y axis."</p></body></html> mm diff --git a/src/Mod/Path/Gui/Resources/panels/PageOpVcarveEdit.ui b/src/Mod/Path/Gui/Resources/panels/PageOpVcarveEdit.ui index eb09dd2b9d..4648cd89c8 100644 --- a/src/Mod/Path/Gui/Resources/panels/PageOpVcarveEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/PageOpVcarveEdit.ui @@ -55,7 +55,7 @@ - + diff --git a/src/Mod/Path/Gui/Resources/panels/PageOpWaterlineEdit.ui b/src/Mod/Path/Gui/Resources/panels/PageOpWaterlineEdit.ui index 72de5243b4..37f6d4b1b3 100644 --- a/src/Mod/Path/Gui/Resources/panels/PageOpWaterlineEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/PageOpWaterlineEdit.ui @@ -51,7 +51,7 @@ - + diff --git a/src/Mod/Path/Gui/Resources/panels/PathEdit.ui b/src/Mod/Path/Gui/Resources/panels/PathEdit.ui index 2c89348654..380db3eba7 100644 --- a/src/Mod/Path/Gui/Resources/panels/PathEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/PathEdit.ui @@ -65,7 +65,7 @@ - + @@ -236,7 +236,7 @@ - <html><head/><body><p><span style=" font-style:italic;">Work Coordinate Systems</span> also called <span style=" font-style:italic;">Work Offsets</span>, <span style=" font-style:italic;">Fixture Offsets</span>, or <span style=" font-style:italic;">Fixtures </span>are useful for building efficient production jobs where the same part is done many times on the machine.</p><p>FreeCAD has no knowledge of where a particular coordinate system exists within the machine coordinate system so adding additional coordinate systems to your job will have no visual change within your job. It will, however, change your gcode output. The exact way in which the output is affected is controlled by the 'order by' setting.</p></body></html> + <html><head/><body><p><span style=" font-style:italic;">Work Coordinate Systems</span> also called <span style=" font-style:italic;">Work Offsets</span>, <span style=" font-style:italic;">Fixture Offsets</span>, or <span style=" font-style:italic;">Fixtures </span>are useful for building efficient production jobs where the same part is done many times on the machine.</p><p>FreeCAD has no knowledge of where a particular coordinate system exists within the machine coordinate system so adding additional coordinate systems to your job will have no visual change within your job. It will, however, change your gcode output. The exact way in which the output is affected is controlled by the 'order by' setting.</p></body></html> QListView::Adjust @@ -389,7 +389,7 @@ <html><head/><body><p>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.</p><p><br/></p><p><br/></p></body></html> - <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.</p><p><br/></p><p>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.</p><p><br/></p><p>If <span style=" font-style:italic;">order by</span> is set to <span style=" font-style:italic;">operation</span> and <span style=" font-style:italic;">split output</span> is true, each operation will be written to a separate file.</p></body></html> + <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.</p><p><br/></p><p>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.</p><p><br/></p><p>If <span style=" font-style:italic;">order by</span> is set to <span style=" font-style:italic;">operation</span> and <span style=" font-style:italic;">split output</span> is true, each operation will be written to a separate file.</p></body></html> Split Output @@ -434,7 +434,7 @@ 0 - + @@ -878,7 +878,7 @@ - + 0 @@ -1228,7 +1228,7 @@ - + @@ -1355,7 +1355,7 @@ - + QFormLayout::AllNonFixedFieldsGrow @@ -1374,7 +1374,7 @@ - + @@ -1384,7 +1384,7 @@ - + 0 @@ -1453,7 +1453,7 @@ - + diff --git a/src/Mod/Path/Gui/Resources/panels/PointEdit.ui b/src/Mod/Path/Gui/Resources/panels/PointEdit.ui index 56fb47bc10..34df7f0993 100644 --- a/src/Mod/Path/Gui/Resources/panels/PointEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/PointEdit.ui @@ -15,7 +15,7 @@ - + diff --git a/src/Mod/Path/Gui/Resources/panels/PropertyBag.ui b/src/Mod/Path/Gui/Resources/panels/PropertyBag.ui index ac9af5c8d5..a4cd0d9d0e 100644 --- a/src/Mod/Path/Gui/Resources/panels/PropertyBag.ui +++ b/src/Mod/Path/Gui/Resources/panels/PropertyBag.ui @@ -34,7 +34,7 @@ - + 0 diff --git a/src/Mod/Path/Gui/Resources/panels/ToolBitLibraryEdit.ui b/src/Mod/Path/Gui/Resources/panels/ToolBitLibraryEdit.ui index 805f7a3e3d..b0c7e6ba1e 100644 --- a/src/Mod/Path/Gui/Resources/panels/ToolBitLibraryEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/ToolBitLibraryEdit.ui @@ -83,7 +83,7 @@ - + diff --git a/src/Mod/Path/Gui/Resources/panels/ToolBitSelector.ui b/src/Mod/Path/Gui/Resources/panels/ToolBitSelector.ui index 8def8f45d3..bea27ac51d 100644 --- a/src/Mod/Path/Gui/Resources/panels/ToolBitSelector.ui +++ b/src/Mod/Path/Gui/Resources/panels/ToolBitSelector.ui @@ -22,7 +22,7 @@ - + diff --git a/src/Mod/Path/Gui/Resources/panels/ToolEditor.ui b/src/Mod/Path/Gui/Resources/panels/ToolEditor.ui index 51a107b37f..c2d167f8d6 100644 --- a/src/Mod/Path/Gui/Resources/panels/ToolEditor.ui +++ b/src/Mod/Path/Gui/Resources/panels/ToolEditor.ui @@ -185,7 +185,7 @@ - + QFormLayout::ExpandingFieldsGrow diff --git a/src/Mod/Path/Gui/Resources/preferences/Advanced.ui b/src/Mod/Path/Gui/Resources/preferences/Advanced.ui index 4b0f503f9d..707889fdcd 100644 --- a/src/Mod/Path/Gui/Resources/preferences/Advanced.ui +++ b/src/Mod/Path/Gui/Resources/preferences/Advanced.ui @@ -132,12 +132,12 @@ 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"> + <!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> +</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 a97cc76815..78be5ed973 100644 --- a/src/Mod/Path/Gui/Resources/preferences/PathJob.ui +++ b/src/Mod/Path/Gui/Resources/preferences/PathJob.ui @@ -90,7 +90,7 @@ - + @@ -166,7 +166,7 @@ QFormLayout::AllNonFixedFieldsGrow - + @@ -179,7 +179,7 @@ - + 0 @@ -205,7 +205,7 @@ - + @@ -218,7 +218,7 @@ - +