From ee2f327a964d93239c0cf6fbb8ca813a76123e4b Mon Sep 17 00:00:00 2001 From: Ulices Date: Wed, 22 Jan 2025 15:05:49 +0000 Subject: [PATCH] Add units to some spinboxes on preferences pages (#19143) * Add units to some spinboxes on preferences pages * Ensure units have a space, ex: " px" * FEM: Don't mark units for translation --- src/Gui/PreferencePages/DlgSettingsEditor.ui | 9 + .../PreferencePages/DlgSettingsNavigation.ui | 46 +- .../PreferencePages/DlgSettingsSelection.ui | 5 +- .../PreferencePages/DlgSettingsViewColor.ui | 49 +- src/Mod/CAM/Gui/DlgSettingsPathColor.ui | 2 +- .../preferences/PathDressupHoldingTags.ui | 7 +- src/Mod/Draft/Resources/ui/preferences-svg.ui | 2 +- src/Mod/Fem/Gui/DlgSettingsFemCcx.ui | 548 +++++++++--------- src/Mod/Fem/Gui/TaskFemConstraintHeatflux.ui | 8 +- src/Mod/Part/Gui/DlgSettingsObjectColor.ui | 10 +- .../Gui/SketcherSettingsAppearance.ui | 20 +- src/Mod/Sketcher/Gui/SketcherSettingsGrid.ui | 3 + 12 files changed, 362 insertions(+), 347 deletions(-) diff --git a/src/Gui/PreferencePages/DlgSettingsEditor.ui b/src/Gui/PreferencePages/DlgSettingsEditor.ui index a512778b76..3759737946 100644 --- a/src/Gui/PreferencePages/DlgSettingsEditor.ui +++ b/src/Gui/PreferencePages/DlgSettingsEditor.ui @@ -162,6 +162,9 @@ Tabulator raster (how many spaces) + + spaces + 4 @@ -185,6 +188,9 @@ How many spaces will be inserted when pressing <Tab> + + spaces + 4 @@ -317,6 +323,9 @@ Font size to be used for selected code type + + pt + 1 diff --git a/src/Gui/PreferencePages/DlgSettingsNavigation.ui b/src/Gui/PreferencePages/DlgSettingsNavigation.ui index 513bcfdce8..2ca0f98b9e 100644 --- a/src/Gui/PreferencePages/DlgSettingsNavigation.ui +++ b/src/Gui/PreferencePages/DlgSettingsNavigation.ui @@ -182,6 +182,9 @@ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + px + 10 @@ -578,7 +581,7 @@ Free Turntable: the part will be rotated around the z-axis. The value is the diameter of the sphere to fit on the screen. - mm + mm 0.000010000000000 @@ -765,6 +768,25 @@ Mouse tilting is not disabled by this setting. + + + + Enable spinning animations that are used in some navigation styles after dragging + + + Enable spinning animations + + + false + + + UseSpinningAnimations + + + View + + + @@ -776,6 +798,9 @@ Mouse tilting is not disabled by this setting. The duration of navigation animations in milliseconds + + ms + 100 @@ -809,25 +834,6 @@ Mouse tilting is not disabled by this setting. - - - - Enable spinning animations that are used in some navigation styles after dragging - - - Enable spinning animations - - - false - - - UseSpinningAnimations - - - View - - - diff --git a/src/Gui/PreferencePages/DlgSettingsSelection.ui b/src/Gui/PreferencePages/DlgSettingsSelection.ui index 647db4a651..3254937596 100644 --- a/src/Gui/PreferencePages/DlgSettingsSelection.ui +++ b/src/Gui/PreferencePages/DlgSettingsSelection.ui @@ -118,7 +118,7 @@ - Pick radius (px): + Pick radius: @@ -153,6 +153,9 @@ Larger value eases to pick things, but can make small features impossible to sel Qt::ImhPreferNumbers + + px + 1 diff --git a/src/Gui/PreferencePages/DlgSettingsViewColor.ui b/src/Gui/PreferencePages/DlgSettingsViewColor.ui index a86cdc694f..63a8ad806b 100644 --- a/src/Gui/PreferencePages/DlgSettingsViewColor.ui +++ b/src/Gui/PreferencePages/DlgSettingsViewColor.ui @@ -497,29 +497,32 @@ - - - Color Bar (used in Mesh and FEM Wbs) Label Text Size - - - Qt::AlignLeft|Qt::AlignVCenter - - - 4 - - - 36 - - - 13 - - - CbLabelTextSize - - - View - - + + + Color Bar (used in Mesh and FEM Wbs) Label Text Size + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + pt + + + 4 + + + 36 + + + 13 + + + CbLabelTextSize + + + View + + diff --git a/src/Mod/CAM/Gui/DlgSettingsPathColor.ui b/src/Mod/CAM/Gui/DlgSettingsPathColor.ui index 97058810e4..70d5c9aa53 100644 --- a/src/Mod/CAM/Gui/DlgSettingsPathColor.ui +++ b/src/Mod/CAM/Gui/DlgSettingsPathColor.ui @@ -42,7 +42,7 @@ The default line thickness for new shapes - px + px 9 diff --git a/src/Mod/CAM/Gui/Resources/preferences/PathDressupHoldingTags.ui b/src/Mod/CAM/Gui/Resources/preferences/PathDressupHoldingTags.ui index 8bd419669b..a0d86c24eb 100644 --- a/src/Mod/CAM/Gui/Resources/preferences/PathDressupHoldingTags.ui +++ b/src/Mod/CAM/Gui/Resources/preferences/PathDressupHoldingTags.ui @@ -64,6 +64,9 @@ If the specified height is 0 the dressup will use half the height of the part. S Plunge angle for ascent and descent of holding tag. + + ° + 5.000000000000000 @@ -85,7 +88,7 @@ If the specified height is 0 the dressup will use half the height of the part. S - + Radius of the fillet on the tag's top edge. @@ -94,7 +97,7 @@ If the radius is bigger than that which the tag shape itself supports, the resul - + diff --git a/src/Mod/Draft/Resources/ui/preferences-svg.ui b/src/Mod/Draft/Resources/ui/preferences-svg.ui index 09de46b59e..dd5466c1b5 100644 --- a/src/Mod/Draft/Resources/ui/preferences-svg.ui +++ b/src/Mod/Draft/Resources/ui/preferences-svg.ui @@ -206,7 +206,7 @@ In this case arcs will be discretized into small line segments. This value is the maximum segment length. - mm + mm 9999.989999999999782 diff --git a/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui b/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui index bde7af6c61..cd76b7af51 100644 --- a/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui +++ b/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui @@ -6,8 +6,8 @@ 0 0 - 425 - 642 + 595 + 848 @@ -287,7 +287,50 @@ - + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Time Initial Step + + + + + + + Time End + + + + + + + Use non ccx defaults + + + false + + + UseNonCcxIterationParam + + + Mod/Fem/Ccx + + + @@ -295,14 +338,30 @@ + + + + 3D Output, unchecked for 2D + + + true + + + BeamShellOutput + + + Mod/Fem/Ccx + + + - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - Number of threads used for analysis + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + 1 @@ -314,16 +373,6 @@ - - - - true - - - Matrix solver - - - @@ -377,6 +426,153 @@ + + + + Qt::DefaultContextMenu + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + s + + + 9 + + + 0.000000001000000 + + + 1.000000000000000 + + + 1.000000000000000 + + + AnalysisTimeMaximumStep + + + Mod/Fem/Ccx + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + s + + + 9 + + + 0.000000001000000 + + + 0.010000000000000 + + + 1.000000000000000 + + + AnalysisTime + + + Mod/Fem/Ccx + + + + + + + true + + + Matrix solver + + + + + + + Time incrementation control parameter + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Maximum number of iterations + + + + + + + Time Minimum Step + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Qt::DefaultContextMenu + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + s + + + 9 + + + 0.000000001000000 + + + 0.010000000000000 + + + 0.000010000000000 + + + AnalysisTimeMinimumStep + + + Mod/Fem/Ccx + + + @@ -393,33 +589,41 @@ - - - - Time incrementation control parameter + + + + Qt::DefaultContextMenu - - - - - - Use non ccx defaults + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - false + + s + + + 9 + + + 0.000000001000000 + + + 0.010000000000000 + + + 0.010000000000000 - UseNonCcxIterationParam + AnalysisTimeInitialStep Mod/Fem/Ccx - - + + - Maximum number of iterations + Beam, shell element 3D output format @@ -448,233 +652,13 @@ - - - - Time Initial Step - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Qt::DefaultContextMenu - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 9 - - - 0.000000001000000 - - - 0.010000000000000 - - - 0.010000000000000 - - - AnalysisTimeInitialStep - - - Mod/Fem/Ccx - - - - - - - s - - - - - - - Time End - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 9 - - - 0.000000001000000 - - - 0.010000000000000 - - - 1.000000000000000 - - - AnalysisTime - - - Mod/Fem/Ccx - - - - - - - s - - - - - - - Time Minimum Step - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Qt::DefaultContextMenu - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 9 - - - 0.000000001000000 - - - 0.010000000000000 - - - 0.000010000000000 - - - AnalysisTimeMinimumStep - - - Mod/Fem/Ccx - - - - - - - s - - - - + Time Maximum Step - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Qt::DefaultContextMenu - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 9 - - - 0.000000001000000 - - - 1.000000000000000 - - - 1.000000000000000 - - - AnalysisTimeMaximumStep - - - Mod/Fem/Ccx - - - - - - - s - - - - - - - Beam, shell element 3D output format - - - - - - - 3D Output, unchecked for 2D - - - true - - - BeamShellOutput - - - Mod/Fem/Ccx - - - @@ -723,27 +707,7 @@ - - - - - Eigenmode number - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - + @@ -776,6 +740,13 @@ + + + + Eigenmode number + + + @@ -787,6 +758,9 @@ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + Hz + 1 @@ -807,12 +781,18 @@ - - - - Hz + + + + Qt::Horizontal - + + + 40 + 20 + + + @@ -832,6 +812,9 @@ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + Hz + 1 @@ -855,13 +838,6 @@ - - - - Hz - - - diff --git a/src/Mod/Fem/Gui/TaskFemConstraintHeatflux.ui b/src/Mod/Fem/Gui/TaskFemConstraintHeatflux.ui index cda8fc7f56..48da9dc726 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintHeatflux.ui +++ b/src/Mod/Fem/Gui/TaskFemConstraintHeatflux.ui @@ -106,7 +106,7 @@ - W/m^2/K + W/m^2/K Qt::AlignLeft|Qt::AlignTrailing|Qt::AlignVCenter @@ -133,7 +133,7 @@ - K + K Qt::AlignLeft|Qt::AlignTrailing|Qt::AlignVCenter @@ -195,7 +195,7 @@ - K + K Qt::AlignLeft|Qt::AlignTrailing|Qt::AlignVCenter @@ -231,7 +231,7 @@ - W/m^2 + W/m^2 Qt::AlignLeft|Qt::AlignTrailing|Qt::AlignVCenter diff --git a/src/Mod/Part/Gui/DlgSettingsObjectColor.ui b/src/Mod/Part/Gui/DlgSettingsObjectColor.ui index 1a594c2772..57ad807335 100644 --- a/src/Mod/Part/Gui/DlgSettingsObjectColor.ui +++ b/src/Mod/Part/Gui/DlgSettingsObjectColor.ui @@ -189,7 +189,7 @@ The default transparency for new shapes - % + % 100 @@ -224,7 +224,7 @@ The default shininess for new shapes - % + % 100 @@ -295,7 +295,7 @@ The default line thickness for new shapes - px + px 9 @@ -363,7 +363,7 @@ The default size for new vertices - px + px 9 @@ -431,7 +431,7 @@ The font size of bounding boxes in the 3D view - pt + pt 1 diff --git a/src/Mod/Sketcher/Gui/SketcherSettingsAppearance.ui b/src/Mod/Sketcher/Gui/SketcherSettingsAppearance.ui index 9f366a5736..2d6052949a 100644 --- a/src/Mod/Sketcher/Gui/SketcherSettingsAppearance.ui +++ b/src/Mod/Sketcher/Gui/SketcherSettingsAppearance.ui @@ -268,7 +268,10 @@ Width of normal edges. - mm + px + + + px 1 @@ -362,7 +365,10 @@ Width of construction edges. - mm + px + + + px 1 @@ -456,7 +462,10 @@ Width of internal aligned edges. - mm + px + + + px 1 @@ -524,7 +533,10 @@ Width of external edges. - mm + px + + + px 1 diff --git a/src/Mod/Sketcher/Gui/SketcherSettingsGrid.ui b/src/Mod/Sketcher/Gui/SketcherSettingsGrid.ui index d6d206854e..6d671fcb0e 100644 --- a/src/Mod/Sketcher/Gui/SketcherSettingsGrid.ui +++ b/src/Mod/Sketcher/Gui/SketcherSettingsGrid.ui @@ -125,6 +125,9 @@ If 'Grid Auto Spacing' is enabled, will be used as base value. While using 'Grid Auto Spacing' this sets a threshold in pixel to the grid spacing. The grid spacing change if it becomes smaller than this number of pixel. + + px + 3