From 5a34c5fb80d2f9a4116686914b3df7cf405af36f Mon Sep 17 00:00:00 2001
From: geolta <115890454+geolta@users.noreply.github.com>
Date: Sun, 27 Aug 2023 20:01:55 +0000
Subject: [PATCH] Improve Pad/Pocket Task Dialog (#10392)
* Improve Pad/Pocket Task Dialog
- Reordering elements
- hide select face if not necessary
- improve tab stop order
---
.../PartDesign/Gui/TaskExtrudeParameters.cpp | 10 +-
.../PartDesign/Gui/TaskPadPocketParameters.ui | 144 +++++++++---------
2 files changed, 75 insertions(+), 79 deletions(-)
diff --git a/src/Mod/PartDesign/Gui/TaskExtrudeParameters.cpp b/src/Mod/PartDesign/Gui/TaskExtrudeParameters.cpp
index 5e5d99dc1e..6ab7dce073 100644
--- a/src/Mod/PartDesign/Gui/TaskExtrudeParameters.cpp
+++ b/src/Mod/PartDesign/Gui/TaskExtrudeParameters.cpp
@@ -429,7 +429,7 @@ void TaskExtrudeParameters::setCheckboxes(Modes mode, Type type)
bool isMidplaneEnabled = false;
bool isMidplaneVisible = false;
bool isReversedEnabled = false;
- bool isFaceEditEnabled = false;
+ bool isFaceEditVisible = false;
bool isTaperEditVisible = false;
bool isTaperEdit2Visible = false;
@@ -461,7 +461,7 @@ void TaskExtrudeParameters::setCheckboxes(Modes mode, Type type)
else if (mode == Modes::ToFace) {
isOffsetEditVisible = true;
isReversedEnabled = true;
- isFaceEditEnabled = true;
+ isFaceEditVisible = true;
QMetaObject::invokeMethod(ui->lineFaceName, "setFocus", Qt::QueuedConnection);
// Go into reference selection mode if no face has been selected yet
if (ui->lineFaceName->property("FeatureName").isNull())
@@ -501,9 +501,9 @@ void TaskExtrudeParameters::setCheckboxes(Modes mode, Type type)
ui->checkBoxReversed->setEnabled(isReversedEnabled);
- ui->buttonFace->setEnabled(isFaceEditEnabled);
- ui->lineFaceName->setEnabled(isFaceEditEnabled);
- if (!isFaceEditEnabled) {
+ ui->buttonFace->setVisible(isFaceEditVisible);
+ ui->lineFaceName->setVisible(isFaceEditVisible);
+ if (!isFaceEditVisible) {
ui->buttonFace->setChecked(false);
}
}
diff --git a/src/Mod/PartDesign/Gui/TaskPadPocketParameters.ui b/src/Mod/PartDesign/Gui/TaskPadPocketParameters.ui
index a61989fa12..f99d321572 100644
--- a/src/Mod/PartDesign/Gui/TaskPadPocketParameters.ui
+++ b/src/Mod/PartDesign/Gui/TaskPadPocketParameters.ui
@@ -53,13 +53,30 @@
-
+
+
+ 2nd length
+
+
+
+ -
+
+
+ false
+
+
+ mm
+
+
+
+ -
Offset to face
- -
+
-
false
@@ -71,6 +88,53 @@
+ -
+
+
-
+
+
+
+ 0
+ 22
+
+
+
+ Select face
+
+
+ true
+
+
+
+ -
+
+
+ true
+
+
+
+
+
+ -
+
+
+ true
+
+
+ Applies length symmetrically to sketch plane
+
+
+ Symmetric to plane
+
+
+
+ -
+
+
+ Reversed
+
+
+
-
@@ -244,26 +308,6 @@ measured along the specified direction
- -
-
-
- true
-
-
- Applies length symmetrically to sketch plane
-
-
- Symmetric to plane
-
-
-
- -
-
-
- Reversed
-
-
-
-
-
@@ -288,27 +332,6 @@ measured along the specified direction
- -
-
-
-
-
-
- 2nd length
-
-
-
- -
-
-
- false
-
-
- mm
-
-
-
-
-
-
-
@@ -333,33 +356,6 @@ measured along the specified direction
- -
-
-
-
-
-
-
- 0
- 22
-
-
-
- Select face
-
-
- true
-
-
-
- -
-
-
- true
-
-
-
-
-
-
@@ -399,20 +395,20 @@ measured along the specified direction
changeMode
lengthEdit
+ lengthEdit2
offsetEdit
+ buttonFace
+ lineFaceName
+ checkBoxMidplane
+ checkBoxReversed
directionCB
checkBoxDirection
XDirectionEdit
YDirectionEdit
ZDirectionEdit
checkBoxAlongDirection
- checkBoxMidplane
- checkBoxReversed
taperEdit
- lengthEdit2
taperEdit2
- buttonFace
- lineFaceName
checkBoxUpdateView