From 5139182dbeb72e1601f28dd2f98c09b1f044bad2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Althaus?= Date: Sat, 17 Feb 2024 10:40:04 +0100 Subject: [PATCH] Refactor PD Pattern Tasks ui files All files contain the same add/remove buttons and a feature list. These common elements are moved into the TaskTransformedParameters.ui file. The same goes for the common OK Button that is used in a MultiTransform. The ui files for the patterns only contain their distinctive parameters. And the common ui files contain an empy widget that will be filled with the respective parameter widgets from the patterns. --- src/Mod/PartDesign/Gui/CMakeLists.txt | 1 + .../Gui/TaskLinearPatternParameters.ui | 109 +++--------------- .../PartDesign/Gui/TaskMirroredParameters.ui | 109 +++--------------- .../Gui/TaskMultiTransformParameters.ui | 101 ++++------------ .../Gui/TaskPolarPatternParameters.ui | 109 +++--------------- .../PartDesign/Gui/TaskScaledParameters.ui | 86 +++----------- .../Gui/TaskTransformedParameters.ui | 80 +++++++++++++ 7 files changed, 158 insertions(+), 437 deletions(-) create mode 100644 src/Mod/PartDesign/Gui/TaskTransformedParameters.ui diff --git a/src/Mod/PartDesign/Gui/CMakeLists.txt b/src/Mod/PartDesign/Gui/CMakeLists.txt index 009fd1a327..bcad23de7c 100644 --- a/src/Mod/PartDesign/Gui/CMakeLists.txt +++ b/src/Mod/PartDesign/Gui/CMakeLists.txt @@ -41,6 +41,7 @@ set(PartDesignGui_UIC_SRCS TaskHoleParameters.ui TaskRevolutionParameters.ui TaskTransformedMessages.ui + TaskTransformedParameters.ui TaskMirroredParameters.ui TaskLinearPatternParameters.ui TaskPolarPatternParameters.ui diff --git a/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.ui b/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.ui index 51ef47944e..1c89aa967e 100644 --- a/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.ui +++ b/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.ui @@ -7,47 +7,25 @@ 0 0 270 - 339 + 188 Form - - - - - - Add feature - - - true - - - - - - - Remove feature - - - true - - - - - - - - - List can be reordered by dragging - - - QAbstractItemView::InternalMove - - - + + 0 + + + 0 + + + 0 + + + 0 + @@ -184,27 +162,6 @@ - - - - - - OK - - - - - - - - - Update view - - - true - - - @@ -221,49 +178,11 @@ - buttonAddFeature - buttonRemoveFeature - listWidgetFeatures comboDirection checkReverse spinLength spinOccurrences - buttonOK - checkBoxUpdateView - - - buttonAddFeature - clicked(bool) - buttonRemoveFeature - setDisabled(bool) - - - 70 - 21 - - - 198 - 21 - - - - - buttonRemoveFeature - clicked(bool) - buttonAddFeature - setDisabled(bool) - - - 198 - 21 - - - 70 - 21 - - - - + diff --git a/src/Mod/PartDesign/Gui/TaskMirroredParameters.ui b/src/Mod/PartDesign/Gui/TaskMirroredParameters.ui index 4138d20fe8..881e61bb19 100644 --- a/src/Mod/PartDesign/Gui/TaskMirroredParameters.ui +++ b/src/Mod/PartDesign/Gui/TaskMirroredParameters.ui @@ -7,47 +7,25 @@ 0 0 253 - 260 + 55 Form - - - - - - Add feature - - - true - - - - - - - Remove feature - - - true - - - - - - - - - List can be reordered by dragging - - - QAbstractItemView::InternalMove - - - + + 0 + + + 0 + + + 0 + + + 0 + @@ -62,70 +40,11 @@ - - - - - - OK - - - - - - - - - Update view - - - true - - - - buttonAddFeature - buttonRemoveFeature - listWidgetFeatures comboPlane - buttonOK - checkBoxUpdateView - - - buttonAddFeature - clicked(bool) - buttonRemoveFeature - setDisabled(bool) - - - 66 - 21 - - - 186 - 21 - - - - - buttonRemoveFeature - clicked(bool) - buttonAddFeature - setDisabled(bool) - - - 186 - 21 - - - 66 - 21 - - - - + diff --git a/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.ui b/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.ui index 09b74c5cfa..b6e3d60d24 100644 --- a/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.ui +++ b/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.ui @@ -6,48 +6,26 @@ 0 0 - 256 - 266 + 229 + 174 Form - - - - - - - Add feature - - - true - - - - - - - Remove feature - - - true - - - - - - - - - List can be reordered by dragging - - - QAbstractItemView::InternalMove - - - + + + 0 + + + 0 + + + 0 + + + 0 + @@ -66,57 +44,20 @@ - + + + + - Update view - - - true + OK - buttonAddFeature - buttonRemoveFeature - listWidgetFeatures listTransformFeatures - checkBoxUpdateView - - - buttonAddFeature - clicked(bool) - buttonRemoveFeature - setDisabled(bool) - - - 67 - 21 - - - 188 - 21 - - - - - buttonRemoveFeature - clicked(bool) - buttonAddFeature - setDisabled(bool) - - - 188 - 21 - - - 67 - 21 - - - - + diff --git a/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.ui b/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.ui index 3ed6882fee..aecc727b4f 100644 --- a/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.ui +++ b/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.ui @@ -7,47 +7,25 @@ 0 0 253 - 339 + 206 Form - - - - - - Add feature - - - true - - - - - - - Remove feature - - - true - - - - - - - - - List can be reordered by dragging - - - QAbstractItemView::InternalMove - - - + + 0 + + + 0 + + + 0 + + + 0 + @@ -196,27 +174,6 @@ - - - - - - OK - - - - - - - - - Update view - - - true - - - @@ -233,49 +190,11 @@ - buttonAddFeature - buttonRemoveFeature - listWidgetFeatures comboAxis checkReverse polarAngle spinOccurrences - buttonOK - checkBoxUpdateView - - - buttonAddFeature - clicked(bool) - buttonRemoveFeature - setDisabled(bool) - - - 66 - 21 - - - 186 - 21 - - - - - buttonRemoveFeature - clicked(bool) - buttonAddFeature - setDisabled(bool) - - - 186 - 21 - - - 66 - 21 - - - - + diff --git a/src/Mod/PartDesign/Gui/TaskScaledParameters.ui b/src/Mod/PartDesign/Gui/TaskScaledParameters.ui index 07b60ed81e..112fdc4969 100644 --- a/src/Mod/PartDesign/Gui/TaskScaledParameters.ui +++ b/src/Mod/PartDesign/Gui/TaskScaledParameters.ui @@ -7,44 +7,25 @@ 0 0 253 - 270 + 85 Form - - - - - - Add feature - - - true - - - - - - - Remove feature - - - true - - - - - - - - - QAbstractItemView::InternalMove - - - + + 0 + + + 0 + + + 0 + + + 0 + @@ -55,7 +36,7 @@ - + @@ -73,40 +54,6 @@ - - - - - - OK - - - - - - - - - Update view - - - true - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - @@ -123,13 +70,8 @@ - buttonAddFeature - buttonRemoveFeature - listWidgetFeatures spinFactor spinOccurrences - buttonOK - checkBoxUpdateView diff --git a/src/Mod/PartDesign/Gui/TaskTransformedParameters.ui b/src/Mod/PartDesign/Gui/TaskTransformedParameters.ui new file mode 100644 index 0000000000..14bfe88d8a --- /dev/null +++ b/src/Mod/PartDesign/Gui/TaskTransformedParameters.ui @@ -0,0 +1,80 @@ + + + PartDesignGui::TaskTransformedParameters + + + + 0 + 0 + 262 + 207 + + + + Form + + + + + + + + Add feature + + + true + + + + + + + Remove feature + + + true + + + + + + + + + + 16777215 + 120 + + + + List can be reordered by dragging + + + QAbstractItemView::InternalMove + + + + + + + + + + Update view + + + true + + + + + + + buttonAddFeature + buttonRemoveFeature + listWidgetFeatures + checkBoxUpdateView + + + +