diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAdvanced.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAdvanced.ui index 68863ea207..96f55db62e 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAdvanced.ui +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAdvanced.ui @@ -40,6 +40,334 @@ + + + + + 0 + 0 + + + + If checked, TechDraw will attempt to build faces using the +line segments returned by the hidden line removal algorithm. +Faces must be detected in order to use hatching, but there +can be a performance penalty in complex models. + + + Detect Faces + + + true + + + HandleFaces + + + /Mod/TechDraw/General + + + + + + + + 0 + 0 + + + + + 0 + 20 + + + + Highlights border of section cut in section views + + + Show Section Edges + + + true + + + ShowSectionEdges + + + /Mod/TechDraw/General + + + + + + + + 0 + 0 + + + + Dump intermediate results during Section view processing + + + Debug Section + + + debugSection + + + Mod/TechDraw/debug + + + + + + + + 0 + 0 + + + + + 0 + 20 + + + + Dump intermediate results during Detail view processing + + + Debug Detail + + + debugDetail + + + Mod/TechDraw/debug + + + + + + + + 0 + 0 + + + + Include edges with unexpected geometry (zero length etc.) in results + + + Allow Crazy Edges + + + allowCrazyEdge + + + Mod/TechDraw/debug + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 0 + 0 + + + + + 0 + 20 + + + + + true + + + + Perform a fuse operation on input shape(s) before Section view processing + + + Fuse Before Section + + + SectionFuseFirst + + + Mod/TechDraw/General + + + + + + + + 0 + 20 + + + + Include 2D Objects in projection + + + Show Loose 2D Geom + + + false + + + ShowLoose2d + + + Mod/TechDraw/General + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + Edge Fuzz + + + + + + + + 0 + 0 + + + + + 174 + 0 + + + + + 0 + 0 + + + + Size of selection area around edges +Each unit is approx. 0.1 mm wide + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 10.000000000000000 + + + EdgeFuzz + + + Mod/TechDraw/General + + + + + + + + 0 + 0 + + + + Mark Fuzz + + + + + + + + 0 + 0 + + + + + 174 + 0 + + + + + 0 + 0 + + + + Selection area around center marks +Each unit is approx. 0.1 mm wide + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 5.000000000000000 + + + MarkFuzz + + + Mod/TechDraw/General + + + + + + + + true + + + + Line End Cap Shape + + + @@ -86,144 +414,6 @@ Only change unless you know what you are doing! - - - - - 0 - 0 - - - - If checked, TechDraw will attempt to build faces using the -line segments returned by the hidden line removal algorithm. -Faces must be detected in order to use hatching, but there -can be a performance penalty in complex models. - - - Detect Faces - - - true - - - HandleFaces - - - /Mod/TechDraw/General - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 20 - - - - Maximum hatch line segments to use -when hatching a face with a PAT pattern - - - Qt::AlignRight - - - 1 - - - 1000000 - - - 100 - - - 10000 - - - MaxSeg - - - Mod/TechDraw/PAT - - - - - - - - 0 - 0 - - - - - 0 - 20 - - - - Highlights border of section cut in section views - - - Show Section Edges - - - true - - - ShowSectionEdges - - - /Mod/TechDraw/General - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - Edge Fuzz - - - - - - - - true - - - - Line End Cap Shape - - - @@ -231,150 +421,6 @@ when hatching a face with a PAT pattern - - - - - 0 - 0 - - - - Mark Fuzz - - - - - - - - 0 - 0 - - - - Include edges with unexpected geometry (zero length etc.) in results - - - Allow Crazy Edges - - - allowCrazyEdge - - - Mod/TechDraw/debug - - - - - - - - 0 - 0 - - - - - 0 - 20 - - - - - true - - - - Perform a fuse operation on input shape(s) before Section view processing - - - Fuse Before Section - - - SectionFuseFirst - - - Mod/TechDraw/General - - - - - - - - 0 - 0 - - - - - 174 - 0 - - - - - 0 - 0 - - - - Size of selection area around edges -Each unit is approx. 0.1 mm wide - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 10.000000000000000 - - - EdgeFuzz - - - Mod/TechDraw/General - - - - - - - - 0 - 0 - - - - - 0 - 20 - - - - Dump intermediate results during Detail view processing - - - Debug Detail - - - debugDetail - - - Mod/TechDraw/debug - - - - - - - Max PAT Hatch Segments - - - @@ -411,71 +457,15 @@ Then you need to increase the tile limit. - - - - - 0 - 0 - - - - Dump intermediate results during Section view processing - + + - Debug Section - - - debugSection - - - Mod/TechDraw/debug + Max PAT Hatch Segments - - - - - 0 - 0 - - - - - 174 - 0 - - - - - 0 - 0 - - - - Selection area around center marks -Each unit is approx. 0.1 mm wide - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 5.000000000000000 - - - MarkFuzz - - - Mod/TechDraw/General - - - - - + + 0 @@ -483,23 +473,33 @@ Each unit is approx. 0.1 mm wide - Include 2D Objects in projection + Maximum hatch line segments to use +when hatching a face with a PAT pattern - - Show Loose 2D Geom + + Qt::AlignRight - - false + + 1 + + + 1000000 + + + 100 + + + 10000 - ShowLoose2d + MaxSeg - Mod/TechDraw/General + Mod/TechDraw/PAT - + diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotation.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotation.ui index 1f484413a9..ecec6074dd 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotation.ui +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotation.ui @@ -34,15 +34,65 @@ - - + + true - Center Line Style + Section Line Standard + + + + + + + + 0 + 0 + + + + + 184 + 22 + + + + Standard to be used to draw section lines + + + 1 + + + SectionLineStandard + + + Mod/TechDraw/Standards + + + + ANSI + + + + + ISO + + + + + + + + + true + + + + Section Line Style @@ -128,18 +178,6 @@ - - - - - true - - - - Section Line Standard - - - @@ -194,39 +232,60 @@ - - - - - 0 - 0 - - - - - 0 - 0 - + + + + + true + - Forces last leader line segment to be horizontal + Line group used to set line widths - Leader Line Auto Horizontal - - - true - - - AutoHorizontal - - - Mod/TechDraw/LeaderLine + Line Width Group - - + + + + + 0 + 0 + + + + + 0 + 0 + + + + LineGroup + + + /Mod/TechDraw/Decorations + + + + + + + + + + + false + + + + Detail View Outline Shape + + + + + 0 @@ -240,22 +299,147 @@ - Length of balloon leader line kink - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 5.000000000000000 + Outline shape for detail views - BalloonKink + MattingStyle - Mod/TechDraw/Dimensions + /Mod/TechDraw/Decorations + + + + Circle + + + + :/icons/circular.svg:/icons/circular.svg + + + + + Square + + + + :/icons/square.svg:/icons/square.svg + + + + + + + + + true + + + + Line style of detail highlight on base view + + + Detail Highlight Style + + + + + 0 + 0 + + + + 2 + + + HighlightStyle + + + /Mod/TechDraw/Decorations + + + + NeverShow + + + + :/icons/arrownone.svg:/icons/arrownone.svg + + + + + Continuous + + + + :/icons/continuous-line.svg:/icons/continuous-line.svg + + + + + Dash + + + + :/icons/dash-line.svg:/icons/dash-line.svg + + + + + Dot + + + + :/icons/dot-line.svg:/icons/dot-line.svg + + + + + DashDot + + + + :/icons/dashDot-line.svg:/icons/dashDot-line.svg + + + + + DashDotDot + + + + :/icons/dashDotDot-line.svg:/icons/dashDotDot-line.svg + + + + + + + + + true + + + + Center Line Style + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + @@ -338,6 +522,18 @@ + + + + + true + + + + Balloon Shape + + + @@ -447,185 +643,6 @@ - - - - - 0 - 0 - - - - - 184 - 22 - - - - Standard to be used to draw section lines - - - 1 - - - SectionLineStandard - - - Mod/TechDraw/Standards - - - - ANSI - - - - - ISO - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - Outline shape for detail views - - - MattingStyle - - - /Mod/TechDraw/Decorations - - - - Circle - - - - :/icons/circular.svg:/icons/circular.svg - - - - - Square - - - - :/icons/square.svg:/icons/square.svg - - - - - - - - - true - - - - Section Line Style - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - true - - - - Show arc center marks in views - - - Show Center Marks - - - true - - - ShowCenterMarks - - - Mod/TechDraw/Decorations - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - LineGroup - - - /Mod/TechDraw/Decorations - - - - - - - - - - - false - - - - Detail View Outline Shape - - - @@ -666,6 +683,37 @@ + + + + + 0 + 0 + + + + + 0 + 0 + + + + Length of balloon leader line kink + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 5.000000000000000 + + + BalloonKink + + + Mod/TechDraw/Dimensions + + + @@ -697,30 +745,70 @@ - - + + + + + 0 + 0 + + + + + 0 + 0 + + + + Forces last leader line segment to be horizontal + + + Leader Line Auto Horizontal + + + true + + + AutoHorizontal + + + Mod/TechDraw/LeaderLine + + + + + + + + 0 + 0 + + + + + 0 + 0 + + true - Line group used to set line widths + Show arc center marks in views - Line Width Group + Show Center Marks - - - - - - - true - + + true - - Balloon Shape + + ShowCenterMarks + + + Mod/TechDraw/Decorations @@ -752,95 +840,7 @@ - - - - - true - - - - Line style of detail highlight on base view - - - Detail Highlight Style - - - - - - - - 0 - 0 - - - - 2 - - - HighlightStyle - - - /Mod/TechDraw/Decorations - - - - NeverShow - - - - :/icons/arrownone.svg:/icons/arrownone.svg - - - - - Continuous - - - - :/icons/continuous-line.svg:/icons/continuous-line.svg - - - - - Dash - - - - :/icons/dash-line.svg:/icons/dash-line.svg - - - - - Dot - - - - :/icons/dot-line.svg:/icons/dot-line.svg - - - - - DashDot - - - - :/icons/dashDot-line.svg:/icons/dashDot-line.svg - - - - - DashDotDot - - - - :/icons/dashDotDot-line.svg:/icons/dashDotDot-line.svg - - - - - + diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawColors.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawColors.ui index 4489b321a0..1d541a2c4f 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawColors.ui +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawColors.ui @@ -49,6 +49,115 @@ + + + + + true + + + + Normal + + + + + + + Normal line color + + + + 0 + 0 + 0 + + + + NormalColor + + + Mod/TechDraw/Colors + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + true + + + + Hidden Line + + + + + + + Hidden line color + + + + 0 + 0 + 0 + + + + HiddenColor + + + Mod/TechDraw/Colors + + + + + + + + true + + + + Preselected + + + + + + + Preselection color + + + + 255 + 255 + 0 + + + + PreSelectColor + + + Mod/TechDraw/Colors + + + @@ -61,6 +170,38 @@ + + + + Section face color + + + + 211 + 211 + 211 + + + + CutSurfaceColor + + + Mod/TechDraw/Colors + + + + + + + + true + + + + Selected + + + @@ -81,10 +222,62 @@ - - + + - Vertex + Section Line + + + + + + + Section line color + + + + 0 + 0 + 0 + + + + SectionColor + + + /Mod/TechDraw/Decorations + + + + + + + + true + + + + Background + + + + + + + Background color around pages + + + + 211 + 211 + 211 + + + + Background + + + /Mod/TechDraw/Colors @@ -120,58 +313,13 @@ - - - - Section line color - - - - 0 - 0 - 0 - - - - SectionColor - - - /Mod/TechDraw/Decorations - - - - - + + - Section Line + Dimension - - - - - true - - - - Normal - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - @@ -192,159 +340,15 @@ - - + + true - Background - - - - - - - Normal line color - - - - 0 - 0 - 0 - - - - NormalColor - - - Mod/TechDraw/Colors - - - - - - - Preselection color - - - - 255 - 255 - 0 - - - - PreSelectColor - - - Mod/TechDraw/Colors - - - - - - - Background color around pages - - - - 211 - 211 - 211 - - - - Background - - - /Mod/TechDraw/Colors - - - - - - - - true - - - - Preselected - - - - - - - Hidden line color - - - - 0 - 0 - 0 - - - - HiddenColor - - - Mod/TechDraw/Colors - - - - - - - Centerline color - - - - 0 - 0 - 0 - - - - CenterColor - - - Mod/TechDraw/Decorations - - - - - - - - true - - - - Selected - - - - - - - Face color (if not transparent) - - - - 255 - 255 - 255 - - - - FaceColor - - - /Mod/TechDraw/Colors + Geometric Hatch @@ -368,42 +372,37 @@ - - - - - true - - + + - Hidden Line + Centerline - - - - - 0 - 20 - - - - - true - - + + - Object faces will be transparent + Centerline color - - Transparent Faces + + + 0 + 0 + 0 + - ClearFace + CenterColor - /Mod/TechDraw/Colors + Mod/TechDraw/Decorations + + + + + + + Vertex @@ -427,20 +426,6 @@ - - - - Dimension - - - - - - - Centerline - - - @@ -453,6 +438,35 @@ + + + + + 0 + 0 + 0 + + + + HighlightColor + + + /Mod/TechDraw/Decorations + + + + + + + + true + + + + Leaderline + + + @@ -473,67 +487,6 @@ - - - - Section face color - - - - 211 - 211 - 211 - - - - CutSurfaceColor - - - Mod/TechDraw/Colors - - - - - - - - true - - - - Geometric Hatch - - - - - - - - true - - - - Leaderline - - - - - - - - 0 - 0 - 0 - - - - HighlightColor - - - /Mod/TechDraw/Decorations - - - @@ -558,7 +511,54 @@ - + + + + + 0 + 20 + + + + + true + + + + Object faces will be transparent + + + Transparent Faces + + + ClearFace + + + /Mod/TechDraw/Colors + + + + + + + Face color (if not transparent) + + + + 255 + 255 + 255 + + + + FaceColor + + + /Mod/TechDraw/Colors + + + + diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensions.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensions.ui index f1fced4f0d..d0c3df6751 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensions.ui +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensions.ui @@ -46,222 +46,21 @@ - - + + + + + 0 + 0 + + true - Arrow Size - - - - - - - Diameter Symbol - - - - - - - - 0 - 0 - - - - - 0 - 22 - - - - Dimension text font size - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 4.000000000000000 - - - FontSize - - - /Mod/TechDraw/Dimensions - - - - - - - - 0 - 0 - - - - - 174 - 0 - - - - - 0 - 0 - - - - Tolerance text scale -Multiplier of 'Font Size' - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 0.100000000000000 - - - 0.800000000000000 - - - TolSizeAdjust - - - Mod/TechDraw/Dimensions - - - - - - - - 0 - 0 - - - - - 0 - 22 - - - - Append unit to dimension values - - - Show Units - - - ShowUnits - - - /Mod/TechDraw/Dimensions - - - - - - - - true - - - - Font Size - - - - - - - - true - - - - Arrow Style - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - false - - - - Tolerance Text Scale - - - - - - - - 0 - 0 - - - - - 0 - 22 - - - - - 12 - - - - Character used to indicate diameter dimensions - - - ⌀ - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - DiameterSymbol - - - /Mod/TechDraw/Dimensions + Standard and Style @@ -310,31 +109,6 @@ Multiplier of 'Font Size' - - - - Alternate Decimals - - - - - - - - 0 - 0 - - - - - true - - - - Standard and Style - - - @@ -365,8 +139,8 @@ Multiplier of 'Font Size' - - + + 0 @@ -380,47 +154,23 @@ Multiplier of 'Font Size' - Arrowhead size + Append unit to dimension values - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 5.000000000000000 + + Show Units - ArrowSize + ShowUnits - Mod/TechDraw/Dimensions + /Mod/TechDraw/Dimensions - - - - - 0 - 0 - - - - - 0 - 22 - - - - Arrowhead style - - - -1 - - - ArrowStyle - - - Mod/TechDraw/Dimensions + + + + Alternate Decimals @@ -486,7 +236,257 @@ Multiplier of 'Font Size' - + + + + + true + + + + Font Size + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 0 + 0 + + + + + 0 + 22 + + + + Dimension text font size + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 4.000000000000000 + + + FontSize + + + /Mod/TechDraw/Dimensions + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + false + + + + Tolerance Text Scale + + + + + + + + 0 + 0 + + + + + 174 + 0 + + + + + 0 + 0 + + + + Tolerance text scale +Multiplier of 'Font Size' + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 0.100000000000000 + + + 0.800000000000000 + + + TolSizeAdjust + + + Mod/TechDraw/Dimensions + + + + + + + Diameter Symbol + + + + + + + + 0 + 0 + + + + + 0 + 22 + + + + + 12 + + + + Character used to indicate diameter dimensions + + + ⌀ + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + DiameterSymbol + + + /Mod/TechDraw/Dimensions + + + + + + + + true + + + + Arrow Style + + + + + + + + 0 + 0 + + + + + 0 + 22 + + + + Arrowhead style + + + -1 + + + ArrowStyle + + + Mod/TechDraw/Dimensions + + + + + + + + true + + + + Arrow Size + + + + + + + + 0 + 0 + + + + + 0 + 22 + + + + Arrowhead size + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 5.000000000000000 + + + ArrowSize + + + Mod/TechDraw/Dimensions + + + + diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawGeneral.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawGeneral.ui index e4186f0c91..5d667e56e6 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawGeneral.ui +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawGeneral.ui @@ -199,22 +199,6 @@ for ProjectionGroups - - - - Qt::Horizontal - - - QSizePolicy::Preferred - - - - 40 - 20 - - - - @@ -238,12 +222,21 @@ for ProjectionGroups - - - - Label Size + + + + Qt::Horizontal - + + QSizePolicy::Preferred + + + + 40 + 20 + + + @@ -285,6 +278,13 @@ for ProjectionGroups + + + + Label Size + + + @@ -360,6 +360,13 @@ for ProjectionGroups + + + + Projection Group Angle + + + @@ -373,13 +380,6 @@ for ProjectionGroups - - - - Projection Group Angle - - - @@ -794,19 +794,6 @@ for ProjectionGroups - - - - Qt::Horizontal - - - - 40 - 20 - - - - @@ -843,6 +830,19 @@ for ProjectionGroups + + + + Qt::Horizontal + + + + 40 + 20 + + + + diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawHLR.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawHLR.ui index 7b1f2715a0..15e0f4fa4d 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawHLR.ui +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawHLR.ui @@ -49,101 +49,6 @@ - - - - Visible - - - - - - - - 0 - 0 - - - - - 140 - 16777215 - - - - Number of ISO lines per face edge - - - Qt::AlignRight - - - IsoCount - - - Mod/TechDraw/HLR - - - - - - - - 0 - 0 - - - - - true - - - - Show seam lines - - - Show Seam Lines - - - true - - - SeamViz - - - Mod/TechDraw/HLR - - - - - - - - 0 - 0 - - - - - true - - - - Show smooth lines - - - Show Smooth Lines - - - true - - - SmoothViz - - - Mod/TechDraw/HLR - - - @@ -172,60 +77,46 @@ Fast, but result is a collection of short straight lines. - - - - - 0 - 0 - - - - - true - - - - Show hidden smooth edges - + + - Show Smooth Lines - - - SmoothHid - - - Mod/TechDraw/HLR + Visible - - - - - 0 - 0 - + + + + Qt::Horizontal - - - true - - - - Show hidden hard and outline edges + + + 40 + 20 + + + + + - Show Hard Lines - - - HardHid - - - Mod/TechDraw/HLR + Hidden + + + + Qt::Horizontal + + + + 40 + 20 + + + + @@ -265,6 +156,120 @@ Fast, but result is a collection of short straight lines. + + + + + 0 + 0 + + + + + true + + + + Show hidden hard and outline edges + + + Show Hard Lines + + + HardHid + + + Mod/TechDraw/HLR + + + + + + + + 0 + 0 + + + + + true + + + + Show smooth lines + + + Show Smooth Lines + + + true + + + SmoothViz + + + Mod/TechDraw/HLR + + + + + + + + 0 + 0 + + + + + true + + + + Show hidden smooth edges + + + Show Smooth Lines + + + SmoothHid + + + Mod/TechDraw/HLR + + + + + + + + 0 + 0 + + + + + true + + + + Show seam lines + + + Show Seam Lines + + + true + + + SeamViz + + + Mod/TechDraw/HLR + + + @@ -292,6 +297,33 @@ Fast, but result is a collection of short straight lines. + + + + + 0 + 0 + + + + + true + + + + Make lines of equal parameterization + + + Show UV ISO Lines + + + IsoViz + + + Mod/TechDraw/HLR + + + @@ -319,13 +351,6 @@ Fast, but result is a collection of short straight lines. - - - - Hidden - - - @@ -344,60 +369,35 @@ Fast, but result is a collection of short straight lines. - - + + 0 0 - - - true - + + + 140 + 16777215 + - Make lines of equal parameterization + Number of ISO lines per face edge - - Show UV ISO Lines + + Qt::AlignRight - IsoViz + IsoCount Mod/TechDraw/HLR - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - + diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawScale.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawScale.ui index b4b258c52d..4a4c6549ac 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawScale.ui +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawScale.ui @@ -247,8 +247,8 @@ - - + + 0 @@ -262,16 +262,19 @@ - Size of template field click handles + Scale of vertex dots. Multiplier of line width. + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - 3.000000000000000 + 5.000000000000000 - TemplateDotSize + VertexScale Mod/TechDraw/General @@ -290,7 +293,20 @@ - + + + + Qt::Horizontal + + + + 40 + 20 + + + + + @@ -334,6 +350,44 @@ + + + + + 0 + 0 + + + + + 174 + 0 + + + + Size of template field click handles + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 3.000000000000000 + + + TemplateDotSize + + + Mod/TechDraw/General + + + + + + + Welding Symbol Scale + + + @@ -356,61 +410,7 @@ - - - - Welding Symbol Scale - - - - - - - - 0 - 0 - - - - - 174 - 0 - - - - Scale of vertex dots. Multiplier of line width. - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 5.000000000000000 - - - VertexScale - - - Mod/TechDraw/General - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - + diff --git a/src/Mod/TechDraw/Gui/TaskCosVertex.ui b/src/Mod/TechDraw/Gui/TaskCosVertex.ui index 12e6989744..b9b640e538 100644 --- a/src/Mod/TechDraw/Gui/TaskCosVertex.ui +++ b/src/Mod/TechDraw/Gui/TaskCosVertex.ui @@ -32,7 +32,14 @@ - + + + + Base View + + + + false @@ -48,14 +55,7 @@ - - - - Base View - - - - + diff --git a/src/Mod/TechDraw/Gui/TaskCosmeticLine.ui b/src/Mod/TechDraw/Gui/TaskCosmeticLine.ui index acdb774441..05c93b5610 100644 --- a/src/Mod/TechDraw/Gui/TaskCosmeticLine.ui +++ b/src/Mod/TechDraw/Gui/TaskCosmeticLine.ui @@ -89,6 +89,13 @@ + + + + + + + @@ -96,8 +103,8 @@ - - + + @@ -110,13 +117,6 @@ - - - - - - - @@ -155,13 +155,6 @@ - - - - - - - @@ -169,6 +162,13 @@ + + + + + + + diff --git a/src/Mod/TechDraw/Gui/TaskCustomizeFormat.ui b/src/Mod/TechDraw/Gui/TaskCustomizeFormat.ui index b4454bf295..00ec0ec697 100644 --- a/src/Mod/TechDraw/Gui/TaskCustomizeFormat.ui +++ b/src/Mod/TechDraw/Gui/TaskCustomizeFormat.ui @@ -28,6 +28,23 @@ + + + + GD&T + + + + + + + Straightness + + + ⏤ + + + @@ -38,16 +55,6 @@ - - - - Angularity - - - ∠ - - - @@ -68,10 +75,13 @@ - - + + + + Parallelism + - GD&T + ∥ @@ -85,23 +95,13 @@ - - + + - Parallelism + Angularity - ∥ - - - - - - - Total runout - - - ⌰ + ∠ @@ -120,16 +120,6 @@ - - - - Straightness - - - ⏤ - - - @@ -150,6 +140,16 @@ + + + + Total runout + + + ⌰ + + + @@ -191,6 +191,81 @@ + + + + + 9 + + + + derived geometry element + + + Ⓐ + + + + + + + + 9 + + + + Minimax (Tschebyschew) + + + Ⓒ + + + + + + + + 9 + + + + Hull condition + + + Ⓔ + + + + + + + + 9 + + + + Free state + + + Ⓕ + + + + + + + + 9 + + + + Least square geometry element + + + Ⓖ + + + @@ -206,6 +281,51 @@ + + + + + 9 + + + + Maximum material condition (MMC) + + + Ⓜ + + + + + + + + 9 + + + + least inscribed geometry element + + + Ⓝ + + + + + + + + 9 + + + + Projected tolerance zone + + + Ⓟ + + + @@ -236,81 +356,6 @@ - - - - - 9 - - - - Unequal Bilateral - - - Ⓤ - - - - - - - - 9 - - - - least inscribed geometry element - - - Ⓝ - - - - - - - - 9 - - - - Least square geometry element - - - Ⓖ - - - - - - - - 9 - - - - Minimax (Tschebyschew) - - - Ⓒ - - - - - - - - 9 - - - - Maximum material condition (MMC) - - - Ⓜ - - - @@ -326,48 +371,18 @@ - - + + 9 - derived geometry element + Unequal Bilateral - Ⓐ - - - - - - - - 9 - - - - Free state - - - Ⓕ - - - - - - - - 9 - - - - Projected tolerance zone - - - Ⓟ + Ⓤ @@ -386,22 +401,7 @@ - - - - - 9 - - - - Hull condition - - - Ⓔ - - - - + @@ -432,16 +432,6 @@ - - - - Diameter of sphere - - - S⌀ - - - @@ -452,6 +442,16 @@ + + + + Diameter of sphere + + + S⌀ + + + @@ -483,26 +483,6 @@ - - - - (Arc) Tertie - - - ‴ - - - - - - - (Arc) Second - - - ″ - - - @@ -513,7 +493,27 @@ - + + + + (Arc) Second + + + ″ + + + + + + + (Arc) Tertie + + + ‴ + + + + @@ -527,13 +527,13 @@ 0 - - + + - Plus - Minus + Taper - ± + ⌲ @@ -547,16 +547,6 @@ - - - - Countersink - - - ⌵ - - - @@ -567,13 +557,23 @@ - - + + - Taper + Countersink - ⌲ + ⌵ + + + + + + + Plus - Minus + + + ± @@ -638,16 +638,6 @@ - - - - Small phi - - - φ - - - @@ -668,16 +658,6 @@ - - - - Small omega - - - ⍵ - - - @@ -698,17 +678,30 @@ - - - - - - + + + + Small phi + - Preview: + φ + + + + Small omega + + + ⍵ + + + + + + + @@ -716,6 +709,16 @@ + + + + + + + Preview: + + + @@ -723,10 +726,7 @@ - - - - + diff --git a/src/Mod/TechDraw/Gui/TaskDetail.ui b/src/Mod/TechDraw/Gui/TaskDetail.ui index d2063edada..d757604008 100644 --- a/src/Mod/TechDraw/Gui/TaskDetail.ui +++ b/src/Mod/TechDraw/Gui/TaskDetail.ui @@ -32,6 +32,13 @@ + + + + Base View + + + @@ -48,13 +55,6 @@ - - - - Base View - - - @@ -120,10 +120,10 @@ - - + + - Reference + X @@ -159,6 +159,94 @@ + + + + Y + + + + + + + y position of detail highlight within view + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + false + + + + + + + + + + Radius + + + + + + + size of detail view + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + false + + + + + + 10.000000000000000 + + + + + + + Scale Type + + + + + + + Page: scale factor of page is used +Automatic: if the detail view is larger than the page, + it will be scaled down to fit into the page +Custom: custom scale factor is used + + + + Page + + + + + Automatic + + + + + Custom + + + + + + + + Scale Factor + + + @@ -184,50 +272,10 @@ - - + + - X - - - - - - - size of detail view - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - false - - - - - - 10.000000000000000 - - - - - - - Scale Factor - - - - - - - Y - - - - - - - Radius + Reference @@ -241,55 +289,7 @@ - - - - y position of detail highlight within view - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - false - - - - - - - - - - Page: scale factor of page is used -Automatic: if the detail view is larger than the page, - it will be scaled down to fit into the page -Custom: custom scale factor is used - - - - Page - - - - - Automatic - - - - - Custom - - - - - - - - Scale Type - - - - + diff --git a/src/Mod/TechDraw/Gui/TaskDimension.ui b/src/Mod/TechDraw/Gui/TaskDimension.ui index 690867e09f..1fc2c1b709 100644 --- a/src/Mod/TechDraw/Gui/TaskDimension.ui +++ b/src/Mod/TechDraw/Gui/TaskDimension.ui @@ -313,23 +313,6 @@ be used instead if the dimension value - - - - Extension line angle - - - - - - - Set dimension line angle to default (ortho view). - - - Use default - - - @@ -340,13 +323,10 @@ be used instead if the dimension value - - - - Set dimension line angle to match selected edge or vertices. - + + - Use selection + Dimension line angle @@ -366,6 +346,33 @@ be used instead if the dimension value + + + + Set dimension line angle to default (ortho view). + + + Use default + + + + + + + Set dimension line angle to match selected edge or vertices. + + + Use selection + + + + + + + Extension line angle + + + @@ -382,23 +389,6 @@ be used instead if the dimension value - - - - Dimension line angle - - - - - - - Set extension line angle to match selected edge or vertices. - - - Use selection - - - @@ -409,7 +399,17 @@ be used instead if the dimension value - + + + + Set extension line angle to match selected edge or vertices. + + + Use selection + + + + diff --git a/src/Mod/TechDraw/Gui/TaskGeomHatch.ui b/src/Mod/TechDraw/Gui/TaskGeomHatch.ui index e4c5b53573..009d229f53 100644 --- a/src/Mod/TechDraw/Gui/TaskGeomHatch.ui +++ b/src/Mod/TechDraw/Gui/TaskGeomHatch.ui @@ -40,7 +40,14 @@ - + + + + Pattern File + + + + @@ -53,14 +60,7 @@ - - - - Pattern File - - - - + @@ -71,20 +71,6 @@ - - - - Line Weight - - - - - - - Pattern Scale - - - @@ -98,13 +84,6 @@ - - - - Line Color - - - @@ -118,16 +97,10 @@ - - - - - 0 - 22 - - - - Color of pattern lines + + + + Pattern Scale @@ -159,6 +132,13 @@ + + + + Line Weight + + + @@ -187,7 +167,27 @@ - + + + + Line Color + + + + + + + + 0 + 22 + + + + Color of pattern lines + + + + diff --git a/src/Mod/TechDraw/Gui/TaskHatch.ui b/src/Mod/TechDraw/Gui/TaskHatch.ui index bf309de485..8062f60cd3 100644 --- a/src/Mod/TechDraw/Gui/TaskHatch.ui +++ b/src/Mod/TechDraw/Gui/TaskHatch.ui @@ -40,7 +40,14 @@ - + + + + Pattern File + + + + @@ -53,36 +60,29 @@ - - - - Pattern File - - - - + - - - - - 0 - 22 - - - - Color of pattern lines + + + + Pattern Scale - - - - Line Color + + + + Qt::Horizontal - + + + 40 + 20 + + + @@ -112,27 +112,27 @@ - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - + + - Pattern Scale + Line Color - + + + + + 0 + 22 + + + + Color of pattern lines + + + + diff --git a/src/Mod/TechDraw/Gui/TaskLinkDim.ui b/src/Mod/TechDraw/Gui/TaskLinkDim.ui index d4b21d5a47..889f1a7872 100644 --- a/src/Mod/TechDraw/Gui/TaskLinkDim.ui +++ b/src/Mod/TechDraw/Gui/TaskLinkDim.ui @@ -61,8 +61,35 @@ - - + + + + Feature1: + + + + + + + Qt::NoFocus + + + color: rgb(120, 120, 120); + + + true + + + + + + + Geometry1: + + + + + Qt::NoFocus @@ -94,46 +121,6 @@ - - - - Qt::NoFocus - - - color: rgb(120, 120, 120); - - - true - - - - - - - Feature1: - - - - - - - Qt::NoFocus - - - color: rgb(120, 120, 120); - - - true - - - - - - - Geometry1: - - - @@ -141,7 +128,20 @@ - + + + + Qt::NoFocus + + + color: rgb(120, 120, 120); + + + true + + + + diff --git a/src/Mod/TechDraw/Gui/TaskMoveView.ui b/src/Mod/TechDraw/Gui/TaskMoveView.ui index 3ec255a504..ac484a14c7 100644 --- a/src/Mod/TechDraw/Gui/TaskMoveView.ui +++ b/src/Mod/TechDraw/Gui/TaskMoveView.ui @@ -16,17 +16,10 @@ - - + + - ... - - - - - - - ... + View to move @@ -37,27 +30,13 @@ - - + + ... - - - - true - - - - - - - true - - - @@ -65,6 +44,20 @@ + + + + true + + + + + + + ... + + + @@ -72,10 +65,17 @@ - - + + + + true + + + + + - View to move + ... diff --git a/src/Mod/TechDraw/Gui/TaskProjGroup.ui b/src/Mod/TechDraw/Gui/TaskProjGroup.ui index 62973a9e24..60750a5cde 100644 --- a/src/Mod/TechDraw/Gui/TaskProjGroup.ui +++ b/src/Mod/TechDraw/Gui/TaskProjGroup.ui @@ -193,54 +193,6 @@ - - - - false - - - - 11 - 50 - false - false - - - - Qt::NoFocus - - - Current primary view direction - - - Qt::AlignCenter - - - true - - - - - - - Rotate right - - - - - - - :/icons/arrow-right.svg - - - - - 24 - 24 - - - - @@ -289,7 +241,68 @@ - + + + + false + + + + 11 + 50 + false + false + + + + Qt::NoFocus + + + Current primary view direction + + + Qt::AlignCenter + + + true + + + + + + + Rotate right + + + + + + + :/icons/arrow-right.svg + + + + + 24 + 24 + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + Rotate down @@ -323,20 +336,7 @@ - - - - Qt::Horizontal - - - - 40 - 20 - - - - - + @@ -361,13 +361,50 @@ - - - - true - + + - Bottom + LeftFrontTop + + + QCheckBox::indicator { +width: 24px; +height: 24px; +} + + + + + + + + 24 + 24 + + + + + + + + Top + + + QCheckBox::indicator { +width: 24px; +height: 24px; +} + + + + + + + + + + + RightFrontTop QCheckBox::indicator { @@ -394,6 +431,23 @@ height: 24px; + + + + Left + + + QCheckBox::indicator { +width: 24px; +height: 24px; +} + + + + + + + @@ -434,23 +488,10 @@ height: 24px; - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - + + - Left + Rear QCheckBox::indicator { @@ -464,6 +505,19 @@ height: 24px; + + + + Qt::Horizontal + + + + 40 + 20 + + + + @@ -481,10 +535,13 @@ height: 24px; - - + + + + true + - Top + Bottom QCheckBox::indicator { @@ -515,64 +572,7 @@ height: 24px; - - - - RightFrontTop - - - QCheckBox::indicator { -width: 24px; -height: 24px; -} - - - - - - - - - - - Rear - - - QCheckBox::indicator { -width: 24px; -height: 24px; -} - - - - - - - - - - - LeftFrontTop - - - QCheckBox::indicator { -width: 24px; -height: 24px; -} - - - - - - - - 24 - 24 - - - - - + @@ -660,6 +660,25 @@ using the given X/Y Spacing + + + + + 0 + 0 + + + + + 0 + 0 + + + + X Spacing + + + @@ -701,25 +720,6 @@ using the given X/Y Spacing - - - - - 0 - 0 - - - - - 0 - 0 - - - - X Spacing - - - diff --git a/src/Mod/TechDraw/Gui/TaskRestoreLines.ui b/src/Mod/TechDraw/Gui/TaskRestoreLines.ui index f8199ce9d3..68cfe0c9cb 100644 --- a/src/Mod/TechDraw/Gui/TaskRestoreLines.ui +++ b/src/Mod/TechDraw/Gui/TaskRestoreLines.ui @@ -23,27 +23,6 @@ - - - - Geometry - - - - - - - CenterLine - - - - - - - Cosmetic - - - @@ -54,6 +33,13 @@ + + + + Geometry + + + @@ -64,6 +50,13 @@ + + + + Cosmetic + + + @@ -74,6 +67,13 @@ + + + + CenterLine + + + diff --git a/src/Mod/TechDraw/Gui/TaskSectionView.ui b/src/Mod/TechDraw/Gui/TaskSectionView.ui index 1ba05239ba..2b4a8962eb 100644 --- a/src/Mod/TechDraw/Gui/TaskSectionView.ui +++ b/src/Mod/TechDraw/Gui/TaskSectionView.ui @@ -22,10 +22,10 @@ - - + + - Scale + BaseView @@ -42,26 +42,6 @@ - - - - - 0 - 22 - - - - Identifier for this section - - - - - - - BaseView - - - @@ -82,6 +62,61 @@ + + + + + 0 + 22 + + + + Identifier for this section + + + + + + + Scale Type + + + + + + + + 0 + 22 + + + + Scale Page/Auto/Custom + + + + Page + + + + + Automatic + + + + + Custom + + + + + + + + Scale + + + @@ -122,42 +157,7 @@ - - - - - 0 - 22 - - - - Scale Page/Auto/Custom - - - - Page - - - - - Automatic - - - - - Custom - - - - - - - - Scale Type - - - - + diff --git a/src/Mod/TechDraw/Gui/TaskWeldingSymbol.ui b/src/Mod/TechDraw/Gui/TaskWeldingSymbol.ui index 737b50c6bf..1614a43a6e 100644 --- a/src/Mod/TechDraw/Gui/TaskWeldingSymbol.ui +++ b/src/Mod/TechDraw/Gui/TaskWeldingSymbol.ui @@ -36,7 +36,15 @@ - + + + + Text above arrow side symbol +Angle, surface finish, root + + + + Text before arrow side symbol @@ -44,14 +52,6 @@ Preparation depth, (weld size) - - - - Text after arrow side symbol -Number of welds × length, (gap) - - - @@ -86,15 +86,15 @@ Number of welds × length, (gap) - - + + - Text above arrow side symbol -Angle, surface finish, root + Text after arrow side symbol +Number of welds × length, (gap) - + @@ -115,6 +115,14 @@ Angle, surface finish, root + + + + Text before other side symbol +Preparation depth, (weld size) + + + @@ -125,14 +133,6 @@ Angle, surface finish, root - - - - Text below arrow side symbol -Angle, surface finish, root - - - @@ -141,48 +141,6 @@ Number of welds × length, (gap) - - - - - 0 - 0 - - - - - 60 - 30 - - - - - 60 - 30 - - - - - 60 - 30 - - - - Flips the sides - - - Flip Sides - - - - - - - Text before other side symbol -Preparation depth, (weld size) - - - @@ -217,7 +175,49 @@ Preparation depth, (weld size) - + + + + Text below arrow side symbol +Angle, surface finish, root + + + + + + + + 0 + 0 + + + + + 60 + 30 + + + + + 60 + 30 + + + + + 60 + 30 + + + + Flips the sides + + + Flip Sides + + + + @@ -268,21 +268,14 @@ at the kink in the leader line - - - - Directory path for welding symbols. -This directory will be used for the symbol selection. - - - Gui::FileChooser::Directory - - - *.svg + + + + Tail Text - + @@ -302,14 +295,21 @@ This directory will be used for the symbol selection. - - - - Tail Text + + + + Directory path for welding symbols. +This directory will be used for the symbol selection. + + + Gui::FileChooser::Directory + + + *.svg - +