diff --git a/src/Mod/Draft/Resources/ui/preferences-draft.ui b/src/Mod/Draft/Resources/ui/preferences-draft.ui index 0ae8ea6b9c..6999ec4b56 100644 --- a/src/Mod/Draft/Resources/ui/preferences-draft.ui +++ b/src/Mod/Draft/Resources/ui/preferences-draft.ui @@ -11,149 +11,126 @@ - General settings + General - - 6 - - - 9 - - - 9 - - - 9 - - - 9 - - - - - 0 - 0 - - + - General Draft Settings + General - - - - - - - Default working plane - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - defaultWP - - - Mod/Draft - - - - None - - - - - XY (Top) - - - - - XZ (Front) - - - - - YZ (Side) - - - - - + + + + + Internal precision level + + - - - - - - Internal precision level - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 60 - 16777215 - - - - The number of decimals in internal coordinates operations (for ex. 3 = 0.001). Values between 6 and 8 are usually considered the best trade-off among FreeCAD users. - - - 10 - - - 6 - - - precision - - - Mod/Draft - - - - - - - + + + + + 140 + 0 + + - If this option is checked, the layers drop-down list will also show groups, allowing you to automatically add objects to groups too. + The number of decimals used in internal coordinate operations (for example 3 = 0.001). +Values between 6 and 8 are usually considered the best trade-off. + + + 10 + + + 6 + + + precision + + + Mod/Draft + + + + + + + Qt::Horizontal + + + + + + + Default working plane + + + + + + + The default working plane for new views. If set to "Automatic" the working plane +will automatically align with the current view whenever a command is started. +Additionally it will align to preselected planar faces, or when points on planar +faces are picked during commands. + + + 1 + + + defaultWP + + + Mod/Draft + + + + Automatic + + + + + XY (Top) + + + + + XZ (Front) + + + + + YZ (Side) + + + + + + + + If checked, a widget indicating the current working +plane orientation appears when picking points - Show groups in layers list drop-down button + Show working plane tracker - - false + + showPlaneTracker + + + Mod/Draft + + + + + + + If checked, the layers drop-down list also includes groups. +Objects can then automatically be added to groups as well. + + + Include groups in layer list AutogroupAddGroups @@ -167,223 +144,273 @@ - + - Draft tools options + Command options - - - 9 - - - 9 - - - 9 - - - 9 - - - - - 0 + + + + + If checked, instructions are displayed in the Report view when using Draft commands - - - - When drawing lines, set focus on Length instead of X coordinate. -This allows to point the direction and type the distance. - - - Set focus on Length instead of X coordinate - - - focusOnLength - - - Mod/Draft - - - - - - - Force Draft Tools to create Part primitives instead of Draft objects. -Note that this is not fully supported, and many object will be not editable with Draft Modifiers. - - - Use Part Primitives when available - - - UsePartPrimitives - - - Mod/Draft - - - - - - - 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 - - - - - - - If this is checked, prompt messages will be printed -in the report view when using Draft tools, to help -knowing which action to take next. - - - Show prompts in the report view - - - ToolMessages - - - Mod/Draft - - - - + + Show prompts in the Report view + + + ToolMessages + + + Mod/Draft + + - - - - - - Prefix labels of Clones with: - - - - - - - - - - ClonePrefix - - - Mod/Draft - - - - + + + + If checked, Length input, instead of the X coordinate, will have the initial focus. +This allows to indicate a direction and then type a distance. + + + Set focus on Length instead of X coordinate + + + focusOnLength + + + Mod/Draft + + + + + + + If checked, base objects, instead of created copies, are selected after copying + + + Select base objects after copying + + + selectBaseObjects + + + Mod/Draft + + + + + + + If checked, Draft commands will create Part primitives instead of Draft objects. +Note that this is not fully supported, and many objects will not be editable with +Draft modification commands. + + + Create Part primitives if possible + + + UsePartPrimitives + + + Mod/Draft + + + + + + + If checked, Draft Downgrade and Draft Upgrade will keep face colors. +Only for the splitFaces and makeShell options. + + + Keep face colors during downgrade/upgrade + + + preserveFaceColor + + + Mod/Draft + + + + + + + If checked, Draft Downgrade and Draft Upgrade will keep face names. +Only for the splitFaces and makeShell options. + + + Keep face names during downgrade/upgrade + + + preserveFaceNames + + + Mod/Draft + + + + + + + Max. number of editable objects + + + + + + + The maximum number of objects Draft Edit is allowed to process at the same time + + + 1 + + + 25 + + + 5 + + + 10 + + + DraftEditMaxObjects + + + Mod/Draft + + + + + + + Qt::Horizontal + + + + + + + Edit node pick radius + + + + + + + The pick radius of edit nodes + + + px + + + 1 + + + 20 + + + DraftEditPickRadius + + + Mod/Draft + + + + + + + Label prefix for clones + + + + + + + + 140 + 16777215 + + + + The default prefix added to the label of new clones + + + + + + ClonePrefix + + + Mod/Draft + + + + + + + Construction group label + + + + + + + + 140 + 16777215 + + + + The default label for the construction geometry group + + + Construction + + + constructiongroupname + + + Mod/Draft + + + + + + + Construction geometry color + + + + + + + The default color for Draft objects in construction mode + + + + 44 + 125 + 255 + + + + constructioncolor + + + Mod/Draft + + - - - - 0 - 0 - - - - Construction Geometry - - - - - - - - Construction group name - - - - - - - This is the default group name for construction geometry - - - Construction - - - constructiongroupname - - - Mod/Draft - - - - - - - - - - - Construction geometry color - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - This is the default color for objects being drawn while in construction mode. - - - - 44 - 125 - 255 - - - - constructioncolor - - - Mod/Draft - - - - - - - - - - + Qt::Vertical - - - 20 - 40 - - @@ -391,34 +418,34 @@ knowing which action to take next. qPixmapFromMimeSource - - Gui::ColorButton - QPushButton -
Gui/Widgets.h
-
- - Gui::PrefSpinBox - QSpinBox -
Gui/PrefWidgets.h
-
- - Gui::PrefColorButton - Gui::ColorButton -
Gui/PrefWidgets.h
-
Gui::PrefCheckBox QCheckBox
Gui/PrefWidgets.h
+ + Gui::PrefLineEdit + QLineEdit +
Gui/PrefWidgets.h
+
Gui::PrefComboBox QComboBox
Gui/PrefWidgets.h
- Gui::PrefLineEdit - QLineEdit + Gui::PrefSpinBox + QSpinBox +
Gui/PrefWidgets.h
+
+ + Gui::ColorButton + QPushButton +
Gui/Widgets.h
+
+ + Gui::PrefColorButton + Gui::ColorButton
Gui/PrefWidgets.h
diff --git a/src/Mod/Draft/Resources/ui/preferences-draftinterface.ui b/src/Mod/Draft/Resources/ui/preferences-draftinterface.ui index 6e4aa1014b..da09ddb214 100644 --- a/src/Mod/Draft/Resources/ui/preferences-draftinterface.ui +++ b/src/Mod/Draft/Resources/ui/preferences-draftinterface.ui @@ -11,1047 +11,782 @@ - User interface settings + Interface - - 6 - - - 9 - + + + + In-command shortcuts + + + + + + Relative + + + + + + + + 25 + 16777215 + + + + R + + + 1 + + + false + + + inCommandShortcutRelative + + + Mod/Draft + + + + + + + Qt::Horizontal + + + + + + + Global + + + + + + + + 25 + 16777215 + + + + G + + + 1 + + + false + + + inCommandShortcutGlobal + + + Mod/Draft + + + + + + + Qt::Horizontal + + + + + + + Length + + + + + + + + 25 + 16777215 + + + + L + + + 1 + + + false + + + inCommandShortcutLength + + + Mod/Draft + + + + + + + Qt::Horizontal + + + + + + + Fill + + + + + + + + 25 + 16777215 + + + + F + + + 1 + + + false + + + inCommandShortcutFill + + + Mod/Draft + + + + + + + Select edge + + + + + + + + 25 + 16777215 + + + + E + + + 1 + + + false + + + inCommandShortcutSelectEdge + + + Mod/Draft + + + + + + + Subelement mode + + + + + + + + 25 + 16777215 + + + + B + + + 1 + + + false + + + inCommandShortcutSubelementMode + + + Mod/Draft + + + + + + + Copy + + + + + + + + 25 + 16777215 + + + + C + + + 1 + + + false + + + inCommandShortcutCopy + + + Mod/Draft + + + + + + + Undo + + + + + + + + 25 + 16777215 + + + + / + + + 1 + + + false + + + inCommandShortcutUndo + + + Mod/Draft + + + + + + + Wipe + + + + + + + + 25 + 16777215 + + + + W + + + 1 + + + false + + + inCommandShortcutWipe + + + Mod/Draft + + + + + + + Close + + + + + + + + 25 + 16777215 + + + + O + + + 1 + + + false + + + inCommandShortcutClose + + + Mod/Draft + + + + + + + Exit + + + + + + + + 25 + 16777215 + + + + A + + + 1 + + + false + + + inCommandShortcutExit + + + Mod/Draft + + + + + + + Continue + + + + + + + + 25 + 16777215 + + + + N + + + 1 + + + false + + + inCommandShortcutContinue + + + Mod/Draft + + + + + + + Cycle snap + + + + + + + + 25 + 16777215 + + + + ` + + + 1 + + + false + + + inCommandShortcutCycleSnap + + + Mod/Draft + + + + + + + Add hold + + + + + + + + 25 + 16777215 + + + + Q + + + 1 + + + false + + + inCommandShortcutAddHold + + + Mod/Draft + + + + + + + Set working plane + + + + + + + + 25 + 16777215 + + + + U + + + 1 + + + false + + + inCommandShortcutSetWP + + + Mod/Draft + + + + + + + Snap + + + + + + + + 25 + 16777215 + + + + S + + + 1 + + + false + + + inCommandShortcutSnap + + + Mod/Draft + + + + + + + Increase radius + + + + + + + + 25 + 16777215 + + + + P + + + 1 + + + false + + + inCommandShortcutIncreaseRadius + + + Mod/Draft + + + + + + + Decrease radius + + + + + + + + 25 + 16777215 + + + + M + + + 1 + + + false + + + inCommandShortcutDecreaseRadius + + + Mod/Draft + + + + + + + Restrict X + + + + + + + + 25 + 16777215 + + + + X + + + 1 + + + false + + + inCommandShortcutRestrictX + + + Mod/Draft + + + + + + + Restrict Y + + + + + + + + 25 + 16777215 + + + + Y + + + 1 + + + false + + + inCommandShortcutRestrictY + + + Mod/Draft + + + + + + + Restrict Z + + + + + + + + 25 + 16777215 + + + + Z + + + 1 + + + false + + + inCommandShortcutRestrictZ + + + Mod/Draft + + + + + + - In-Command Shortcuts + UI options - - - - - 0 + + + + + If checked, the Draft snap toolbar will only be visible during commands - - - - Relative - - - - - - - true - - - - 0 - 0 - - - - - 25 - 16777215 - - - - R - - - 1 - - - - - - false - - - inCommandShortcutRelative - - - Mod/Draft - - - - - - - Qt::Horizontal - - - - - - - Continue - - - - - - - true - - - - 0 - 0 - - - - - 25 - 16777215 - - - - T - - - 1 - - - - - - false - - - inCommandShortcutContinue - - - Mod/Draft - - - - - - - Qt::Horizontal - - - - - - - Close - - - - - - - true - - - - 0 - 0 - - - - - 25 - 16777215 - - - - O - - - 1 - - - - - - false - - - inCommandShortcutClose - - - Mod/Draft - - - - - - - Qt::Horizontal - - - - - - - Copy - - - - - - - true - - - - 0 - 0 - - - - - 25 - 16777215 - - - - P - - - 1 - - - - - - false - - - inCommandShortcutCopy - - - Mod/Draft - - - - - - - Subelement Mode - - - - - - - true - - - - 0 - 0 - - - - - 25 - 16777215 - - - - D - - - 1 - - - - - - false - - - inCommandShortcutSubelementMode - - - Mod/Draft - - - - - - - Fill - - - - - - - true - - - - 0 - 0 - - - - - 25 - 16777215 - - - - L - - - 1 - - - - - - false - - - inCommandShortcutFill - - - Mod/Draft - - - - - - - Exit - - - - - - - true - - - - 0 - 0 - - - - - 25 - 16777215 - - - - A - - - 1 - - - - - - false - - - inCommandShortcutExit - - - Mod/Draft - - - - - - - Select Edge - - - - - - - true - - - - 0 - 0 - - - - - 25 - 16777215 - - - - E - - - 1 - - - - - - false - - - inCommandShortcutSelectEdge - - - Mod/Draft - - - - - - - Add Hold - - - - - - - true - - - - 0 - 0 - - - - - 25 - 16777215 - - - - Q - - - 1 - - - - - - false - - - inCommandShortcutAddHold - - - Mod/Draft - - - - - - - Length - - - - - - - true - - - - 0 - 0 - - - - - 25 - 16777215 - - - - H - - - 1 - - - - - - false - - - inCommandShortcutLength - - - Mod/Draft - - - - - - - Wipe - - - - - - - true - - - - 0 - 0 - - - - - 25 - 16777215 - - - - W - - - 1 - - - - - - false - - - inCommandShortcutWipe - - - Mod/Draft - - - - - - - Set WP - - - - - - - true - - - - 0 - 0 - - - - - 25 - 16777215 - - - - U - - - 1 - - - - - - false - - - inCommandShortcutSetWP - - - Mod/Draft - - - - - - - Cycle Snap - - - - - - - true - - - - 0 - 0 - - - - - 25 - 16777215 - - - - ` - - - 1 - - - - - - false - - - inCommandShortcutCycleSnap - - - Mod/Draft - - - - - - - Global - - - - - - - true - - - - 0 - 0 - - - - - 25 - 16777215 - - - - G - - - 1 - - - - - - false - - - inCommandShortcutGlobal - - - Mod/Draft - - - - - - - Undo - - - - - - - true - - - - 0 - 0 - - - - - 25 - 16777215 - - - - / - - - 1 - - - - - - false - - - inCommandShortcutUndo - - - 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 - - - - - - - Restrict X - - - - - - - true - - - - 0 - 0 - - - - - 25 - 16777215 - - - - X - - - 1 - - - - - - false - - - inCommandShortcutRestrictX - - - Mod/Draft - - - - - - - Restrict Y - - - - - - - true - - - - 0 - 0 - - - - - 25 - 16777215 - - - - Y - - - 1 - - - - - - false - - - inCommandShortcutRestrictY - - - Mod/Draft - - - - - - - Restrict Z - - - - - - - true - - - - 0 - 0 - - - - - 25 - 16777215 - - - - Z - - - 1 - - - - - - false - - - RestrictZ - - - Mod/Draft - - - - + + Only show the Draft snap toolbar during commands + + + false + + + SnapBarShowOnlyDuringCommands + + + Mod/Draft + + + + + + + If checked, the Snap widget is displayed in the Draft statusbar + + + Show the Snap widget in the Draft Workbench + + + true + + + DisplayStatusbarSnapWidget + + + Mod/Draft + + + + + + + If checked, the Annotation scale widget is displayed in the Draft statusbar + + + Show the Annotation scale widget in the Draft Workbench + + + true + + + DisplayStatusbarScaleWidget + + + Mod/Draft + + - - - - 0 - 0 - - - - Draft Statusbar - - - - - - 0 - - - - - Enable snap statusbar widget - - - Draft snap widget - - - true - - - DisplayStatusbarSnapWidget - - - Mod/Draft - - - - - - - Enable draft statusbar annotation scale widget - - - Annotation scale widget - - - true - - - DisplayStatusbarScaleWidget - - - Mod/Draft - - - - - - - - - - + Qt::Vertical - - - 20 - 40 - - diff --git a/src/Mod/Draft/Resources/ui/preferences-draftsnap.ui b/src/Mod/Draft/Resources/ui/preferences-draftsnap.ui index d44e89982d..9fac2e398a 100644 --- a/src/Mod/Draft/Resources/ui/preferences-draftsnap.ui +++ b/src/Mod/Draft/Resources/ui/preferences-draftsnap.ui @@ -14,269 +14,13 @@ Grid and snapping - - 6 - - - 9 - - - 9 - - - 9 - - - 9 - - - Snapping - - - - - - - - If checked, snapping is activated without the need to press the Snap mod key - - - Always snap - - - true - - - alwaysSnap - - - Mod/Draft - - - - - - - - - - - false - - - Snap mod - - - - - - - Qt::Horizontal - - - - 40 - 0 - - - - - - - - - 140 - 0 - - - - false - - - The Snap modifier key - - - 1 - - - modsnap - - - Mod/Draft - - - - Shift - - - - - Ctrl - - - - - Alt - - - - - - - - - - - - Constrain mod - - - - - - - Qt::Horizontal - - - - 40 - 0 - - - - - - - - - 140 - 0 - - - - The Constraining modifier key - - - modconstrain - - - Mod/Draft - - - - Shift - - - - - Ctrl - - - - - Alt - - - - - - - - - - - - Alt mod - - - - - - - Qt::Horizontal - - - - 40 - 0 - - - - - - - - - 140 - 0 - - - - The Alt modifier key. The function of this key depends on the command. - - - 2 - - - modalt - - - Mod/Draft - - - - Shift - - - - - Ctrl - - - - - Alt - - - - - - - - - - - - If checked, the Snap toolbar will only be visible during commands - - - Only show the Draft snap toolbar during commands - - - false - - - SnapBarShowOnlyDuringCommands - - - Mod/Draft - - - - - - - - - - Grid - - + + If checked, the grid will always be visible in new views. @@ -296,7 +40,7 @@ Use Draft ToggleGrid to change this for the active view. - + false @@ -319,10 +63,11 @@ Use Draft ToggleGrid to change this for the active view. - + - If checked, an additional border is displayed around the grid, showing the main square size in the bottom left border + If checked, an additional border is displayed around the grid, +showing the main square size in the bottom left corner Show grid border @@ -338,14 +83,15 @@ Use Draft ToggleGrid to change this for the active view. - + true - If checked, the outline of a human figure is displayed at the bottom left corner of the grid. -This option is only effective if the BIM workbench is installed and if Show grid border is enabled. + If checked, the outline of a human figure is displayed at the bottom left +corner of the grid. Only effective if the BIM workbench is installed and +"Show grid border" is enabled. Show human figure @@ -361,10 +107,10 @@ This option is only effective if the BIM workbench is installed and if Show grid - + - If checked, the two main axes of the grid will be colored red, green or blue + If checked, the two main axes of the grid are colored red, green or blue if they match the X, Y or Z axis of the global coordinate system @@ -381,349 +127,371 @@ if they match the X, Y or Z axis of the global coordinate system - - - - - - Main lines every - - - - - - - Qt::Horizontal - - - - 40 - 0 - - - - - - - - - 140 - 0 - - - - The number of squares between main grid lines. These lines are thicker than normal grid lines. - - - 10 - - - gridEvery - - - Mod/Draft - - - - + + + + Main lines every + + - - - - - - Grid spacing - - - - - - - Qt::Horizontal - - - - 40 - 0 - - - - - - - - - 140 - 0 - - - - The distance between grid lines - - - 4 - - - 9999.989999999999782 - - - 1.000000000000000 - - - mm - - - gridSpacing - - - Mod/Draft - - - - + + + + + 140 + 0 + + + + The number of squares between main grid lines. +These lines are thicker than normal grid lines. + + + 10 + + + gridEvery + + + Mod/Draft + + - - - - - - Grid size - - - - - - - Qt::Horizontal - - - - 40 - 0 - - - - - - - - - 140 - 0 - - - - The number of horizontal and vertical lines of the grid - - - lines - - - 9999 - - - 100 - - - gridSize - - - Mod/Draft - - - - + + + + Qt::Horizontal + + - - - - - - Grid color and transparency - - - - - - - Qt::Horizontal - - - - 40 - 0 - - - - - - - - - 0 - 0 - - - - The color of the grid - - - - 50 - 50 - 75 - - - - gridColor - - - Mod/Draft - - - - - - - - 140 - 0 - - - - The overall transparency of the grid - - - 100 - - - gridTransparency - - - Mod/Draft - - - - + + + + Grid spacing + + + + + + + The distance between grid lines + + + 4 + + + 9999.989999999999782 + + + 1.000000000000000 + + + mm + + + gridSpacing + + + Mod/Draft + + + + + + + Grid size + + + + + + + The number of horizontal and vertical lines in the grid + + + lines + + + 9999 + + + 100 + + + gridSize + + + Mod/Draft + + + + + + + Grid transparency + + + + + + + The overall transparency of the grid + + + % + + + 100 + + + gridTransparency + + + Mod/Draft + + + + + + + Grid color + + + + + + + The color of the grid + + + + 50 + 50 + 75 + + + + gridColor + + + Mod/Draft + + - + - Edit + Snapping and modifier keys - - - - - - - - - - Maximum number of objects for Draft Edit - - - - - - - Qt::Horizontal - - - - 40 - 0 - - - - - - - - - 140 - 0 - - - - The maximum number of objects Draft Edit is allowed to process at the same time - - - 1 - - - 25 - - - 5 - - - 10 - - - DraftEditMaxObjects - - - Mod/Draft - - - - + + + + + Snap symbol style + + - - + + + + The style for snap symbols + + + snapStyle + + + Mod/Draft + - - - - - - Pick radius for Draft Edit - - + + Draft classic style + - - - Qt::Horizontal - - - - 40 - 0 - - - + + Bitsnpieces style + + + + + + + + Qt::Horizontal + + + + + + + Snap symbol color + + + + + + + The color for snap symbols + + + + 255 + 170 + 255 + + + + snapcolor + + + Mod/Draft + + + + + + + If checked, snapping is activated without the need to press the Snap modifier key + + + Always snap + + + true + + + alwaysSnap + + + Mod/Draft + + + + + + + false + + + Snap modifier + + + + + + + + 140 + 0 + + + + false + + + The Snap modifier key + + + 1 + + + modsnap + + + Mod/Draft + + + + Shift + - - - - 140 - 0 - - - - The pick radius (in pixels) of edit nodes - - - 1 - - - 20 - - - DraftEditPickRadius - - - Mod/Draft - - + + Ctrl + - + + + Alt + + + + + + + + Constrain modifier + + + + + + + The Constrain modifier key + + + modconstrain + + + Mod/Draft + + + + Shift + + + + + Ctrl + + + + + Alt + + + + + + + + Alt modifier + + + + + + + The Alt modifier key. The function of this key depends on the command. + + + 2 + + + modalt + + + Mod/Draft + + + + Shift + + + + + Ctrl + + + + + Alt + + + @@ -733,12 +501,6 @@ if they match the X, Y or Z axis of the global coordinate system Qt::Vertical - - - 0 - 40 - - @@ -746,21 +508,6 @@ if they match the X, Y or Z axis of the global coordinate system qPixmapFromMimeSource - - Gui::ColorButton - QPushButton -
Gui/Widgets.h
-
- - Gui::PrefSpinBox - QSpinBox -
Gui/PrefWidgets.h
-
- - Gui::PrefColorButton - Gui::ColorButton -
Gui/PrefWidgets.h
-
Gui::PrefCheckBox QCheckBox @@ -771,26 +518,29 @@ if they match the X, Y or Z axis of the global coordinate system QComboBox
Gui/PrefWidgets.h
+ + Gui::PrefSpinBox + QSpinBox +
Gui/PrefWidgets.h
+
Gui::PrefQuantitySpinBox QDoubleSpinBox
Gui/PrefWidgets.h
+ + Gui::ColorButton + QPushButton +
Gui/Widgets.h
+
+ + Gui::PrefColorButton + Gui::ColorButton +
Gui/PrefWidgets.h
+
- - checkBox_alwaysSnap - toggled(bool) - label_modsnap - setDisabled(bool) - - - checkBox_alwaysSnap - toggled(bool) - comboBox_modsnap - setDisabled(bool) - checkBox_alwaysShowGrid toggled(bool) @@ -803,5 +553,17 @@ if they match the X, Y or Z axis of the global coordinate system checkBox_gridShowHuman setEnabled(bool) + + checkBox_alwaysSnap + toggled(bool) + label_modsnap + setDisabled(bool) + + + checkBox_alwaysSnap + toggled(bool) + comboBox_modsnap + setDisabled(bool) + diff --git a/src/Mod/Draft/Resources/ui/preferences-drafttexts.ui b/src/Mod/Draft/Resources/ui/preferences-drafttexts.ui index d551a06aa1..e881b72a99 100644 --- a/src/Mod/Draft/Resources/ui/preferences-drafttexts.ui +++ b/src/Mod/Draft/Resources/ui/preferences-drafttexts.ui @@ -14,107 +14,137 @@ Texts and dimensions - - 6 - - - 9 - - - 9 - - - 9 - - - 9 - - + - Text settings + Texts - - - - - - - Font family - - - - - - - - 200 - 0 - - - - This is the default font name for all Draft texts and dimensions. -It can be a font name such as "Arial", a default style such as "sans", "serif" -or "mono", or a family such as "Arial,Helvetica,sans" or a name with a style -such as "Arial:Bold" - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - Internal font - - - textfont - - - Mod/Draft - - - - + + + + + Font name or family + + - - - - - - Font size - - - - - - - - 16777215 - 16777215 - - - - Default height for texts and dimensions - - - mm - - - 9999.989999999999782 - - - 0.200000000000000 - - - textheight - - - Mod/Draft - - - - + + + + The default font for texts, dimensions and labels. It can be a font name such +as "Arial", a style such as "sans", "serif" or "mono", or a family such as +"Arial,Helvetica,sans", or a name with a style such as "Arial:Bold". + + + + + + Internal font + + + textfont + + + Mod/Draft + + + + + + + Font size + + + + + + + + 140 + 0 + + + + The default height for texts, dimension texts and label texts + + + 0.05 + + + mm + + + 0.0 + + + 3.5 + + + textheight + + + Mod/Draft + + + + + + + Qt::Horizontal + + + + + + + Line spacing factor + + + + + + + The default line spacing for multi-line texts and labels (relative to the font size) + + + 0.05 + + + 1.0 + + + LineSpacing + + + Mod/Draft + + + + + + + Text color + + + + + + + The default color for texts, dimension texts and label texts + + + + 0 + 0 + 0 + + + + DefaultTextColor + + + Mod/Draft + + @@ -122,419 +152,173 @@ such as "Arial:Bold" - Dimension settings + Lines and arrows - - - - - - - Display mode - - - - - - - - 120 - 0 - - - - DefaultAnnoDisplayMode - - - Mod/Draft - - - - World - - - - - Screen - - - - - + + + + + If checked, the dimension line is displayed by default + + + Show dimension line + + + true + + + DimShowLine + + + Mod/Draft + + - - - - - - Number of decimals - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - 8 - - - 2 - - - dimPrecision - - - Mod/Draft - - - - + + + + Line width + + - - - - - - Extension lines size - - - - - - - The default size of dimensions extension lines - - - mm - - - -9999.989999999999782 - - - 9999.989999999999782 - - - 0.300000000000000 - - - extlines - - - Mod/Draft - - - - + + + + The default line width + + + px + + + 1 + + + 2 + + + DefaultAnnoLineWidth + + + Mod/Draft + + - - - - - - Extension line overshoot - - - - - - - The default length of extension line above dimension line - - - mm - - - -9999.989999999999782 - - - 9999.989999999999782 - - - 0.000000000000000 - - - extovershoot - - - Mod/Draft - - - - + + + + Qt::Horizontal + + - - - - - - Dimension line overshoot - - - - - - - The default distance the dimension line is extended past extension lines - - - mm - - - -9999.989999999999782 - - - 9999.989999999999782 - - - 0.000000000000000 - - - dimovershoot - - - Mod/Draft - - - - + + + + Arrow type + + - - + + + + + 140 + 0 + + + + The default symbol displayed at the ends of dimension lines + + + dimsymbol + + + Mod/Draft + - - - Show the dimension line - - - true - - - DimShowLine - - - Mod/Draft - - + + Dot + - + + + Circle + + + + + Arrow + + + + + Tick + + + + + Tick-2 + + + - - - - - - Arrows style - - - - - - - dimsymbol - - - Mod/Draft - - - - Dot - - - - - Circle - - - - - Arrow - - - - - Tick - - - - - Tick-2 - - - - - + + + + Arrow size + + - - - - - - Arrows size - - - - - - - The default size of arrows - - - mm - - - 9999.989999999999782 - - - 0.100000000000000 - - - arrowsize - - - Mod/Draft - - - - + + + + The default arrow size + + + 0.05 + + + mm + + + 0.0 + + + 1.0 + + + arrowsize + + + Mod/Draft + + - - - - - - Text spacing - - - - - - - The space between the dimension line and the dimension text - - - mm - - - 9999.989999999999782 - - - 0.050000000000000 - - - dimspacing - - - Mod/Draft - - - - + + + + Line and arrow color + + - - - - - - Show the unit suffix in dimensions - - - true - - - showUnit - - - Mod/Draft - - - - - - - - - - - Override unit - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - By leaving this field blank, the dimension measurements will be shown in the current unit defined in FreeCAD. By indicating a unit here such as m or cm, you can force new dimensions to be shown in that unit. - - - overrideUnit - - - Mod/Draft - - - - - - - - - - - Feet separator - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Optional string to appear between the feet and inches values in dimensions - - - FeetSeparator - - - Mod/Draft - - - - + + + + The default color for lines and arrows + + + + 0 + 0 + 0 + + + + DefaultAnnoLineColor + + + Mod/Draft + + @@ -542,63 +326,353 @@ such as "Arial:Bold" - ShapeString settings + Units - - - - - - - Default ShapeString font file - - - - - - - - 300 - 0 - - - - Font files (*.ttf *.otf *.pfb *.TTF *.OTF *.PFB) - - - Select a font file - - - FontFile - - - Mod/Draft - - - - + + + + + If checked, a unit symbol is added to dimension texts by default + + + Show unit + + + true + + + showUnit + + + Mod/Draft + + + + + + + Unit override + + + + + + + + 140 + 16777215 + + + + The default unit override for dimensions. Enter a unit such as m +or cm, leave blank to use the current unit defined in FreeCAD. + + + overrideUnit + + + Mod/Draft + + + + + + + Qt::Horizontal + + + + + + + Number of decimals + + + + + + + The default number of decimal places for dimension texts + + + 0 + + + 8 + + + 2 + + + dimPrecision + + + Mod/Draft + + + + + + + Feet separator + + + + + + + + 140 + 16777215 + + + + The optional string inserted between the feet and inches values in dimensions + + + FeetSeparator + + + Mod/Draft + + - + + + Dimension details + + + + + + Dimension line overshoot + + + + + + + + 140 + 0 + + + + The default distance the dimension line is extended past the extension lines + + + 0.05 + + + mm + + + 0.0 + + + dimovershoot + + + Mod/Draft + + + + + + + Qt::Horizontal + + + + + + + Extension line length + + + + + + + The default length of extension lines. Use 0 for full extension lines. A negative +value defines the gap between the ends of the extension lines and the measured +points. A positive value defines the maximum length of the extension lines. Only +used for linear dimensions. + + + 0.05 + + + mm + + + -0.5 + + + extlines + + + Mod/Draft + + + + + + + Extension line overshoot + + + + + + + The default length of extension lines above the dimension line + + + 0.05 + + + mm + + + 2.0 + + + extovershoot + + + Mod/Draft + + + + + + + Text spacing + + + + + + + The default space between the dimension line and the dimension text + + + 0.05 + + + mm + + + 0.0 + + + 1.0 + + + dimspacing + + + Mod/Draft + + + + + + + + + + ShapeStrings + + + + + + Default ShapeString font file + + + + + + + Font files (*.ttf *.otf *.pfb *.TTF *.OTF *.PFB) + + + Select a font file + + + FontFile + + + Mod/Draft + + + + + + + + Qt::Vertical - - - 20 - 40 - - - + qPixmapFromMimeSource + + Gui::PrefCheckBox + QCheckBox +
Gui/PrefWidgets.h
+
+ + Gui::PrefLineEdit + QLineEdit +
Gui/PrefWidgets.h
+
+ + Gui::PrefComboBox + QComboBox +
Gui/PrefWidgets.h
+
+ + Gui::PrefSpinBox + QSpinBox +
Gui/PrefWidgets.h
+
+ + Gui::PrefDoubleSpinBox + QDoubleSpinBox +
Gui/PrefWidgets.h
+
+ + Gui::QuantitySpinBox + QWidget +
Gui/QuantitySpinBox.h
+
+ + Gui::PrefUnitSpinBox + Gui::QuantitySpinBox +
Gui/PrefWidgets.h
+
+ + Gui::ColorButton + QPushButton +
Gui/Widgets.h
+
+ + Gui::PrefColorButton + Gui::ColorButton +
Gui/PrefWidgets.h
+
Gui::FileChooser QWidget @@ -609,31 +683,6 @@ such as "Arial:Bold" Gui::FileChooser
Gui/PrefWidgets.h
- - Gui::PrefSpinBox - QSpinBox -
Gui/PrefWidgets.h
-
- - Gui::PrefCheckBox - QCheckBox -
Gui/PrefWidgets.h
-
- - Gui::PrefComboBox - QComboBox -
Gui/PrefWidgets.h
-
- - Gui::PrefLineEdit - QLineEdit -
Gui/PrefWidgets.h
-
- - Gui::PrefDoubleSpinBox - QDoubleSpinBox -
Gui/PrefWidgets.h
-
diff --git a/src/Mod/Draft/Resources/ui/preferences-draftvisual.ui b/src/Mod/Draft/Resources/ui/preferences-draftvisual.ui index 02baf29fcb..2c245e81eb 100644 --- a/src/Mod/Draft/Resources/ui/preferences-draftvisual.ui +++ b/src/Mod/Draft/Resources/ui/preferences-draftvisual.ui @@ -11,454 +11,189 @@ - Visual settings + Visual - - 6 - - - 9 - - - 9 - - - 9 - - - 9 - - + - Visual Settings + SVG patterns - - - - - - - Snap symbols style - - - - - - - - 200 - 0 - - - - snapStyle - - - Mod/Draft - - - - Draft classic style - - - - - Bitsnpieces style - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Color - - - - - - - The default color for snap symbols - - - - 255 - 255 - 255 - - - - snapcolor - - - Mod/Draft - - - - + + + + + SVG pattern size + + - - - - - - If checked, a widget indicating the current working plane orientation appears during drawing operations - - - Show Working Plane tracker - - - showPlaneTracker - - - Mod/Draft - - - - + + + + + 140 + 0 + + + + The default size for SVG patterns. A higher value results in a denser pattern. + + + 0.05 + + + 1.0 + + + HatchPatternSize + + + Mod/Draft + + - - - - - - Alternate SVG patterns location - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 300 - 0 - - - - Gui::FileChooser::Directory - - - Here you can specify a directory with custom SVG files containing <pattern> definitions to be added to the standard patterns - - - patternFile - - - Mod/Draft - - - - + + + + Qt::Horizontal + + - - - - - - SVG pattern resolution - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - The resolution to draw the patterns in. Default value is 128. Higher values give better resolutions, lower values make drawing faster - - - 512 - - - 128 - - - HatchPatternResolution - - - Mod/Draft - - - - + + + + Additional SVG pattern location + + - - - - - - SVG pattern default size - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - The default size for SVG patterns - - - 4 - - - 0.000100000000000 - - - 1.000000000000000 - - - HatchPatternSize - - - Mod/Draft - - - - - - - - - - - Check this if you want to preserve colors of faces while doing downgrade and upgrade (splitFaces and makeShell only) - - - Preserve colors of faces during downgrade/upgrade - - - preserveFaceColor - - - Mod/Draft - - - - - - - - - - - Check this if you want the face names to derive from the originating object name and vice versa while doing downgrade/upgrade (splitFaces and makeShell only) - - - Preserve names of faces during downgrade/upgrade - - - preserveFaceNames - - - Mod/Draft - - - - + + + + Gui::FileChooser::Directory + + + An optional directory with custom SVG files containing +pattern definitions to be added to the standard patterns + + + patternFile + + + Mod/Draft + + - + Drawing view line definitions - - - - - - - Dashed line definition - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - An SVG linestyle definition - - - 2,2 - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - svgDashedLine - - - Mod/Draft - - - - + + + + + Dashed line definition + + - - - - - - Dashdot line definition - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - An SVG linestyle definition - - - 3,2,0.2,2 - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - svgDashdotLine - - - Mod/Draft - - - - + + + + + 140 + 16777215 + + + + An SVG linestyle definition + + + 2,2 + + + svgDashedLine + + + Mod/Draft + + - - - - - - Dotted line definition - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - An SVG linestyle definition - - - 0.2,2 - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - svgDottedLine - - - Mod/Draft - - - - + + + + Qt::Horizontal + + + + + + + Dashdot line definition + + + + + + + + 140 + 16777215 + + + + An SVG linestyle definition + + + 3,2,0.2,2 + + + svgDashdotLine + + + Mod/Draft + + + + + + + Dotted line definition + + + + + + + + 140 + 16777215 + + + + An SVG linestyle definition + + + 0.2,2 + + + svgDottedLine + + + Mod/Draft + + - + Qt::Vertical - - - 20 - 40 - - @@ -466,41 +201,6 @@ qPixmapFromMimeSource - - Gui::FileChooser - QWidget -
Gui/FileDialog.h
-
- - Gui::ColorButton - QPushButton -
Gui/Widgets.h
-
- - Gui::PrefFileChooser - Gui::FileChooser -
Gui/PrefWidgets.h
-
- - Gui::PrefSpinBox - QSpinBox -
Gui/PrefWidgets.h
-
- - Gui::PrefColorButton - Gui::ColorButton -
Gui/PrefWidgets.h
-
- - Gui::PrefCheckBox - QCheckBox -
Gui/PrefWidgets.h
-
- - Gui::PrefComboBox - QComboBox -
Gui/PrefWidgets.h
-
Gui::PrefLineEdit QLineEdit @@ -511,6 +211,16 @@ QDoubleSpinBox
Gui/PrefWidgets.h
+ + Gui::FileChooser + QWidget +
Gui/FileDialog.h
+
+ + Gui::PrefFileChooser + Gui::FileChooser +
Gui/PrefWidgets.h
+