From afdf07717df9ee6e6709be3a940ba1b040c59b58 Mon Sep 17 00:00:00 2001 From: Roy-043 Date: Wed, 4 Dec 2024 19:44:35 +0100 Subject: [PATCH] Draft: change position of 'Scale multiplier' field in UI Fixes #16501. --- .../Draft/Resources/ui/TaskPanel_SetStyle.ui | 63 ++++---- .../ui/dialog_AnnotationStyleEditor.ui | 143 ++++++++++-------- .../Resources/ui/preferences-drafttexts.ui | 108 +++++++------ 3 files changed, 183 insertions(+), 131 deletions(-) diff --git a/src/Mod/Draft/Resources/ui/TaskPanel_SetStyle.ui b/src/Mod/Draft/Resources/ui/TaskPanel_SetStyle.ui index c81dcd9d0b..5eaee9a107 100644 --- a/src/Mod/Draft/Resources/ui/TaskPanel_SetStyle.ui +++ b/src/Mod/Draft/Resources/ui/TaskPanel_SetStyle.ui @@ -282,9 +282,39 @@ - Texts + Annotations + + + + Scale multiplier + + + + + + + The annotation scale multiplier is the inverse of the scale set in the +Annotation scale widget. If the scale is 1:100 the multiplier is 100. + + + 0 + + + 10000 + + + + + + + + + + Texts + + @@ -337,34 +367,13 @@ - - - Scale multiplier - - - - - - - The annotation scale multiplier is the inverse of the scale set in the -Annotation scale widget. If the scale is 1:100 the multiplier is 100. - - - 0 - - - 10000 - - - - Text color - + The color for texts, dimension texts and label texts @@ -375,11 +384,11 @@ Annotation scale widget. If the scale is 1:100 the multiplier is 100. - + Lines and arrows - + @@ -459,11 +468,11 @@ Annotation scale widget. If the scale is 1:100 the multiplier is 100. - + Dimensions - + diff --git a/src/Mod/Draft/Resources/ui/dialog_AnnotationStyleEditor.ui b/src/Mod/Draft/Resources/ui/dialog_AnnotationStyleEditor.ui index 0d9f5b8364..18b2f868f6 100644 --- a/src/Mod/Draft/Resources/ui/dialog_AnnotationStyleEditor.ui +++ b/src/Mod/Draft/Resources/ui/dialog_AnnotationStyleEditor.ui @@ -13,13 +13,13 @@ Annotation Styles Editor - + - + Style name - + @@ -161,11 +161,55 @@ - Text + Annotations - + - + + + A multiplier factor that affects the size of texts and markers + + + Scale multiplier + + + + + + + + 0 + 0 + + + + + 60 + 0 + + + + A multiplier factor that affects the size of texts and markers + + + 0 + + + 10000 + + + + + + + + + + Texts + + + + The font to use for texts and dimensions @@ -194,7 +238,7 @@ - + The font size in system units @@ -214,12 +258,12 @@ - + The line spacing for multi-line texts and labels (relative to the font size) - Line spacing + Line spacing factor @@ -231,7 +275,7 @@ - + The color of texts, dimension texts and label texts @@ -251,18 +295,18 @@ - + Lines and arrows - + - + If it is checked it will display the dimension line - Show line + Show dimension line @@ -283,7 +327,7 @@ - + The width of the lines @@ -303,7 +347,7 @@ - + The type of arrows or markers to use for dimensions and labels @@ -357,7 +401,7 @@ - + The size of the arrows or markers in system units @@ -377,7 +421,7 @@ - + The color of lines and arrows @@ -397,36 +441,13 @@ - + Units - + - - - A multiplier factor that affects the size of texts and markers - - - Scale multiplier - - - - - - - A multiplier factor that affects the size of texts and markers - - - 0 - - - 10000 - - - - - + If it is checked it will show the unit next to the dimension value @@ -435,7 +456,7 @@ - + If it is checked it will show the unit next to the dimension value @@ -448,8 +469,8 @@ - - + + Specify a valid length unit like mm, m, in, ft, to force displaying the dimension value in this unit @@ -458,24 +479,24 @@ - + 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 + Number of decimals - + The number of decimals to show for dimension values @@ -486,18 +507,18 @@ - + Dimension details - + - + The distance the dimension line is additionally extended - Dimension overshoot + Dimension line overshoot @@ -512,12 +533,12 @@ - + The length of the extension lines - Extension lines + Extension line length @@ -532,12 +553,12 @@ - + The distance the extension lines are additionally extended beyond the dimension line - Extension overshoot + Extension line overshoot @@ -552,7 +573,7 @@ - + The distance between the dimension text and the dimension line diff --git a/src/Mod/Draft/Resources/ui/preferences-drafttexts.ui b/src/Mod/Draft/Resources/ui/preferences-drafttexts.ui index 37a2f1f664..2191e02e2c 100644 --- a/src/Mod/Draft/Resources/ui/preferences-drafttexts.ui +++ b/src/Mod/Draft/Resources/ui/preferences-drafttexts.ui @@ -17,9 +17,61 @@ - Texts + Annotations + + + + Scale multiplier + + + + + + + + 140 + 0 + + + + The default annotation scale multiplier. This is the inverse of the scale set +in the Annotation scale widget. If the scale is 1:100 the multiplier is 100. + + + 0 + + + 10000 + + + 1.0 + + + DefaultAnnoScaleMultiplier + + + Mod/Draft + + + + + + + Qt::Horizontal + + + + + + + + + + Texts + + @@ -87,7 +139,7 @@ as "Arial", a style such as "sans", "serif" or &qu - + Qt::Horizontal @@ -120,43 +172,13 @@ as "Arial", a style such as "sans", "serif" or &qu - - - Scale multiplier - - - - - - - The default annotation scale multiplier. This is the inverse of the scale set -in the Annotation scale widget. If the scale is 1:100 the multiplier is 100. - - - 0 - - - 10000 - - - 1.0 - - - DefaultAnnoScaleMultiplier - - - Mod/Draft - - - - Text color - + The default color for texts, dimension texts and label texts @@ -180,11 +202,11 @@ in the Annotation scale widget. If the scale is 1:100 the multiplier is 100. - + Lines and arrows - + @@ -234,7 +256,7 @@ in the Annotation scale widget. If the scale is 1:100 the multiplier is 100. - + Qt::Horizontal @@ -354,11 +376,11 @@ in the Annotation scale widget. If the scale is 1:100 the multiplier is 100. - + Units - + @@ -406,7 +428,7 @@ or cm, leave blank to use the current unit defined in FreeCAD. - + Qt::Horizontal @@ -471,11 +493,11 @@ or cm, leave blank to use the current unit defined in FreeCAD. - + Dimension details - + @@ -512,7 +534,7 @@ or cm, leave blank to use the current unit defined in FreeCAD. - + Qt::Horizontal @@ -615,7 +637,7 @@ used for linear dimensions. - + ShapeStrings