From 722bda1935b3e5833659f5caf94fa10229727e27 Mon Sep 17 00:00:00 2001 From: Brad Eric Hollister Date: Sun, 27 Apr 2025 17:53:33 -0700 Subject: [PATCH] proposed fix for https://https://github.com/FreeCAD/FreeCAD/issues/20856github.com/FreeCAD/FreeCAD/issues/20856. NOTE: AddonManager and Telemetry addon ui files are in separate repos --- .../PreferencePages/DlgSettingsSelection.ui | 495 ++++++++++-------- .../PreferencePages/DlgSettingsWorkbenches.ui | 301 ++++++----- src/Mod/Draft/Resources/ui/preferences-dxf.ui | 232 +++++--- 3 files changed, 599 insertions(+), 429 deletions(-) diff --git a/src/Gui/PreferencePages/DlgSettingsSelection.ui b/src/Gui/PreferencePages/DlgSettingsSelection.ui index 3254937596..66f2de5507 100644 --- a/src/Gui/PreferencePages/DlgSettingsSelection.ui +++ b/src/Gui/PreferencePages/DlgSettingsSelection.ui @@ -7,241 +7,262 @@ 0 0 670 - 411 + 641 Selection - - - 9 - - - 9 - - - 9 - - - 9 - - - 6 - - - - - - 240 - 0 - - - - Enable preselection, highlighted with specified color - - - Enable preselection - - - true - - - EnablePreselection - - - View + + + + + Enable + + + + + + + + + 28 + 173 + 28 + + + + SelectionColor + + + View + + + + + + + Enable selection, highlighted with specified color + + + Enable selection + + + true + + + EnableSelection + + + View + + + + + + + + + + + 225 + 225 + 20 + + + + HighlightColor + + + View + + + + + + + + 240 + 0 + + + + Enable preselection, highlighted with specified color + + + Enable preselection + + + true + + + EnablePreselection + + + View + + + + - - - - + + + + Picking - - - 225 - 225 - 20 - - - - HighlightColor - - - View - - - - - - - Enable selection, highlighted with specified color - - - Enable selection - - - true - - - EnableSelection - - - View - - - - - - - - - - - 28 - 173 - 28 - - - - SelectionColor - - - View - - - - - - - - - Pick radius: - - - - - - - Qt::Horizontal - - - - 250 - 10 - - - - - - - - - - - 120 - 0 - - - - Area for picking elements in 3D view. + + + + + + + Radius: + + + + + + + Qt::Horizontal + + + + 250 + 10 + + + + + + + + + 120 + 0 + + + + Area for picking elements in 3D view. Larger value eases to pick things, but can make small features impossible to select. - - - Qt::ImhPreferNumbers - - - px - - - 1 - - - 0.500000000000000 - - - 200.000000000000000 - - - 5.000000000000000 - - - PickRadius - - - View - + + + Qt::ImhPreferNumbers + + + px + + + 1 + + + 0.500000000000000 + + + 200.000000000000000 + + + 5.000000000000000 + + + PickRadius + + + View + + + + + + - - - - Auto switch to the 3D view containing the selected item - - - SyncView - - - TreeView + + + + Auto + + + + + Auto switch to the 3D view containing the selected item + + + SyncView + + + TreeView + + + + + + + Auto expand tree item when the corresponding object is selected in 3D view + + + SyncSelection + + + TreeView + + + + - - - - Auto expand tree item when the corresponding object is selected in 3D view - - - SyncSelection - - - TreeView + + + + Misc. + + + + + Preselect the object in 3D view when hovering the cursor over the tree item + + + PreSelection + + + TreeView + + + + + + + Record selection in tree view in order to go back/forward using navigation button + + + RecordSelection + + + TreeView + + + + + + + Add checkboxes for selection in document tree + + + CheckBoxesSelection + + + TreeView + + + + - - - - Preselect the object in 3D view when hovering the cursor over the tree item - - - PreSelection - - - TreeView - - - - - - - Record selection in tree view in order to go back/forward using navigation button - - - RecordSelection - - - TreeView - - - - - - - Add checkboxes for selection in document tree - - - CheckBoxesSelection - - - TreeView - - - - + Qt::Vertical @@ -257,40 +278,60 @@ Larger value eases to pick things, but can make small features impossible to sel - - Gui::PrefDoubleSpinBox - QDoubleSpinBox -
Gui/PrefWidgets.h
- Gui::ColorButton QPushButton
Gui/Widgets.h
 - - Gui::PrefColorButton - Gui::ColorButton -
Gui/PrefWidgets.h
- Gui::PrefCheckBox QCheckBox
Gui/PrefWidgets.h
 + + Gui::PrefDoubleSpinBox + QDoubleSpinBox +
Gui/PrefWidgets.h
+ + + Gui::PrefColorButton + Gui::ColorButton +
Gui/PrefWidgets.h
+ - + checkBoxPreselection toggled(bool) HighlightColor setEnabled(bool) + + + 20 + 20 + + + 20 + 20 + + checkBoxSelection toggled(bool) SelectionColor setEnabled(bool) + + + 20 + 20 + + + 20 + 20 + + diff --git a/src/Gui/PreferencePages/DlgSettingsWorkbenches.ui b/src/Gui/PreferencePages/DlgSettingsWorkbenches.ui index c61940fd3b..fffceab9c6 100644 --- a/src/Gui/PreferencePages/DlgSettingsWorkbenches.ui +++ b/src/Gui/PreferencePages/DlgSettingsWorkbenches.ui @@ -6,158 +6,185 @@ 0 0 - 607 + 980 859 Available Workbenches - - - - - 6 + + + + + Workbenches - - 0 - - - 0 - - - 0 - - - 0 - - - - - Workbench selector items style: - - - - - - - Customize how the items are displayed. - - - - - - - - - - - - 6 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - Workbench selector type: - - - - - - - Choose the workbench selector widget type (restart required). - - - - - - - - - - 0 - 0 - - - - - 0 - 50 - - - - <html><head/><body><p>You can reorder workbenches by drag and drop or sort them by right-clicking on any workbench and select <span style=" font-weight:600; font-style:italic;">Sort alphabetically</span>. Additional workbenches can be installed through the addon manager.</p><p> + + + + + + 0 + 0 + + + + + 0 + 50 + + + + <html><head/><body><p>You can reorder workbenches by drag and drop or sort them by right-clicking on any workbench and select <span style=" font-weight:600; font-style:italic;">Sort alphabetically</span>. Additional workbenches can be installed through the addon manager.</p><p> Currently, your system has the following workbenches:</p></body></html> - - - true - + + + true + + + + + + + - - - - If checked, application will remember which workbench is active for each tab of the viewport - - - Remember active workbench by tab - - - false - - - SaveWBbyTab - - - View + + + + Selectors + + + + + 6 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Workbench selector items style: + + + + + + + Customize how the items are displayed. + + + + + + + + + 6 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Workbench selector type: + + + + + + + Choose the workbench selector widget type (restart required). + + + + + + - - - - 6 + + + + Startup - - 0 - - - 0 - - - 0 - - - 0 - - - - - Start up workbench: - - - - - - - Choose which workbench will be activated and shown + + + + + 6 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Start up workbench: + + + + + + + Choose which workbench will be activated and shown after FreeCAD launches - - - - + + + + + + + + + If checked, application will remember which workbench is active for each tab of the viewport + + + Remember active workbench by tab + + + false + + + SaveWBbyTab + + + View + + + + + diff --git a/src/Mod/Draft/Resources/ui/preferences-dxf.ui b/src/Mod/Draft/Resources/ui/preferences-dxf.ui index ac7bd3e92b..4736743fd8 100644 --- a/src/Mod/Draft/Resources/ui/preferences-dxf.ui +++ b/src/Mod/Draft/Resources/ui/preferences-dxf.ui @@ -7,73 +7,76 @@ 0 0 649 - 773 + 800 DXF - - - 6 - - - 9 - + - - - This preferences dialog will be shown when importing/ exporting DXF files + + + General options - - Show this dialog when importing and exporting - - - true - - - dxfShowDialog - - - Mod/Draft - - - - - - - Python importer is used, otherwise the newer C++ is used. + + + + + This preferences dialog will be shown when importing/ exporting DXF files + + + Show this dialog when importing and exporting + + + true + + + dxfShowDialog + + + Mod/Draft + + + + + + + Python importer is used, otherwise the newer C++ is used. Note: C++ importer is faster, but is not as featureful yet - - - Use legacy Python importer - - - false - - - dxfUseLegacyImporter - - - Mod/Draft - - - - - - - Python exporter is used, otherwise the newer C++ is used. + + + Use legacy Python importer + + + false + + + dxfUseLegacyImporter + + + Mod/Draft + + + + + + + Python exporter is used, otherwise the newer C++ is used. Note: C++ exporter is faster, but is not as featureful yet - - - Use legacy Python exporter - - - dxfUseLegacyExporter - - - Mod/Draft - + + + Use legacy Python exporter + + + dxfUseLegacyExporter + + + Mod/Draft + + + + @@ -684,11 +687,6 @@ This might fail for post DXF R12 templates. - - Gui::PrefRadioButton - QRadioButton -
Gui/PrefWidgets.h
- Gui::PrefCheckBox QCheckBox @@ -699,69 +697,173 @@ This might fail for post DXF R12 templates. QDoubleSpinBox
Gui/PrefWidgets.h
 + + Gui::PrefRadioButton + QRadioButton +
Gui/PrefWidgets.h
+ - - + checkBox_dxfUseLegacyImporter toggled(bool) label_Create setEnabled(bool) + + + 20 + 20 + + + 20 + 20 + + checkBox_dxfUseLegacyImporter toggled(bool) radioButton_dxfCreatePart setEnabled(bool) + + + 20 + 20 + + + 20 + 20 + + checkBox_dxfUseLegacyImporter toggled(bool) radioButton_dxfCreateDraft setEnabled(bool) + + + 20 + 20 + + + 20 + 20 + + checkBox_dxfUseLegacyImporter toggled(bool) radioButton_dxfCreateSketch setEnabled(bool) + + + 20 + 20 + + + 20 + 20 + + checkBox_dxfUseLegacyImporter toggled(bool) checkBox_joingeometry setEnabled(bool) + + + 20 + 20 + + + 20 + 20 + + checkBox_dxfUseLegacyImporter toggled(bool) checkBox_dxfStdSize setEnabled(bool) + + + 20 + 20 + + + 20 + 20 + + checkBox_dxfUseLegacyImporter toggled(bool) checkBox_importDxfHatches setEnabled(bool) + + + 20 + 20 + + + 20 + 20 + + checkBox_dxfUseLegacyImporter toggled(bool) checkBox_renderPolylineWidth setEnabled(bool) + + + 20 + 20 + + + 20 + 20 + + checkBox_dxfUseLegacyExporter toggled(bool) checkBox_dxfmesh setEnabled(bool) + + + 20 + 20 + + + 20 + 20 + + checkBox_dxfUseLegacyExporter toggled(bool) checkBox_dxfproject setEnabled(bool) + + + 20 + 20 + + + 20 + 20 + +