From d927cfc43889059ac3a467ef2f13d0bf1694796e Mon Sep 17 00:00:00 2001 From: Kacper Donat Date: Sat, 27 Jul 2024 23:34:10 +0200 Subject: [PATCH] Gui: Remove unnecessary minimumSizes from Preferences QT treats setting minimum size very seriously - it applies even if the size required by the control is smaller than specified resulting in rendering too small controls. --- .../PreferencePages/DlgSettingsNavigation.ui | 24 +-- src/Mod/AddonManager/AddonManagerOptions.ui | 17 +- .../Resources/ui/preferences-ifc-export.ui | 11 +- src/Mod/BIM/Resources/ui/preferences-ifc.ui | 11 +- src/Mod/Draft/Resources/ui/preferences-dxf.ui | 11 +- .../Gui/DlgSettingsDefaultMaterial.ui | 25 ++- src/Mod/Material/Gui/DlgSettingsMaterial.ui | 12 -- src/Mod/Part/Gui/DlgExportStep.ui | 3 + .../TechDraw/Gui/DlgPrefsTechDrawAdvanced.ui | 72 -------- .../Gui/DlgPrefsTechDrawAnnotation.ui | 87 +-------- .../Gui/DlgPrefsTechDrawDimensions.ui | 93 ---------- .../TechDraw/Gui/DlgPrefsTechDrawGeneral.ui | 174 ------------------ 12 files changed, 51 insertions(+), 489 deletions(-) diff --git a/src/Gui/PreferencePages/DlgSettingsNavigation.ui b/src/Gui/PreferencePages/DlgSettingsNavigation.ui index 7ef04c9312..b6b2680a64 100644 --- a/src/Gui/PreferencePages/DlgSettingsNavigation.ui +++ b/src/Gui/PreferencePages/DlgSettingsNavigation.ui @@ -566,19 +566,7 @@ Free Turntable: the part will be rotated around the z-axis. - - - - 120 - 20 - - - - - 16777215 - 16777215 - - + Sets camera zoom for new documents. The value is the diameter of the sphere to fit on the screen. @@ -831,6 +819,11 @@ Mouse tilting is not disabled by this setting. + + Gui::QuantitySpinBox + QWidget +
Gui/QuantitySpinBox.h
+ Gui::ColorButton QPushButton @@ -862,10 +855,9 @@ Mouse tilting is not disabled by this setting.
Gui/PrefWidgets.h
 - PrefUnitSpinBox - QWidget + Gui::PrefUnitSpinBox + Gui::QuantitySpinBox
Gui/PrefWidgets.h
- 1 diff --git a/src/Mod/AddonManager/AddonManagerOptions.ui b/src/Mod/AddonManager/AddonManagerOptions.ui index cf0a1a0ddc..2697c9980b 100644 --- a/src/Mod/AddonManager/AddonManagerOptions.ui +++ b/src/Mod/AddonManager/AddonManagerOptions.ui @@ -7,13 +7,16 @@ 0 0 757 - 621 + 783 Addon manager options + + 0 + @@ -298,12 +301,6 @@ installed addons will be checked for available updates - - - 0 - 24 - - ProxyUrl @@ -332,15 +329,15 @@ installed addons will be checked for available updates 0 + + The URL for the Addon Score data (see Addon Manager wiki page for formatting and hosting details). + AddonsScoreURL Addons - - The URL for the Addon Score data (see Addon Manager wiki page for formatting and hosting details). - diff --git a/src/Mod/BIM/Resources/ui/preferences-ifc-export.ui b/src/Mod/BIM/Resources/ui/preferences-ifc-export.ui index 82f01dfb62..21cd81e17d 100644 --- a/src/Mod/BIM/Resources/ui/preferences-ifc-export.ui +++ b/src/Mod/BIM/Resources/ui/preferences-ifc-export.ui @@ -17,16 +17,7 @@ 6 - - 9 - - - 9 - - - 9 - - + 9 diff --git a/src/Mod/BIM/Resources/ui/preferences-ifc.ui b/src/Mod/BIM/Resources/ui/preferences-ifc.ui index 5a2d18bb7b..68131c92af 100644 --- a/src/Mod/BIM/Resources/ui/preferences-ifc.ui +++ b/src/Mod/BIM/Resources/ui/preferences-ifc.ui @@ -17,16 +17,7 @@ 6 - - 9 - - - 9 - - - 9 - - + 9 diff --git a/src/Mod/Draft/Resources/ui/preferences-dxf.ui b/src/Mod/Draft/Resources/ui/preferences-dxf.ui index 2a6b2026fc..55e3202f3b 100644 --- a/src/Mod/Draft/Resources/ui/preferences-dxf.ui +++ b/src/Mod/Draft/Resources/ui/preferences-dxf.ui @@ -17,16 +17,7 @@ 6 - - 9 - - - 9 - - - 9 - - + 9 diff --git a/src/Mod/Material/Gui/DlgSettingsDefaultMaterial.ui b/src/Mod/Material/Gui/DlgSettingsDefaultMaterial.ui index 08b47d927b..0869f35c32 100644 --- a/src/Mod/Material/Gui/DlgSettingsDefaultMaterial.ui +++ b/src/Mod/Material/Gui/DlgSettingsDefaultMaterial.ui @@ -21,11 +21,34 @@ - + + + + 0 + 0 + + + + + + + Qt::Vertical + + + QSizePolicy::MinimumExpanding + + + + 20 + 40 + + + + diff --git a/src/Mod/Material/Gui/DlgSettingsMaterial.ui b/src/Mod/Material/Gui/DlgSettingsMaterial.ui index addfb31dc2..b75af8d94e 100644 --- a/src/Mod/Material/Gui/DlgSettingsMaterial.ui +++ b/src/Mod/Material/Gui/DlgSettingsMaterial.ui @@ -131,18 +131,6 @@ will be listed as available. 0 - - - 0 - 20 - - - - - 0 - 0 - - CustomMaterialsDir diff --git a/src/Mod/Part/Gui/DlgExportStep.ui b/src/Mod/Part/Gui/DlgExportStep.ui index 88a5c67916..ec99484468 100644 --- a/src/Mod/Part/Gui/DlgExportStep.ui +++ b/src/Mod/Part/Gui/DlgExportStep.ui @@ -14,6 +14,9 @@ STEP + + 0 + diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAdvanced.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAdvanced.ui index 625b081e88..2897f27b27 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAdvanced.ui +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAdvanced.ui @@ -22,18 +22,6 @@ 0 - - - 0 - 0 - - - - - 0 - 0 - - Advanced @@ -48,12 +36,6 @@ 0 - - - 0 - 20 - - true @@ -109,12 +91,6 @@ 0 - - - 0 - 0 - - Size of selection area around edges Each unit is approx. 0.1 mm wide @@ -138,18 +114,6 @@ Each unit is approx. 0.1 mm wide - - - 0 - 0 - - - - - 0 - 0 - - Edge Fuzz @@ -179,12 +143,6 @@ Each unit is approx. 0.1 mm wide - - - 0 - 20 - - Maximum hatch line segments to use when hatching a face with a PAT pattern @@ -214,12 +172,6 @@ when hatching a face with a PAT pattern - - - 0 - 0 - - Mark Fuzz @@ -252,12 +204,6 @@ when hatching a face with a PAT pattern 0 - - - 0 - 0 - - Selection area around center marks Each unit is approx. 0.1 mm wide @@ -288,12 +234,6 @@ Each unit is approx. 0.1 mm wide - - - 0 - 20 - - Limit of 64x64 pixel SVG tiles used to hatch a single face. For large scalings you might get an error about too many SVG tiles. @@ -330,12 +270,6 @@ Then you need to increase the tile limit. 0 - - - 0 - 20 - - Dump intermediate results during Detail view processing @@ -358,12 +292,6 @@ Then you need to increase the tile limit. 0 - - - 0 - 20 - - Highlights border of section cut in section views diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotation.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotation.ui index 8ec48c36d6..1a2fed53fa 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotation.ui +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotation.ui @@ -22,12 +22,6 @@ - - - 0 - 0 - - Annotation @@ -42,18 +36,9 @@ 0 - - - 0 - 0 - - Length of balloon leader line kink - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - 5.000000000000000 @@ -104,12 +89,6 @@ 0 - - - 0 - 0 - - Style for balloon leader line ends @@ -257,12 +236,6 @@ 0 - - - 0 - 0 - - Restrict Filled Triangle line end to vertical or horizontal directions @@ -288,12 +261,6 @@ 0 - - - 0 - 0 - - Show arc centers in printed output @@ -316,12 +283,6 @@ 0 - - - 0 - 0 - - true @@ -352,12 +313,6 @@ 0 - - - 0 - 0 - - true @@ -394,12 +349,6 @@ - - - 0 - 22 - - Default appearance of cut surface in section view @@ -442,12 +391,6 @@ 0 - - - 0 - 0 - - Outline shape for detail views @@ -467,12 +410,6 @@ 0 - - - 0 - 0 - - Shape of balloon annotations @@ -606,12 +543,6 @@ 0 - - - 0 - 22 - - Standard to be used to draw non-continuous lines. @@ -634,12 +565,6 @@ 0 - - - 0 - 22 - - LineGroup @@ -748,12 +673,6 @@ 0 - - - 0 - 24 - - false @@ -883,6 +802,12 @@ if you are planning to use a drawing as a 1:1 cutting guide. Style of line to be used in BrokenView. + + + 32 + 32 + + LineStyleBreak diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensions.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensions.ui index 4062ec758b..f7dbc3a26b 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensions.ui +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensions.ui @@ -28,18 +28,6 @@ 0 - - - 0 - 0 - - - - - 0 - 0 - - Dimensions @@ -54,18 +42,9 @@ 0 - - - 0 - 22 - - Arrowhead size - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - 5.000000000000000 @@ -97,12 +76,6 @@ 0 - - - 0 - 22 - - Arrowhead style @@ -132,12 +105,6 @@ 0 - - - 184 - 22 - - Standard to be used for dimensional values @@ -189,12 +156,6 @@ 0 - - - 0 - 22 - - Append unit to dimension values @@ -211,12 +172,6 @@ - - - 0 - 0 - - true @@ -235,18 +190,9 @@ 0 - - - 0 - 22 - - Dimension text font size - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - 4.000000000000000 @@ -309,9 +255,6 @@ Multiplier of 'Font Size' - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - 0.100000000000000 @@ -328,12 +271,6 @@ Multiplier of 'Font Size' - - - 0 - 0 - - 0 @@ -361,18 +298,9 @@ Multiplier of 'Font Size' 0 - - - 0 - 22 - - Number of decimals if 'Use Global Decimals' is not used - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - 2 @@ -392,12 +320,6 @@ Multiplier of 'Font Size' 0 - - - 0 - 22 - - 12 @@ -409,9 +331,6 @@ Multiplier of 'Font Size' ⌀ - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - DiameterSymbol @@ -495,9 +414,6 @@ Multiplier of 'Font Size' Leave blank for automatic dimension format. Use %f, %g or %w specifiers to override. - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - formatSpec @@ -528,9 +444,6 @@ Multiplier of 'Font Size' Value * linewidth is the gap. Normally, no gap is used. If using a gap, the recommended value is 8. - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - 0.000000000000000 @@ -548,9 +461,6 @@ Multiplier of 'Font Size' Controls the size of the gap between the dimension point and the start of the extension line for ASME dimensions. Value * linewidth is the gap. Normally, no gap is used. If using a gap, the recommended value is 6. - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - 0.000000000000000 @@ -583,9 +493,6 @@ Multiplier of 'Font Size' Controls the size of spacing between dimension line and dimension text. Value * linewidth is the line spacing. - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - 2.000000000000000 diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawGeneral.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawGeneral.ui index 4849d86a46..902269a136 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawGeneral.ui +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawGeneral.ui @@ -31,18 +31,6 @@ 0 - - - 0 - 0 - - - - - 16777215 - 200 - - Drawing Update @@ -82,12 +70,6 @@ 0 - - - 0 - 20 - - Whether or not a page's 'Keep Updated' property can override the global 'Update With 3D' parameter @@ -145,12 +127,6 @@ This can slow down the response time. 0 - - - 0 - 20 - - true @@ -187,12 +163,6 @@ for ProjectionGroups 0 - - - 0 - 85 - - Labels @@ -201,12 +171,6 @@ for ProjectionGroups - - - 0 - 0 - - 0 @@ -246,18 +210,6 @@ for ProjectionGroups 0 - - - 0 - 0 - - - - - 16777215 - 16777215 - - 0 @@ -339,18 +291,6 @@ for ProjectionGroups 0 - - - 0 - 85 - - - - - 16777215 - 500 - - 0 @@ -391,12 +331,6 @@ for ProjectionGroups 0 - - - 184 - 0 - - Use first- or third-angle multiview projection convention @@ -434,12 +368,6 @@ for ProjectionGroups 0 - - - 184 - 22 - - Standard to be used to draw section lines. This affects the position of arrows and symbol. @@ -489,12 +417,6 @@ for ProjectionGroups 0 - - - 481 - 225 - - Files @@ -516,12 +438,6 @@ for ProjectionGroups - - - 0 - 0 - - true @@ -540,12 +456,6 @@ for ProjectionGroups 0 - - - 191 - 0 - - Preferred SVG or bitmap file for hatching. This value will also control the initial directory for choosing hatch patterns. You can use this to get hatch files from a local directory. @@ -565,12 +475,6 @@ for ProjectionGroups 0 - - - 191 - 0 - - Alternate file for personal LineGroup definition @@ -590,12 +494,6 @@ for ProjectionGroups 0 - - - 191 - 0 - - Default template file for new pages @@ -609,12 +507,6 @@ for ProjectionGroups - - - 0 - 0 - - true @@ -633,12 +525,6 @@ for ProjectionGroups 0 - - - 191 - 0 - - Default PAT pattern definition file for geometric hatching @@ -658,12 +544,6 @@ for ProjectionGroups 0 - - - 191 - 0 - - Default directory for welding symbols @@ -686,12 +566,6 @@ for ProjectionGroups 0 - - - 191 - 0 - - Starting directory for menu 'Insert Page using Template' @@ -708,12 +582,6 @@ for ProjectionGroups - - - 0 - 0 - - Template Directory @@ -743,12 +611,6 @@ for ProjectionGroups - - - 0 - 0 - - true @@ -761,12 +623,6 @@ for ProjectionGroups - - - 0 - 0 - - Default Template @@ -792,12 +648,6 @@ for ProjectionGroups 0 - - - 191 - 22 - - Name of the default PAT pattern @@ -817,12 +667,6 @@ for ProjectionGroups - - - 0 - 0 - - true @@ -835,12 +679,6 @@ for ProjectionGroups - - - 0 - 0 - - true @@ -945,18 +783,6 @@ for ProjectionGroups 0 - - - 0 - 0 - - - - - 16777215 - 100 - - Selection