diff --git a/src/Mod/Draft/Resources/ui/TaskPanel_CircularArray.ui b/src/Mod/Draft/Resources/ui/TaskPanel_CircularArray.ui index 774f1c68de..a72aaefde1 100644 --- a/src/Mod/Draft/Resources/ui/TaskPanel_CircularArray.ui +++ b/src/Mod/Draft/Resources/ui/TaskPanel_CircularArray.ui @@ -38,18 +38,112 @@ - - - - Qt::Vertical + + + + (Placeholder for the icon) - - - 20 - 40 - - - + + + + + + + + Distance from one layer of objects to the next layer of objects. + + + Radial distance + + + + + + + Distance from one layer of objects to the next layer of objects. + + + + + + 200.000000000000000 + + + + + + + Distance from one element in one ring of the array to the next element in the same ring. +It cannot be zero. + + + Tangential distance + + + + + + + Distance from one element in one ring of the array to the next element in the same ring. +It cannot be zero. + + + + + + 100.000000000000000 + + + + + + + Number of circular layers or rings to create, including a copy of the original object. +It must be at least 2. + + + Number of circular layers + + + + + + + Number of circular layers or rings to create, including a copy of the original object. +It must be at least 2. + + + 2 + + + 3 + + + + + + + The number of symmetry lines in the circular array. + + + Symmetry + + + + + + + The number of symmetry lines in the circular array. + + + 1 + + + 1 + + + + @@ -63,13 +157,6 @@ Change the direction of the axis itself in the property editor. - - - - Z - - - @@ -77,39 +164,6 @@ Change the direction of the axis itself in the property editor. - - - - Y - - - - - - - - 0 - 0 - - - - - - - - - - - - 0 - 0 - - - - - - - @@ -123,7 +177,47 @@ Change the direction of the axis itself in the property editor. - + + + + Y + + + + + + + + 0 + 0 + + + + + + + + + + + Z + + + + + + + + 0 + 0 + + + + + + + + @@ -167,114 +261,20 @@ A Link array is more efficient when creating multiple copies, but it cannot be f - - - - - - Distance from one element in one ring of the array to the next element in the same ring. -It cannot be zero. - - - Tangential distance - - - - - - - Distance from one element in one ring of the array to the next element in the same ring. -It cannot be zero. - - - - - - 100.000000000000000 - - - - - - - Distance from one layer of objects to the next layer of objects. - - - Radial distance - - - - - - - Distance from one layer of objects to the next layer of objects. - - - - - - 200.000000000000000 - - - - - - - The number of symmetry lines in the circular array. - - - 1 - - - 1 - - - - - - - Number of circular layers or rings to create, including a copy of the original object. -It must be at least 2. - - - 2 - - - 3 - - - - - - - Number of circular layers or rings to create, including a copy of the original object. -It must be at least 2. - - - Number of circular layers - - - - - - - The number of symmetry lines in the circular array. - - - Symmetry - - - - - - - - - (Placeholder for the icon) + + + + Qt::Vertical - + + + 20 + 40 + + + - + diff --git a/src/Mod/Draft/Resources/ui/TaskPanel_OrthoArray.ui b/src/Mod/Draft/Resources/ui/TaskPanel_OrthoArray.ui index be77be04cd..016880d089 100644 --- a/src/Mod/Draft/Resources/ui/TaskPanel_OrthoArray.ui +++ b/src/Mod/Draft/Resources/ui/TaskPanel_OrthoArray.ui @@ -38,6 +38,263 @@ + + + + (Placeholder for the icon) + + + + + + + Number of elements in the array in the specified direction, including a copy of the original object. +The number must be at least 1 in each direction. + + + Number of elements + + + + + + + + X + + + + + + + 1 + + + 2 + + + + + + + Y + + + + + + + 1 + + + 2 + + + + + + + Z + + + + + + + 1 + + + 1 + + + + + + + + + + + + Distance between the elements in the X direction. +Normally, only the X value is necessary; the other two values can give an additional shift in their respective directions. +Negative values will result in copies produced in the negative direction. + + + X intervals + + + + + + + + X + + + + + + + + 0 + 0 + + + + + + + 100.000000000000000 + + + + + + + Y + + + + + + + + 0 + 0 + + + + + + + + + + + Z + + + + + + + + 0 + 0 + + + + + + + + + + + + + Reset the distances. + + + Reset X + + + + + + + + + + Distance between the elements in the Y direction. +Normally, only the Y value is necessary; the other two values can give an additional shift in their respective directions. +Negative values will result in copies produced in the negative direction. + + + Y intervals + + + + + + + + X + + + + + + + + 0 + 0 + + + + + + + + + + + Y + + + + + + + + 0 + 0 + + + + + + + 100.000000000000000 + + + + + + + Z + + + + + + + + 0 + 0 + + + + + + + + + + + + + Reset the distances. + + + Reset Y + + + + + + @@ -51,20 +308,6 @@ Negative values will result in copies produced in the negative direction. - - - - Z - - - - - - - Y - - - @@ -85,6 +328,13 @@ Negative values will result in copies produced in the negative direction. + + + + Y + + + @@ -98,6 +348,13 @@ Negative values will result in copies produced in the negative direction. + + + + Z + + + @@ -171,264 +428,7 @@ A Link array is more efficient when creating multiple copies, but it cannot be f - - - - (Placeholder for the icon) - - - - - - - Distance between the elements in the X direction. -Normally, only the X value is necessary; the other two values can give an additional shift in their respective directions. -Negative values will result in copies produced in the negative direction. - - - X intervals - - - - - - - - Z - - - - - - - - 0 - 0 - - - - - - - 100.000000000000000 - - - - - - - - 0 - 0 - - - - - - - - - - - - 0 - 0 - - - - - - - - - - - X - - - - - - - Y - - - - - - - - - Reset the distances. - - - Reset X - - - - - - - - - - Distance between the elements in the Y direction. -Normally, only the Y value is necessary; the other two values can give an additional shift in their respective directions. -Negative values will result in copies produced in the negative direction. - - - Y intervals - - - - - - - - X - - - - - - - Y - - - - - - - Z - - - - - - - - 0 - 0 - - - - - - - - - - - - 0 - 0 - - - - - - - 100.000000000000000 - - - - - - - - 0 - 0 - - - - - - - - - - - - - Reset the distances. - - - Reset Y - - - - - - - - - - Number of elements in the array in the specified direction, including a copy of the original object. -The number must be at least 1 in each direction. - - - Number of elements - - - - - - - - X - - - - - - - Z - - - - - - - Y - - - - - - - 1 - - - 2 - - - - - - - 1 - - - 2 - - - - - - - 1 - - - 1 - - - - - - - - - + diff --git a/src/Mod/Draft/Resources/ui/TaskPanel_PolarArray.ui b/src/Mod/Draft/Resources/ui/TaskPanel_PolarArray.ui index f8e2c57659..05e4763865 100644 --- a/src/Mod/Draft/Resources/ui/TaskPanel_PolarArray.ui +++ b/src/Mod/Draft/Resources/ui/TaskPanel_PolarArray.ui @@ -38,136 +38,14 @@ - - - - Qt::Vertical + + + + (Placeholder for the icon) - - - 20 - 40 - - - - - - - - The coordinates of the point through which the axis of rotation passes. -Change the direction of the axis itself in the property editor. - - - Center of rotation - - - - - - - - Z - - - - - - - - 0 - 0 - - - - - - - - - - - - 0 - 0 - - - - - - - - - - - - 0 - 0 - - - - - - - - - - - X - - - - - - - Y - - - - - - - - - Reset the coordinates of the center of rotation. - - - Reset point - - - - - - - - - - If checked, the resulting objects in the array will be fused if they touch each other. -This only works if "Link array" is off. - - - Fuse - - - - - - - If checked, the resulting object will be a "Link array" instead of a regular array. -A Link array is more efficient when creating multiple copies, but it cannot be fused together. - - - Link array - - - true - - - - - - + @@ -229,14 +107,136 @@ It must be at least 2. - - - - (Placeholder for the icon) + + + + The coordinates of the point through which the axis of rotation passes. +Change the direction of the axis itself in the property editor. + + Center of rotation + + + + + + + + X + + + + + + + + 0 + 0 + + + + + + + + + + + Y + + + + + + + + 0 + 0 + + + + + + + + + + + Z + + + + + + + + 0 + 0 + + + + + + + + + + + + + Reset the coordinates of the center of rotation. + + + Reset point + + + + - + + + + + + If checked, the resulting objects in the array will be fused if they touch each other. +This only works if "Link array" is off. + + + Fuse + + + + + + + If checked, the resulting object will be a "Link array" instead of a regular array. +A Link array is more efficient when creating multiple copies, but it cannot be fused together. + + + Link array + + + true + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + diff --git a/src/Mod/Draft/Resources/ui/TaskPanel_SetStyle.ui b/src/Mod/Draft/Resources/ui/TaskPanel_SetStyle.ui index 14b6edec4f..1eba0aa74a 100644 --- a/src/Mod/Draft/Resources/ui/TaskPanel_SetStyle.ui +++ b/src/Mod/Draft/Resources/ui/TaskPanel_SetStyle.ui @@ -60,20 +60,6 @@ QLayout::SetDefaultConstraint - - - - The color of faces - - - - - - - Draw style - - - @@ -81,6 +67,13 @@ + + + + The color of lines + + + @@ -88,10 +81,17 @@ - - - - The color of lines + + + + px + + + + + + + Draw style @@ -122,13 +122,6 @@ - - - - px - - - @@ -170,6 +163,13 @@ + + + + The color of faces + + + @@ -199,6 +199,95 @@ Annotations + + + + Text font + + + + + + + + 0 + 0 + + + + The font to use for texts and dimensions + + + + + + + Text size + + + + + + + The size of texts and dimension texts + + + + + + + + + + Text spacing + + + + + + + The space between the text and the dimension line + + + + + + + + + + Text color + + + + + + + The color of texts and dimension texts + + + + + + + Line spacing + + + + + + + The spacing between different lines of text + + + + + + + Arrow style + + + @@ -231,74 +320,10 @@ - - + + - Text font - - - - - - - Text color - - - - - - - - 0 - 0 - - - - The font to use for texts and dimensions - - - - - - - Text size - - - - - - - The color of texts and dimension texts - - - - - - - The size of texts and dimension texts - - - - - - - - - - Arrow style - - - - - - - If the unit suffix is shown on dimension texts or not - - - Qt::RightToLeft - - - + Arrow size @@ -319,10 +344,16 @@ - - + + + + If the unit suffix is shown on dimension texts or not + + + Qt::RightToLeft + - Arrow size + @@ -340,38 +371,7 @@ - - - - Text spacing - - - - - - - The space between the text and the dimension line - - - - - - - - - - Line spacing - - - - - - - The spacing between different lines of text - - - - + diff --git a/src/Mod/Draft/Resources/ui/TaskSelectPlane.ui b/src/Mod/Draft/Resources/ui/TaskSelectPlane.ui index 690dc214cf..2d70caeff4 100644 --- a/src/Mod/Draft/Resources/ui/TaskSelectPlane.ui +++ b/src/Mod/Draft/Resources/ui/TaskSelectPlane.ui @@ -81,6 +81,13 @@ view each time a command is started + + + + Offset + + + @@ -93,13 +100,6 @@ of the buttons above - - - - Offset - - - @@ -192,27 +192,6 @@ will be moved to the center of the view - - - - The distance at which a point can be snapped to -when approaching the mouse. You can also change this -value by using the [ and ] keys while drawing - - - - - - - The distance at which a point can be snapped to -when approaching the mouse. You can also change this -value by using the [ and ] keys while drawing - - - Snapping radius - - - @@ -233,7 +212,28 @@ value by using the [ and ] keys while drawing - + + + + The distance at which a point can be snapped to +when approaching the mouse. You can also change this +value by using the [ and ] keys while drawing + + + Snapping radius + + + + + + + The distance at which a point can be snapped to +when approaching the mouse. You can also change this +value by using the [ and ] keys while drawing + + + + diff --git a/src/Mod/Draft/Resources/ui/TaskShapeString.ui b/src/Mod/Draft/Resources/ui/TaskShapeString.ui index cc16b4d75c..fc6f2d9c42 100644 --- a/src/Mod/Draft/Resources/ui/TaskShapeString.ui +++ b/src/Mod/Draft/Resources/ui/TaskShapeString.ui @@ -40,26 +40,6 @@ - - - - Enter coordinates or select point with mouse. - - - - - - - - - - Enter coordinates or select point with mouse. - - - - - - @@ -67,8 +47,8 @@ - - + + Enter coordinates or select point with mouse. @@ -84,6 +64,16 @@ + + + + Enter coordinates or select point with mouse. + + + + + + @@ -91,79 +81,17 @@ - - - - - - - - Font file - - - - - - - - - - - - + + - Text to be made into ShapeString - - - - - - - String - - - - - - - - - - - Height - - - - - - - Height of the result + Enter coordinates or select point with mouse. - - 0.000000000000000 - - - 10.000000000000000 - - - - - - - Qt::Vertical - - - - 20 - 40 - - - + @@ -195,7 +123,79 @@ - + + + + + + String + + + + + + + Text to be made into ShapeString + + + + + + + + + + + Height + + + + + + + Height of the result + + + + + + 0.000000000000000 + + + 10.000000000000000 + + + + + + + + + + + Font file + + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + diff --git a/src/Mod/Draft/Resources/ui/dialogHatch.ui b/src/Mod/Draft/Resources/ui/dialogHatch.ui index e7ec28ccf1..2215ff9044 100644 --- a/src/Mod/Draft/Resources/ui/dialogHatch.ui +++ b/src/Mod/Draft/Resources/ui/dialogHatch.ui @@ -14,8 +14,12 @@ Form - - + + + + PAT file: + + @@ -24,13 +28,16 @@ - - + + - PAT file: + Pattern: + + + @@ -38,13 +45,6 @@ - - - - Pattern: - - - diff --git a/src/Mod/Draft/Resources/ui/dialog_AnnotationStyleEditor.ui b/src/Mod/Draft/Resources/ui/dialog_AnnotationStyleEditor.ui index 98ab464e5b..8c744f91bd 100644 --- a/src/Mod/Draft/Resources/ui/dialog_AnnotationStyleEditor.ui +++ b/src/Mod/Draft/Resources/ui/dialog_AnnotationStyleEditor.ui @@ -164,26 +164,6 @@ Text - - - - Font size in the system units - - - Font size - - - - - - - Line spacing in system units - - - Line spacing - - - @@ -213,6 +193,16 @@ + + + + Font size in the system units + + + Font size + + + @@ -223,6 +213,16 @@ + + + + Line spacing in system units + + + Line spacing + + + @@ -249,36 +249,6 @@ - - - - The number of decimals to show for dimension values - - - Decimals - - - - - - - Specify a valid length unit like mm, m, in, ft, to force displaying the dimension value in this unit - - - Unit override - - - - - - - If it is checked it will show the unit next to the dimension value - - - Show unit - - - @@ -292,20 +262,13 @@ - - + + - Specify a valid length unit like mm, m, in, ft, to force displaying the dimension value in this unit + If it is checked it will show the unit next to the dimension value - - - - - - The number of decimals to show for dimension values - - - 2 + + Show unit @@ -322,7 +285,44 @@ - + + + + Specify a valid length unit like mm, m, in, ft, to force displaying the dimension value in this unit + + + Unit override + + + + + + + Specify a valid length unit like mm, m, in, ft, to force displaying the dimension value in this unit + + + + + + + The number of decimals to show for dimension values + + + Decimals + + + + + + + The number of decimals to show for dimension values + + + 2 + + + + @@ -331,36 +331,6 @@ Line and arrows - - - - The width of the dimension lines - - - Line width - - - - - - - The distance that the extension lines are additionally extended beyond the dimension line - - - Extension overshoot - - - - - - - The size of the dimension arrows or markers in system units - - - Arrow size - - - @@ -371,46 +341,6 @@ - - - - The distance that the dimension line is additionally extended - - - Dimension overshoot - - - - - - - The length of the extension lines - - - Extension lines - - - - - - - The type of arrows or markers to use at the end of dimension lines - - - Arrow type - - - - - - - The color of dimension lines, arrows and texts - - - Line / text color - - - @@ -427,6 +357,16 @@ + + + + The width of the dimension lines + + + Line width + + + @@ -440,6 +380,16 @@ + + + + The color of dimension lines, arrows and texts + + + Line / text color + + + @@ -454,6 +404,16 @@ + + + + The type of arrows or markers to use at the end of dimension lines + + + Arrow type + + + @@ -498,6 +458,16 @@ + + + + The size of the dimension arrows or markers in system units + + + Arrow size + + + @@ -508,6 +478,16 @@ + + + + The distance that the dimension line is additionally extended + + + Dimension overshoot + + + @@ -518,6 +498,16 @@ + + + + The length of the extension lines + + + Extension lines + + + @@ -528,6 +518,16 @@ + + + + The distance that the extension lines are additionally extended beyond the dimension line + + + Extension overshoot + + + diff --git a/src/Mod/Draft/Resources/ui/preferences-draft.ui b/src/Mod/Draft/Resources/ui/preferences-draft.ui index 2e289a9190..af02328880 100644 --- a/src/Mod/Draft/Resources/ui/preferences-draft.ui +++ b/src/Mod/Draft/Resources/ui/preferences-draft.ui @@ -241,6 +241,23 @@ This allows to point the direction and type the distance. + + + + Normally, after copying objects, the copies get selected. +If this option is checked, the base objects will be selected instead. + + + Select base objects after copying + + + selectBaseObjects + + + Mod/Draft + + + @@ -277,23 +294,6 @@ Otherwise, they will appear as wireframe - - - - Normally, after copying objects, the copies get selected. -If this option is checked, the base objects will be selected instead. - - - Select base objects after copying - - - selectBaseObjects - - - Mod/Draft - - - diff --git a/src/Mod/Draft/Resources/ui/preferences-draftinterface.ui b/src/Mod/Draft/Resources/ui/preferences-draftinterface.ui index 7dbbd1d8ff..a2f1f226d1 100644 --- a/src/Mod/Draft/Resources/ui/preferences-draftinterface.ui +++ b/src/Mod/Draft/Resources/ui/preferences-draftinterface.ui @@ -31,87 +31,6 @@ 0 - - - - true - - - - 0 - 0 - - - - - 25 - 16777215 - - - - ` - - - 1 - - - - - - false - - - inCommandShortcutCycleSnap - - - Mod/Draft - - - - - - - true - - - - 0 - 0 - - - - - 25 - 16777215 - - - - S - - - 1 - - - - - - false - - - inCommandShortcutSnap - - - Mod/Draft - - - - - - - Close - - - @@ -156,40 +75,10 @@ - - - - true - - - - 0 - 0 - - - - - 25 - 16777215 - - + + - O - - - 1 - - - - - - false - - - inCommandShortcutClose - - - Mod/Draft + Continue @@ -230,10 +119,47 @@ - - + + - Continue + Close + + + + + + + true + + + + 0 + 0 + + + + + 25 + 16777215 + + + + O + + + 1 + + + + + + false + + + inCommandShortcutClose + + + Mod/Draft @@ -244,22 +170,8 @@ - - - - Increase Radius - - - - - - - Cycle Snap - - - - - + + true @@ -276,7 +188,7 @@ - [ + P 1 @@ -288,75 +200,17 @@ false - inCommandShortcutIncreaseRadius + inCommandShortcutCopy Mod/Draft - - - - true - - - - 0 - 0 - - - - - 25 - 16777215 - - + + - ] - - - 1 - - - - - - false - - - inCommandShortcutDecreaseRadius - - - Mod/Draft - - - - - - - Snap - - - - - - - Decrease Radius - - - - - - - Length - - - - - - - Wipe + Subelement Mode @@ -397,10 +251,10 @@ - - + + - Add Hold + Fill @@ -448,8 +302,8 @@ - - + + true @@ -466,7 +320,7 @@ - P + A 1 @@ -478,24 +332,17 @@ false - inCommandShortcutCopy + inCommandShortcutExit Mod/Draft - - + + - Fill - - - - - - - Subelement Mode + Select Edge @@ -536,6 +383,57 @@ + + + + Add Hold + + + + + + + true + + + + 0 + 0 + + + + + 25 + 16777215 + + + + Q + + + 1 + + + + + + false + + + inCommandShortcutAddHold + + + Mod/Draft + + + + + + + Length + + + @@ -573,10 +471,10 @@ - - + + - Select Edge + Wipe @@ -617,80 +515,6 @@ - - - - true - - - - 0 - 0 - - - - - 25 - 16777215 - - - - A - - - 1 - - - - - - false - - - inCommandShortcutExit - - - Mod/Draft - - - - - - - true - - - - 0 - 0 - - - - - 25 - 16777215 - - - - Q - - - 1 - - - - - - false - - - inCommandShortcutAddHold - - - Mod/Draft - - - @@ -735,6 +559,226 @@ + + + + Cycle Snap + + + + + + + true + + + + 0 + 0 + + + + + 25 + 16777215 + + + + ` + + + 1 + + + + + + false + + + inCommandShortcutCycleSnap + + + Mod/Draft + + + + + + + Global + + + + + + + true + + + + 0 + 0 + + + + + 25 + 16777215 + + + + G + + + 1 + + + + + + false + + + inCommandShortcutGlobal + + + Mod/Draft + + + + + + + Snap + + + + + + + true + + + + 0 + 0 + + + + + 25 + 16777215 + + + + S + + + 1 + + + + + + false + + + inCommandShortcutSnap + + + Mod/Draft + + + + + + + Increase Radius + + + + + + + true + + + + 0 + 0 + + + + + 25 + 16777215 + + + + [ + + + 1 + + + + + + false + + + inCommandShortcutIncreaseRadius + + + Mod/Draft + + + + + + + Decrease Radius + + + + + + + true + + + + 0 + 0 + + + + + 25 + 16777215 + + + + ] + + + 1 + + + + + + false + + + inCommandShortcutDecreaseRadius + + + Mod/Draft + + + @@ -867,51 +911,7 @@ - - - - Global - - - - - - - true - - - - 0 - 0 - - - - - 25 - 16777215 - - - - G - - - 1 - - - - - - false - - - inCommandShortcutGlobal - - - Mod/Draft - - - - +