From 414f4d706e89c00ce987ed349692c4243ee6f03a Mon Sep 17 00:00:00 2001
From: Uwe <donovaly@users.noreply.github.com>
Date: Sun, 14 Nov 2021 03:58:21 +0100
Subject: [PATCH] [PD] uniform Pad/pocket UI

now that pockets have the same functionality as pads, the UIs can be unified:

- the position of the Offset widget in the UI is better in pocket, thus use it for pad too
- add missing tabstops for pad
- add missing tooltip for pocket
- update tabstops for pocket
---
 src/Mod/PartDesign/Gui/TaskPadParameters.ui   | 55 ++++++++++++-------
 .../PartDesign/Gui/TaskPocketParameters.ui    | 11 +++-
 2 files changed, 44 insertions(+), 22 deletions(-)

diff --git a/src/Mod/PartDesign/Gui/TaskPadParameters.ui b/src/Mod/PartDesign/Gui/TaskPadParameters.ui
index 0946923afe..026cd8cd77 100644
--- a/src/Mod/PartDesign/Gui/TaskPadParameters.ui
+++ b/src/Mod/PartDesign/Gui/TaskPadParameters.ui
@@ -49,6 +49,23 @@
        </property>
       </widget>
      </item>
+     <item row="2" column="0">
+      <widget class="QLabel" name="labelOffset">
+       <property name="text">
+        <string>Offset to face</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <widget class="Gui::PrefQuantitySpinBox" name="offsetEdit">
+       <property name="toolTip">
+        <string>Offset from face at which pad will end</string>
+       </property>
+       <property name="keyboardTracking">
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
    <item>
@@ -224,27 +241,6 @@ measured along the specified direction</string>
      </layout>
     </widget>
    </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_5">
-     <item>
-      <widget class="QLabel" name="labelOffset">
-       <property name="text">
-        <string>Offset to face</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="Gui::PrefQuantitySpinBox" name="offsetEdit">
-       <property name="toolTip">
-        <string>Offset from face in which pad will end</string>
-       </property>
-       <property name="keyboardTracking">
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
    <item>
     <widget class="QCheckBox" name="checkBoxMidplane">
      <property name="enabled">
@@ -336,6 +332,23 @@ measured along the specified direction</string>
    <header>Gui/PrefWidgets.h</header>
   </customwidget>
  </customwidgets>
+ <tabstops>
+  <tabstop>changeMode</tabstop>
+  <tabstop>lengthEdit</tabstop>
+  <tabstop>offsetEdit</tabstop>
+  <tabstop>directionCB</tabstop>
+  <tabstop>checkBoxAlongDirection</tabstop>
+  <tabstop>checkBoxMidplane</tabstop>
+  <tabstop>checkBoxReversed</tabstop>
+  <tabstop>lengthEdit2</tabstop>
+  <tabstop>buttonFace</tabstop>
+  <tabstop>lineFaceName</tabstop>
+  <tabstop>checkBoxUpdateView</tabstop>
+  <tabstop>checkBoxDirection</tabstop>
+  <tabstop>XDirectionEdit</tabstop>
+  <tabstop>YDirectionEdit</tabstop>
+  <tabstop>ZDirectionEdit</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/src/Mod/PartDesign/Gui/TaskPocketParameters.ui b/src/Mod/PartDesign/Gui/TaskPocketParameters.ui
index 322dba0fa5..4b1171b122 100644
--- a/src/Mod/PartDesign/Gui/TaskPocketParameters.ui
+++ b/src/Mod/PartDesign/Gui/TaskPocketParameters.ui
@@ -52,12 +52,15 @@
      <item row="2" column="0">
       <widget class="QLabel" name="labelOffset">
        <property name="text">
-        <string>Offset</string>
+        <string>Offset to face</string>
        </property>
       </widget>
      </item>
      <item row="2" column="1">
       <widget class="Gui::PrefQuantitySpinBox" name="offsetEdit">
+       <property name="toolTip">
+        <string>Offset from face at which pocket will end</string>
+       </property>
        <property name="keyboardTracking">
         <bool>false</bool>
        </property>
@@ -327,12 +330,18 @@ measured along the specified direction</string>
   <tabstop>changeMode</tabstop>
   <tabstop>lengthEdit</tabstop>
   <tabstop>offsetEdit</tabstop>
+  <tabstop>directionCB</tabstop>
+  <tabstop>checkBoxAlongDirection</tabstop>
   <tabstop>checkBoxMidplane</tabstop>
   <tabstop>checkBoxReversed</tabstop>
   <tabstop>lengthEdit2</tabstop>
   <tabstop>buttonFace</tabstop>
   <tabstop>lineFaceName</tabstop>
   <tabstop>checkBoxUpdateView</tabstop>
+  <tabstop>checkBoxDirection</tabstop>
+  <tabstop>XDirectionEdit</tabstop>
+  <tabstop>YDirectionEdit</tabstop>
+  <tabstop>ZDirectionEdit</tabstop>
  </tabstops>
  <resources/>
  <connections/>