diff --git a/src/Mod/Path/Gui/DlgSettingsPathColor.ui b/src/Mod/Path/Gui/DlgSettingsPathColor.ui index 8ade3a7cb3..c549b2d2e1 100644 --- a/src/Mod/Path/Gui/DlgSettingsPathColor.ui +++ b/src/Mod/Path/Gui/DlgSettingsPathColor.ui @@ -23,8 +23,8 @@ Default Path colors - - + + 182 @@ -32,27 +32,7 @@ - Default path marker color - - - - - - - The default line color for new shapes - - - - 255 - 255 - 255 - - - - DefaultBBoxNormalColor - - - Mod/Path + Default normal path color @@ -76,6 +56,54 @@ + + + + + 182 + 0 + + + + Default pathline width + + + + + + + The default line thickness for new shapes + + + px + + + 9 + + + 1 + + + DefaultPathLineWidth + + + Mod/Path + + + + + + + + 182 + 0 + + + + Default path marker color + + + @@ -109,54 +137,6 @@ - - - - The default line thickness for new shapes - - - px - - - 9 - - - 1 - - - DefaultPathLineWidth - - - Mod/Path - - - - - - - - 182 - 0 - - - - Default pathline width - - - - - - - - 182 - 0 - - - - Default normal path color - - - @@ -273,6 +253,26 @@ + + + + The default line color for new shapes + + + + 255 + 255 + 255 + + + + DefaultBBoxNormalColor + + + Mod/Path + + + diff --git a/src/Mod/Path/Gui/Resources/panels/AxisMapEdit.ui b/src/Mod/Path/Gui/Resources/panels/AxisMapEdit.ui index c559ef617c..6607d007f4 100644 --- a/src/Mod/Path/Gui/Resources/panels/AxisMapEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/AxisMapEdit.ui @@ -14,19 +14,6 @@ AxisMap Dressup - - - - Qt::Vertical - - - - 20 - 275 - - - - @@ -91,7 +78,20 @@ - + + + + Qt::Vertical + + + + 20 + 275 + + + + + diff --git a/src/Mod/Path/Gui/Resources/panels/DlgJobTemplateExport.ui b/src/Mod/Path/Gui/Resources/panels/DlgJobTemplateExport.ui index 03a0e2478e..373768eaf4 100644 --- a/src/Mod/Path/Gui/Resources/panels/DlgJobTemplateExport.ui +++ b/src/Mod/Path/Gui/Resources/panels/DlgJobTemplateExport.ui @@ -76,16 +76,6 @@ true - - - - Operation Depths - - - true - - - @@ -99,6 +89,16 @@ + + + + Operation Depths + + + true + + + @@ -112,13 +112,6 @@ - - - - <html><head/><body><p>Enable all Operations for which the configuration values should be exported.</p><p><br/></p><p>Note that only operations are listed which currently have configuration values setup.</p></body></html> - - - @@ -132,7 +125,14 @@ - + + + + <html><head/><body><p>Enable all Operations for which the configuration values should be exported.</p><p><br/></p><p>Note that only operations are listed which currently have configuration values setup.</p></body></html> + + + + @@ -160,19 +160,6 @@ - - - - <html><head/><body><p>If enabled the current placement of the stock solid is stored in the template.</p></body></html> - - - Placement - - - true - - - @@ -186,6 +173,19 @@ + + + + <html><head/><body><p>If enabled the current placement of the stock solid is stored in the template.</p></body></html> + + + Placement + + + true + + + diff --git a/src/Mod/Path/Gui/Resources/panels/DragKnifeEdit.ui b/src/Mod/Path/Gui/Resources/panels/DragKnifeEdit.ui index b9ed04d37e..84388a76c9 100644 --- a/src/Mod/Path/Gui/Resources/panels/DragKnifeEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/DragKnifeEdit.ui @@ -14,19 +14,6 @@ Dragknife Dressup - - - - Qt::Vertical - - - - 20 - 275 - - - - @@ -34,10 +21,20 @@ - - + + + + <html><head/><body><p>Angles less than filter angle will not receive corner actions</p></body></html> + + + deg + + + + + - Pivot Height + Offset Distance @@ -60,10 +57,10 @@ - - + + - Offset Distance + Pivot Height @@ -86,17 +83,20 @@ - - - - <html><head/><body><p>Angles less than filter angle will not receive corner actions</p></body></html> + + + + Qt::Vertical - - deg + + + 20 + 275 + - + - + diff --git a/src/Mod/Path/Gui/Resources/panels/DressupPathBoundary.ui b/src/Mod/Path/Gui/Resources/panels/DressupPathBoundary.ui index 203eed64e7..841a720bd4 100644 --- a/src/Mod/Path/Gui/Resources/panels/DressupPathBoundary.ui +++ b/src/Mod/Path/Gui/Resources/panels/DressupPathBoundary.ui @@ -94,13 +94,6 @@ - - - - <html><head/><body><p>Extension of BoundBox's MaxY.</p></body></html> - - - @@ -108,6 +101,13 @@ + + + + <html><head/><body><p>Extension of BoundBox's MinX.</p></body></html> + + + @@ -128,10 +128,17 @@ - - + + - <html><head/><body><p>Extension of BoundBox's MinX.</p></body></html> + <html><head/><body><p>Extension of BoundBox's MinY.</p></body></html> + + + + + + + <html><head/><body><p>Extension of BoundBox's MaxY.</p></body></html> @@ -156,33 +163,12 @@ - - - - <html><head/><body><p>Extension of BoundBox's MinY.</p></body></html> - - - - + - - - - <html><head/><body><p>Radius of the Cylinder.</p></body></html> - - - - - - - <html><head/><body><p>Height of the Cylinder.</p></body></html> - - - @@ -190,6 +176,13 @@ + + + + <html><head/><body><p>Radius of the Cylinder.</p></body></html> + + + @@ -197,7 +190,14 @@ - + + + + <html><head/><body><p>Height of the Cylinder.</p></body></html> + + + + @@ -210,13 +210,6 @@ - - - - Width - - - @@ -224,10 +217,10 @@ - - - - <html><head/><body><p>Height of the Box.</p></body></html> + + + + Width @@ -245,7 +238,14 @@ - + + + + <html><head/><body><p>Height of the Box.</p></body></html> + + + + diff --git a/src/Mod/Path/Gui/Resources/panels/HoldingTagsEdit.ui b/src/Mod/Path/Gui/Resources/panels/HoldingTagsEdit.ui index 27a2ca8ca2..d893feebb9 100644 --- a/src/Mod/Path/Gui/Resources/panels/HoldingTagsEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/HoldingTagsEdit.ui @@ -14,52 +14,6 @@ Holding Tags - - - - - 0 - - - 0 - - - - - Add... - - - - - - - false - - - Delete - - - - - - - false - - - Edit... - - - - - - - - - - <html><head/><body><p>List of current tags. Edit coordinates by double click or Edit button.</p><p>Tags are automatically disabled if they overlap with the previous tag, or don't lie on the base wire.</p></body></html> - - - @@ -137,26 +91,50 @@ - - - - false + + + + <html><head/><body><p>List of current tags. Edit coordinates by double click or Edit button.</p><p>Tags are automatically disabled if they overlap with the previous tag, or don't lie on the base wire.</p></body></html> - - Copy From - - - - - - - + + + + + + + 0 + + + 0 + + + + + false + - Replace All + Delete - + + + + false + + + Edit... + + + + + + + Add... + + + + @@ -185,7 +163,29 @@ - + + + + false + + + Copy From + + + + + + + + + Replace All + + + + + + + diff --git a/src/Mod/Path/Gui/Resources/panels/PageBaseGeometryEdit.ui b/src/Mod/Path/Gui/Resources/panels/PageBaseGeometryEdit.ui index 42441cbc2c..e18987585c 100644 --- a/src/Mod/Path/Gui/Resources/panels/PageBaseGeometryEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/PageBaseGeometryEdit.ui @@ -24,6 +24,45 @@ :/icons/Path_BaseGeometry.svg:/icons/Path_BaseGeometry.svg + + + + + 0 + 0 + + + + <html><head/><body><p>List of operations with Base Geometry in current Job.</p></body></html> + + + + + + + Import + + + + + + + true + + + + 0 + 0 + + + + <html><head/><body><p>Select one or more features in the 3d view and press 'Add' to add them as the base items for this operation.</p><p><br/></p><p>Selected features can be deleted entirely.</p></body></html> + + + QAbstractItemView::ExtendedSelection + + + @@ -44,19 +83,6 @@ - - - - Qt::Vertical - - - - 20 - 40 - - - - @@ -80,46 +106,20 @@ - - - - true + + + + Qt::Vertical - - - 0 - 0 - + + + 20 + 40 + - - <html><head/><body><p>Select one or more features in the 3d view and press 'Add' to add them as the base items for this operation.</p><p><br/></p><p>Selected features can be deleted entirely.</p></body></html> - - - QAbstractItemView::ExtendedSelection - - + - - - - Import - - - - - - - - 0 - 0 - - - - <html><head/><body><p>List of operations with Base Geometry in current Job.</p></body></html> - - - - + diff --git a/src/Mod/Path/Gui/Resources/panels/PageBaseHoleGeometryEdit.ui b/src/Mod/Path/Gui/Resources/panels/PageBaseHoleGeometryEdit.ui index 8baddf7994..644df7a083 100644 --- a/src/Mod/Path/Gui/Resources/panels/PageBaseHoleGeometryEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/PageBaseHoleGeometryEdit.ui @@ -36,6 +36,26 @@ + + + + <html><head/><body><p>Add selected items from 3d view to the list of base geometries.</p></body></html> + + + Add + + + + + + + <html><head/><body><p>Remove selected list items from the list of base geometries. The operation is no longer applied to them.</p></body></html> + + + Remove + + + @@ -59,27 +79,7 @@ - - - - <html><head/><body><p>Remove selected list items from the list of base geometries. The operation is no longer applied to them.</p></body></html> - - - Remove - - - - - - - <html><head/><body><p>Add selected items from 3d view to the list of base geometries.</p></body></html> - - - Add - - - - + diff --git a/src/Mod/Path/Gui/Resources/panels/PageBaseLocationEdit.ui b/src/Mod/Path/Gui/Resources/panels/PageBaseLocationEdit.ui index 9130644540..083c51c50a 100644 --- a/src/Mod/Path/Gui/Resources/panels/PageBaseLocationEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/PageBaseLocationEdit.ui @@ -34,6 +34,16 @@ + + + + <html><head/><body><p>Opens a dialog to add arbitrary locations.</p></body></html> + + + Add + + + @@ -54,16 +64,6 @@ - - - - <html><head/><body><p>Opens a dialog to add arbitrary locations.</p></body></html> - - - Add - - - diff --git a/src/Mod/Path/Gui/Resources/panels/PageDepthsEdit.ui b/src/Mod/Path/Gui/Resources/panels/PageDepthsEdit.ui index 788a326cda..60472d4c02 100644 --- a/src/Mod/Path/Gui/Resources/panels/PageDepthsEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/PageDepthsEdit.ui @@ -53,65 +53,6 @@ - - - - <html><head/><body><p>The depth of the operation which corresponds to the lowest value in Z-axis the operation needs to process.</p></body></html> - - - -999999999.000000000000000 - - - 999999999.000000000000000 - - - - - - - <html><head/><body><p>Transfer the Z value of the selected feature as the Final Depth for the operation.</p></body></html> - - - ... - - - - :/icons/button_left.svg:/icons/button_left.svg - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - 0 - 34 - - - - - 16777215 - 34 - - - - Finish Step Down - - - @@ -145,6 +86,33 @@ + + + + <html><head/><body><p>The depth of the operation which corresponds to the lowest value in Z-axis the operation needs to process.</p></body></html> + + + -999999999.000000000000000 + + + 999999999.000000000000000 + + + + + + + <html><head/><body><p>Transfer the Z value of the selected feature as the Final Depth for the operation.</p></body></html> + + + ... + + + + :/icons/button_left.svg:/icons/button_left.svg + + + @@ -164,19 +132,6 @@ - - - - <html><head/><body><p>Depth of the final cut of the operation. Can be used to produce a cleaner finish.</p></body></html> - - - -999999999.000000000000000 - - - 999999999.000000000000000 - - - @@ -190,7 +145,52 @@ - + + + + + 0 + 34 + + + + + 16777215 + 34 + + + + Finish Step Down + + + + + + + <html><head/><body><p>Depth of the final cut of the operation. Can be used to produce a cleaner finish.</p></body></html> + + + -999999999.000000000000000 + + + 999999999.000000000000000 + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + diff --git a/src/Mod/Path/Gui/Resources/panels/PageDiametersEdit.ui b/src/Mod/Path/Gui/Resources/panels/PageDiametersEdit.ui index 3a7182ba97..f37b7e69d6 100644 --- a/src/Mod/Path/Gui/Resources/panels/PageDiametersEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/PageDiametersEdit.ui @@ -14,6 +14,13 @@ Form + + + + Min Diameter + + + @@ -30,6 +37,27 @@ + + + + <html><head/><body><p>Transfer the Z value of the selected feature as the Start Depth for the operation.</p></body></html> + + + ... + + + + :/icons/button_left.svg:/icons/button_left.svg + + + + + + + Max Diameter + + + @@ -60,47 +88,6 @@ - - - - <html><head/><body><p>Transfer the Z value of the selected feature as the Start Depth for the operation.</p></body></html> - - - ... - - - - :/icons/button_left.svg:/icons/button_left.svg - - - - - - - Min Diameter - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - Max Diameter - - - @@ -114,7 +101,20 @@ - + + + + Qt::Vertical + + + + 20 + 40 + + + + + diff --git a/src/Mod/Path/Gui/Resources/panels/PageHeightsEdit.ui b/src/Mod/Path/Gui/Resources/panels/PageHeightsEdit.ui index 38305e2f20..c9cf8dbb8e 100644 --- a/src/Mod/Path/Gui/Resources/panels/PageHeightsEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/PageHeightsEdit.ui @@ -25,26 +25,6 @@ - - - - Clearance Height - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - @@ -61,6 +41,13 @@ + + + + Clearance Height + + + @@ -77,7 +64,20 @@ - + + + + Qt::Vertical + + + + 20 + 40 + + + + + diff --git a/src/Mod/Path/Gui/Resources/panels/PageOpAdaptiveEdit.ui b/src/Mod/Path/Gui/Resources/panels/PageOpAdaptiveEdit.ui index dde5b650e4..67dd17a360 100644 --- a/src/Mod/Path/Gui/Resources/panels/PageOpAdaptiveEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/PageOpAdaptiveEdit.ui @@ -49,48 +49,6 @@ QFrame::Raised - - - - <html><head/><body><p>How much to lift the tool up during the rapid linking moves over cleared regions.</p><p>If linking path is not clear tool is raised to clearence height.</p></body></html> - - - - - - - Lift Distance - - - - - - - <html><head/><body><p>If &gt;0 it limits the helix ramp diameter</p><p>otherwise the 75 percent of tool diameter is used</p></body></html> - - - - - - - Helix Ramp Angle - - - - - - - <html><head/><body><p>Angle of the helix entry cone</p></body></html> - - - - - - - Stock to Leave - - - @@ -105,62 +63,6 @@ - - - - Step Over Percent - - - - - - - Use Outline - - - - - - - <html><head/><body><p>Max length of keep-tool-down linking path compared to direct distance between points.</p><p>If exceeded link will be done by raising the tool to clearence height.</p></body></html> - - - - - - - Helix Max Diameter - - - - - - - Helix Cone Angle - - - - - - - Keep Tool Down Ratio - - - - - - - <html><head/><body><p>How much material to leave (i.e. for finishing operation)</p></body></html> - - - - - - - Force Clearing Inside-out - - - @@ -168,20 +70,6 @@ - - - - <html><head/><body><p>Angle of the helix ramp entry</p></body></html> - - - - - - - Finishing Profile - - - @@ -189,7 +77,27 @@ - + + + + Step Over Percent + + + + + + + <html><head/><body><p>Optimal value for tool stepover</p></body></html> + + + 1 + + + 100 + + + + QFrame::StyledPanel @@ -233,20 +141,112 @@ - - - - <html><head/><body><p>Optimal value for tool stepover</p></body></html> - - - 1 - - - 100 + + + + Helix Ramp Angle - + + + + <html><head/><body><p>Angle of the helix ramp entry</p></body></html> + + + + + + + Helix Cone Angle + + + + + + + <html><head/><body><p>Angle of the helix entry cone</p></body></html> + + + + + + + Helix Max Diameter + + + + + + + <html><head/><body><p>If &gt;0 it limits the helix ramp diameter</p><p>otherwise the 75 percent of tool diameter is used</p></body></html> + + + + + + + Lift Distance + + + + + + + <html><head/><body><p>How much to lift the tool up during the rapid linking moves over cleared regions.</p><p>If linking path is not clear tool is raised to clearence height.</p></body></html> + + + + + + + Keep Tool Down Ratio + + + + + + + <html><head/><body><p>Max length of keep-tool-down linking path compared to direct distance between points.</p><p>If exceeded link will be done by raising the tool to clearence height.</p></body></html> + + + + + + + Stock to Leave + + + + + + + <html><head/><body><p>How much material to leave (i.e. for finishing operation)</p></body></html> + + + + + + + Force Clearing Inside-out + + + + + + + Finishing Profile + + + + + + + Use Outline + + + + diff --git a/src/Mod/Path/Gui/Resources/panels/PageOpCustomEdit.ui b/src/Mod/Path/Gui/Resources/panels/PageOpCustomEdit.ui index ac1d20e165..b30478ebab 100644 --- a/src/Mod/Path/Gui/Resources/panels/PageOpCustomEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/PageOpCustomEdit.ui @@ -29,13 +29,6 @@ 0 - - - - <html><head/><body><p>The tool and its settings to be used for this operation.</p></body></html> - - - @@ -43,6 +36,13 @@ + + + + <html><head/><body><p>The tool and its settings to be used for this operation.</p></body></html> + + + diff --git a/src/Mod/Path/Gui/Resources/panels/PageOpDrillingEdit.ui b/src/Mod/Path/Gui/Resources/panels/PageOpDrillingEdit.ui index 5103b81c39..dbcad34842 100644 --- a/src/Mod/Path/Gui/Resources/panels/PageOpDrillingEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/PageOpDrillingEdit.ui @@ -63,16 +63,6 @@ - - - - false - - - Time - - - @@ -80,23 +70,21 @@ - - - - - None - - - - - Drill Tip - - - - - 2x Drill Tip - - + + + + false + + + Depth + + + + + + + false + @@ -116,20 +104,6 @@ - - - - false - - - - - - - false - - - @@ -137,13 +111,20 @@ - - + + false - Depth + Time + + + + + + + false @@ -154,7 +135,26 @@ - + + + + + None + + + + + Drill Tip + + + + + 2x Drill Tip + + + + + diff --git a/src/Mod/Path/Gui/Resources/panels/PageOpHelixEdit.ui b/src/Mod/Path/Gui/Resources/panels/PageOpHelixEdit.ui index 9e32794f90..090b0574da 100644 --- a/src/Mod/Path/Gui/Resources/panels/PageOpHelixEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/PageOpHelixEdit.ui @@ -14,19 +14,6 @@ Form - - - - Qt::Vertical - - - - 20 - 40 - - - - @@ -161,7 +148,20 @@ - + + + + Qt::Vertical + + + + 20 + 40 + + + + + diff --git a/src/Mod/Path/Gui/Resources/panels/PageOpPocketExtEdit.ui b/src/Mod/Path/Gui/Resources/panels/PageOpPocketExtEdit.ui index 0feaa657ee..481745c3d5 100644 --- a/src/Mod/Path/Gui/Resources/panels/PageOpPocketExtEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/PageOpPocketExtEdit.ui @@ -49,7 +49,17 @@ - + + + + <html><head/><body><p>If selected all potential extensions are visualised. Enabled extensions in purple and not enabled extensions in yellow.</p></body></html> + + + Show All + + + + <html><head/><body><p>Extend the corner between two edges of a pocket. If selected adjacent edges are combined.</p></body></html> @@ -62,6 +72,13 @@ + + + + Default Length + + + @@ -75,24 +92,7 @@ - - - - Default Length - - - - - - - <html><head/><body><p>If selected all potential extensions are visualised. Enabled extensions in purple and not enabled extensions in yellow.</p></body></html> - - - Show All - - - - + diff --git a/src/Mod/Path/Gui/Resources/panels/PageOpPocketFullEdit.ui b/src/Mod/Path/Gui/Resources/panels/PageOpPocketFullEdit.ui index 38962afb60..4d70159d0c 100644 --- a/src/Mod/Path/Gui/Resources/panels/PageOpPocketFullEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/PageOpPocketFullEdit.ui @@ -57,13 +57,6 @@ - - - - <html><head/><body><p>Specify if the facing should be restricted by the actual shape of the selected face (or the part if no face is selected), or if the bounding box should be faced off.</p><p>The latter can be used to face of the entire stock area to ensure uniform heights for the following operations.</p></body></html> - - - @@ -71,7 +64,14 @@ - + + + + <html><head/><body><p>Specify if the facing should be restricted by the actual shape of the selected face (or the part if no face is selected), or if the bounding box should be faced off.</p><p>The latter can be used to face of the entire stock area to ensure uniform heights for the following operations.</p></body></html> + + + + @@ -216,10 +216,13 @@ - - + + + + <html><head/><body><p>Specify if this operation uses a starting point.</p></body></html> + - Min Travel + Use Start Point @@ -233,16 +236,6 @@ - - - - <html><head/><body><p>Specify if this operation uses a starting point.</p></body></html> - - - Use Start Point - - - @@ -250,7 +243,14 @@ - + + + + Min Travel + + + + diff --git a/src/Mod/Path/Gui/Resources/panels/PageOpProbeEdit.ui b/src/Mod/Path/Gui/Resources/panels/PageOpProbeEdit.ui index f222080379..570fc88d51 100644 --- a/src/Mod/Path/Gui/Resources/panels/PageOpProbeEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/PageOpProbeEdit.ui @@ -52,6 +52,13 @@ Probe Grid Points + + + + X: + + + @@ -62,7 +69,14 @@ - + + + + Y: + + + + 3 @@ -72,21 +86,7 @@ - - - - X: - - - - - - - Y: - - - - + @@ -95,20 +95,6 @@ Probe - - - - Y Offset - - - - - - - - - - @@ -123,7 +109,21 @@ - + + + + Y Offset + + + + + + + + + + + diff --git a/src/Mod/Path/Gui/Resources/panels/PageOpProfileFullEdit.ui b/src/Mod/Path/Gui/Resources/panels/PageOpProfileFullEdit.ui index 0449e795e8..e483c5452b 100644 --- a/src/Mod/Path/Gui/Resources/panels/PageOpProfileFullEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/PageOpProfileFullEdit.ui @@ -57,10 +57,10 @@ - - + + - Direction + Cut Side @@ -76,16 +76,10 @@ - - - - - 0 - 0 - - - - <html><head/><body><p>The amount of extra material left by this operation in relation to the target shape.</p></body></html> + + + + Direction @@ -101,13 +95,6 @@ - - - - Cut Side - - - @@ -115,7 +102,20 @@ - + + + + + 0 + 0 + + + + <html><head/><body><p>The amount of extra material left by this operation in relation to the target shape.</p></body></html> + + + + diff --git a/src/Mod/Path/Gui/Resources/panels/PageOpSlotEdit.ui b/src/Mod/Path/Gui/Resources/panels/PageOpSlotEdit.ui index 8d828b94de..a540a65d0b 100644 --- a/src/Mod/Path/Gui/Resources/panels/PageOpSlotEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/PageOpSlotEdit.ui @@ -65,6 +65,16 @@ 3 + + + + Start Feature Reference + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + @@ -119,16 +129,6 @@ - - - - Start Feature Reference - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - @@ -263,6 +263,38 @@ 3 + + + + + 0 + 0 + + + + Extend Path Start + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + <html><head/><body><p>Positive extends the beginning of the path, negative shortens.</p></body></html> + + + + + + @@ -289,39 +321,7 @@ - - - - - 0 - 0 - - - - <html><head/><body><p>Positive extends the beginning of the path, negative shortens.</p></body></html> - - - - - - - - - - - 0 - 0 - - - - Extend Path Start - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - + @@ -346,30 +346,6 @@ - - - - <html><head/><body><p>Choose the path orientation with regard to the feature(s) selected.</p></body></html> - - - - Start to End - - - - - Perpendicular - - - - - - - - Path Orientation - - - @@ -392,6 +368,30 @@ + + + + Path Orientation + + + + + + + <html><head/><body><p>Choose the path orientation with regard to the feature(s) selected.</p></body></html> + + + + Start to End + + + + + Perpendicular + + + + diff --git a/src/Mod/Path/Gui/Resources/panels/PageOpSurfaceEdit.ui b/src/Mod/Path/Gui/Resources/panels/PageOpSurfaceEdit.ui index a0e7a70165..dee0969a0e 100644 --- a/src/Mod/Path/Gui/Resources/panels/PageOpSurfaceEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/PageOpSurfaceEdit.ui @@ -57,6 +57,48 @@ + + + + BoundBox + + + + + + + <html><head/><body><p>Select the overall boundary for the operation.</p></body></html> + + + + + + + Scan Type + + + + + + + <html><head/><body><p>Planar: Flat, 3D surface scan. Rotational: 4th-axis rotational scan.</p></body></html> + + + + + + + Layer Mode + + + + + + + <html><head/><body><p>Complete the operation in a single pass at depth, or mulitiple passes to final depth.</p></body></html> + + + @@ -64,10 +106,45 @@ - - + + + + <html><head/><body><p>Set the geometric clearing pattern to use for the operation.</p></body></html> + + + + + - Sample interval + Profile Edges + + + + + + + <html><head/><body><p>Profile the edges of the selection.</p></body></html> + + + + + + + Avoid Last X Faces + + + + + + + <html><head/><body><p>Avoid cutting the last 'N' faces in the Base Geometry list of selected faces.</p></body></html> + + + + + + + BoundBox extra offset X, Y @@ -101,110 +178,10 @@ - - - - <html><head/><body><p>Set the sampling resolution. Smaller values quickly increase processing time.</p></body></html> - - - mm - - - - - - - <html><head/><body><p>Enable optimization of linear paths (co-linear points). Removes unnecessary co-linear points from G-Code output.</p></body></html> - + + - Optimize Linear Paths - - - - - - - BoundBox - - - - - - - <html><head/><body><p>Select the overall boundary for the operation.</p></body></html> - - - - - - - <html><head/><body><p>Enable separate optimization of transitions between, and breaks within, each step over path.</p></body></html> - - - Optimize StepOver Transitions - - - - - - - <html><head/><body><p>Profile the edges of the selection.</p></body></html> - - - - - - - Step over - - - - - - - <html><head/><body><p>Set the geometric clearing pattern to use for the operation.</p></body></html> - - - - - - - <html><head/><body><p>Planar: Flat, 3D surface scan. Rotational: 4th-axis rotational scan.</p></body></html> - - - - - - - BoundBox extra offset X, Y - - - - - - - Depth offset - - - - - - - <html><head/><body><p>Complete the operation in a single pass at depth, or mulitiple passes to final depth.</p></body></html> - - - - - - - Layer Mode - - - - - - - Scan Type + Drop Cutter Direction @@ -215,6 +192,13 @@ + + + + Depth offset + + + @@ -225,41 +209,10 @@ - - + + - Drop Cutter Direction - - - - - - - <html><head/><body><p>Make True, if specifying a Start Point</p></body></html> - - - Use Start Point - - - - - - - <html><head/><body><p>Avoid cutting the last 'N' faces in the Base Geometry list of selected faces.</p></body></html> - - - - - - - Profile Edges - - - - - - - Avoid Last X Faces + Step over @@ -276,6 +229,43 @@ + + + + Sample interval + + + + + + + <html><head/><body><p>Set the sampling resolution. Smaller values quickly increase processing time.</p></body></html> + + + mm + + + + + + + <html><head/><body><p>Make True, if specifying a Start Point</p></body></html> + + + Use Start Point + + + + + + + <html><head/><body><p>Enable optimization of linear paths (co-linear points). Removes unnecessary co-linear points from G-Code output.</p></body></html> + + + Optimize Linear Paths + + + @@ -289,7 +279,17 @@ - + + + + <html><head/><body><p>Enable separate optimization of transitions between, and breaks within, each step over path.</p></body></html> + + + Optimize StepOver Transitions + + + + diff --git a/src/Mod/Path/Gui/Resources/panels/PageOpThreadMillingEdit.ui b/src/Mod/Path/Gui/Resources/panels/PageOpThreadMillingEdit.ui index cd24476351..cf60845866 100644 --- a/src/Mod/Path/Gui/Resources/panels/PageOpThreadMillingEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/PageOpThreadMillingEdit.ui @@ -14,6 +14,18 @@ Form + + + + Tool Controller + + + + + + + + @@ -126,31 +138,6 @@ - - - - Tool Controller - - - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - @@ -194,7 +181,20 @@ - + + + + Qt::Vertical + + + + 20 + 40 + + + + + diff --git a/src/Mod/Path/Gui/Resources/panels/PageOpVcarveEdit.ui b/src/Mod/Path/Gui/Resources/panels/PageOpVcarveEdit.ui index 4648cd89c8..7a062e78fb 100644 --- a/src/Mod/Path/Gui/Resources/panels/PageOpVcarveEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/PageOpVcarveEdit.ui @@ -23,13 +23,6 @@ QFrame::Raised - - - - <html><head/><body><p>The tool and its settings to be used for this operation.</p></body></html> - - - @@ -37,6 +30,13 @@ + + + + <html><head/><body><p>The tool and its settings to be used for this operation.</p></body></html> + + + diff --git a/src/Mod/Path/Gui/Resources/panels/PathEdit.ui b/src/Mod/Path/Gui/Resources/panels/PathEdit.ui index 380db3eba7..a32e129f6d 100644 --- a/src/Mod/Path/Gui/Resources/panels/PathEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/PathEdit.ui @@ -144,26 +144,6 @@ - - - - <html><head/><body><p>Optional arguments passed to the Post Processor. The arguments are specific for each Post Processor, please see it's documentation for details.</p></body></html> - - - - - - - Qt::Vertical - - - - 20 - 747 - - - - @@ -188,6 +168,13 @@ + + + + <html><head/><body><p>Optional arguments passed to the Post Processor. The arguments are specific for each Post Processor, please see it's documentation for details.</p></body></html> + + + @@ -399,7 +386,20 @@ - + + + + Qt::Vertical + + + + 20 + 747 + + + + + @@ -504,9 +504,6 @@ - - - @@ -514,6 +511,9 @@ + + + @@ -531,8 +531,11 @@ - - + + + + + @@ -547,21 +550,12 @@ - - - - + - - - - - - @@ -569,6 +563,9 @@ + + + @@ -576,7 +573,10 @@ - + + + + @@ -589,6 +589,9 @@ + + + @@ -596,12 +599,6 @@ - - - - - - @@ -612,7 +609,10 @@ - + + + + @@ -624,6 +624,20 @@ Alignment + + + + Move to Origin + + + + + + + Set Origin + + + @@ -638,21 +652,7 @@ - - - - Set Origin - - - - - - - Move to Origin - - - - + @@ -682,6 +682,13 @@ + + + + X=0 + + + @@ -696,13 +703,6 @@ - - - - X=0 - - - @@ -719,6 +719,23 @@ Move - XY + + + + + + + + :/icons/arrow-left-up.svg:/icons/arrow-left-up.svg + + + + 32 + 32 + + + + @@ -753,31 +770,14 @@ - - + + - :/icons/arrow-left-up.svg:/icons/arrow-left-up.svg - - - - 32 - 32 - - - - - - - - - - - - :/icons/arrow-right.svg:/icons/arrow-right.svg + :/icons/arrow-left.svg:/icons/arrow-left.svg @@ -800,14 +800,14 @@ - - + + - :/icons/arrow-left.svg:/icons/arrow-left.svg + :/icons/arrow-right.svg:/icons/arrow-right.svg @@ -877,6 +877,29 @@ Rotate - XY + + + + + 0 + 0 + + + + + + + + :/icons/arrow-ccw.svg:/icons/arrow-ccw.svg + + + + 32 + 32 + + + + @@ -918,29 +941,6 @@ - - - - - 0 - 0 - - - - - - - - :/icons/arrow-ccw.svg:/icons/arrow-ccw.svg - - - - 32 - 32 - - - - @@ -1052,10 +1052,23 @@ Heights - - + + - Safe + Expression + + + Qt::AlignCenter + + + + + + + Offset + + + Qt::AlignCenter @@ -1066,13 +1079,6 @@ - - - - <html><head/><body><p>Expression set as SafeHeight for new operations.</p><p><br/></p><p>Default: &quot;OpStockZMax+SetupSheet.SafeHeightOffset&quot;</p></body></html> - - - @@ -1087,23 +1093,17 @@ - - + + - Offset - - - Qt::AlignCenter + Safe - - - - Expression - - - Qt::AlignCenter + + + + <html><head/><body><p>Expression set as SafeHeight for new operations.</p><p><br/></p><p>Default: &quot;OpStockZMax+SetupSheet.SafeHeightOffset&quot;</p></body></html> diff --git a/src/Mod/Path/Gui/Resources/panels/SetupGlobal.ui b/src/Mod/Path/Gui/Resources/panels/SetupGlobal.ui index e241335849..b641ef6be1 100644 --- a/src/Mod/Path/Gui/Resources/panels/SetupGlobal.ui +++ b/src/Mod/Path/Gui/Resources/panels/SetupGlobal.ui @@ -81,10 +81,23 @@ Heights - - + + - Safe + Expression + + + Qt::AlignCenter + + + + + + + Offset + + + Qt::AlignCenter @@ -95,13 +108,6 @@ - - - - <html><head/><body><p>Expression set as SafeHeight for new operations.</p><p><br/></p><p>Default: &quot;OpStockZMax+SetupSheet.SafeHeightOffset&quot;</p></body></html> - - - @@ -116,23 +122,17 @@ - - + + - Offset - - - Qt::AlignCenter + Safe - - - - Expression - - - Qt::AlignCenter + + + + <html><head/><body><p>Expression set as SafeHeight for new operations.</p><p><br/></p><p>Default: &quot;OpStockZMax+SetupSheet.SafeHeightOffset&quot;</p></body></html> diff --git a/src/Mod/Path/Gui/Resources/panels/ZCorrectEdit.ui b/src/Mod/Path/Gui/Resources/panels/ZCorrectEdit.ui index 36d58f0c6f..a6ffed7f60 100644 --- a/src/Mod/Path/Gui/Resources/panels/ZCorrectEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/ZCorrectEdit.ui @@ -41,13 +41,6 @@ Probe Points File - - - - ... - - - @@ -65,6 +58,13 @@ + + + + ... + + + diff --git a/src/Mod/Path/Gui/Resources/preferences/PathDressupHoldingTags.ui b/src/Mod/Path/Gui/Resources/preferences/PathDressupHoldingTags.ui index febc16a026..ef03bbaf29 100644 --- a/src/Mod/Path/Gui/Resources/preferences/PathDressupHoldingTags.ui +++ b/src/Mod/Path/Gui/Resources/preferences/PathDressupHoldingTags.ui @@ -20,6 +20,13 @@ Tag Parameters + + + + Default Width + + + @@ -27,10 +34,24 @@ - - + + - Default Width + Default Height + + + + + + + <html><head/><body><p>Default height of holding tags.</p><p>If the specified height is 0 the dressup will use half the height of the part. Should the height be bigger than the height of the part the dressup will reduce the height to the height of the part.</p></body></html> + + + + + + + Default Angle @@ -53,34 +74,6 @@ - - - - <html><head/><body><p>Default height of holding tags.</p><p>If the specified height is 0 the dressup will use half the height of the part. Should the height be bigger than the height of the part the dressup will reduce the height to the height of the part.</p></body></html> - - - - - - - Default Angle - - - - - - - Default Height - - - - - - - <html><head/><body><p>Radius of the fillet on the tag's top edge.</p><p>If the radius is bigger than that which the the tag shape itself supports, the resulting shape will be that of a dome.</p></body></html> - - - @@ -88,7 +81,14 @@ - + + + + <html><head/><body><p>Radius of the fillet on the tag's top edge.</p><p>If the radius is bigger than that which the the tag shape itself supports, the resulting shape will be that of a dome.</p></body></html> + + + + diff --git a/src/Mod/Path/Gui/Resources/preferences/PathJob.ui b/src/Mod/Path/Gui/Resources/preferences/PathJob.ui index 78be5ed973..97667c47f3 100644 --- a/src/Mod/Path/Gui/Resources/preferences/PathJob.ui +++ b/src/Mod/Path/Gui/Resources/preferences/PathJob.ui @@ -38,13 +38,6 @@ Defaults - - - - <html><head/><body><p>Path to look for templates, post processors, tool tables and other external files.</p><p><br/></p><p>If left empty the macro directory is used.</p></body></html> - - - @@ -52,6 +45,13 @@ + + + + <html><head/><body><p>Path to look for templates, post processors, tool tables and other external files.</p><p><br/></p><p>If left empty the macro directory is used.</p></body></html> + + + @@ -92,13 +92,6 @@ - - - - Default value for new Jobs, used for computing Paths. Smaller increases accuracy, but slows down computation - - - @@ -106,8 +99,12 @@ - - + + + + Default value for new Jobs, used for computing Paths. Smaller increases accuracy, but slows down computation + + @@ -116,7 +113,10 @@ - + + + + @@ -409,9 +409,6 @@ - - - @@ -419,6 +416,9 @@ + + + @@ -436,8 +436,11 @@ - - + + + + + @@ -452,21 +455,12 @@ - - - - + - - - - - - @@ -474,6 +468,9 @@ + + + @@ -481,7 +478,10 @@ - + + + + @@ -494,6 +494,9 @@ + + + @@ -501,12 +504,6 @@ - - - - - - @@ -517,7 +514,10 @@ - + + + + @@ -545,26 +545,6 @@ false - - - - - - - Position - - - - - - - Axis - - - - - - @@ -572,11 +552,15 @@ - - + + - - + + + + Axis + + @@ -599,7 +583,23 @@ - + + + + Position + + + + + + + + + + + + +