From 08924e83340ea14e8840e47eaadf87ad429f9677 Mon Sep 17 00:00:00 2001
From: Chris Hennes <chennes@pioneerlibrarysystem.org>
Date: Mon, 28 Mar 2022 10:13:00 -0500
Subject: [PATCH] PD: PR4556 Step 3: sort QGridLayout by row-col

---
 .../PartDesign/Gui/TaskPadPocketParameters.ui | 30 +++++++++----------
 .../PartDesign/Gui/TaskThicknessParameters.ui | 14 ++++-----
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/Mod/PartDesign/Gui/TaskPadPocketParameters.ui b/src/Mod/PartDesign/Gui/TaskPadPocketParameters.ui
index e218caa6ea..c66becbecd 100644
--- a/src/Mod/PartDesign/Gui/TaskPadPocketParameters.ui
+++ b/src/Mod/PartDesign/Gui/TaskPadPocketParameters.ui
@@ -134,7 +134,14 @@ the sketch plane's normal vector will be used</string>
          <bool>false</bool>
         </property>
         <layout class="QGridLayout" name="gridLayout_2">
-         <item row="0" column="1">
+         <item row="0" column="0">
+          <widget class="QLabel" name="labelXSkew">
+           <property name="text">
+            <string>x</string>
+           </property>
+          </widget>
+         </item>
+        <item row="0" column="1">
           <widget class="Gui::DoubleSpinBox" name="XDirectionEdit">
            <property name="toolTip">
             <string>x-component of direction vector</string>
@@ -156,10 +163,10 @@ the sketch plane's normal vector will be used</string>
            </property>
           </widget>
          </item>
-         <item row="2" column="0">
-          <widget class="QLabel" name="labelZSkew">
+         <item row="1" column="0">
+          <widget class="QLabel" name="labelYSkew">
            <property name="text">
-            <string>z</string>
+            <string>y</string>
            </property>
           </widget>
          </item>
@@ -185,10 +192,10 @@ the sketch plane's normal vector will be used</string>
            </property>
           </widget>
          </item>
-         <item row="1" column="0">
-          <widget class="QLabel" name="labelYSkew">
+         <item row="2" column="0">
+          <widget class="QLabel" name="labelZSkew">
            <property name="text">
-            <string>y</string>
+            <string>z</string>
            </property>
           </widget>
          </item>
@@ -217,14 +224,7 @@ the sketch plane's normal vector will be used</string>
            </property>
           </widget>
          </item>
-         <item row="0" column="0">
-          <widget class="QLabel" name="labelXSkew">
-           <property name="text">
-            <string>x</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
+         </layout>
        </widget>
       </item>
       <item row="3" column="0">
diff --git a/src/Mod/PartDesign/Gui/TaskThicknessParameters.ui b/src/Mod/PartDesign/Gui/TaskThicknessParameters.ui
index 15e430165d..006076e68b 100644
--- a/src/Mod/PartDesign/Gui/TaskThicknessParameters.ui
+++ b/src/Mod/PartDesign/Gui/TaskThicknessParameters.ui
@@ -95,13 +95,6 @@ click again to end selection</string>
        </property>
       </widget>
      </item>
-     <item row="2" column="0">
-      <widget class="QLabel" name="label_3">
-       <property name="text">
-        <string>Join Type</string>
-       </property>
-      </widget>
-     </item>
      <item row="1" column="1">
       <widget class="QComboBox" name="modeComboBox">
        <item>
@@ -121,6 +114,13 @@ click again to end selection</string>
        </item>
       </widget>
      </item>
+     <item row="2" column="0">
+      <widget class="QLabel" name="label_3">
+       <property name="text">
+        <string>Join Type</string>
+       </property>
+      </widget>
+     </item>
      <item row="2" column="1">
       <widget class="QComboBox" name="joinComboBox">
        <item>