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

---
 src/Mod/Points/Gui/DlgPointsRead.ui | 208 ++++++++++++++--------------
 1 file changed, 104 insertions(+), 104 deletions(-)

diff --git a/src/Mod/Points/Gui/DlgPointsRead.ui b/src/Mod/Points/Gui/DlgPointsRead.ui
index 5b6aa5a5c6..efe7dad1b8 100644
--- a/src/Mod/Points/Gui/DlgPointsRead.ui
+++ b/src/Mod/Points/Gui/DlgPointsRead.ui
@@ -52,36 +52,6 @@
       <property name="spacing">
        <number>6</number>
       </property>
-      <item row="1" column="0">
-       <layout class="QGridLayout">
-        <property name="margin">
-         <number>0</number>
-        </property>
-        <property name="spacing">
-         <number>6</number>
-        </property>
-        <item row="0" column="1">
-         <widget class="QLineEdit" name="lineEditClusterStart"/>
-        </item>
-        <item row="1" column="1">
-         <widget class="QLineEdit" name="lineEditComments"/>
-        </item>
-        <item row="1" column="0">
-         <widget class="QLabel" name="textLabel4">
-          <property name="text">
-           <string>Ignore lines starting with:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="0">
-         <widget class="QLabel" name="textLabel3">
-          <property name="text">
-           <string>Cluster by lines starting with:</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
       <item row="0" column="0">
        <widget class="QGroupBox" name="groupBox">
         <property name="title">
@@ -117,7 +87,37 @@
         </layout>
        </widget>
       </item>
-     </layout>
+     <item row="1" column="0">
+       <layout class="QGridLayout">
+        <property name="margin">
+         <number>0</number>
+        </property>
+        <property name="spacing">
+         <number>6</number>
+        </property>
+        <item row="0" column="0">
+         <widget class="QLabel" name="textLabel3">
+          <property name="text">
+           <string>Cluster by lines starting with:</string>
+          </property>
+         </widget>
+        </item>
+       <item row="0" column="1">
+         <widget class="QLineEdit" name="lineEditClusterStart"/>
+        </item>
+        <item row="1" column="0">
+         <widget class="QLabel" name="textLabel4">
+          <property name="text">
+           <string>Ignore lines starting with:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="1">
+         <widget class="QLineEdit" name="lineEditComments"/>
+        </item>
+        </layout>
+      </item>
+      </layout>
     </widget>
    </item>
    <item>
@@ -140,35 +140,68 @@
         <property name="spacing">
          <number>6</number>
         </property>
-        <item row="3" column="1">
-         <widget class="QComboBox" name="comboBoxNextBlock2">
+        <item row="0" column="0">
+         <widget class="QLabel" name="textLabel6">
+          <property name="text">
+           <string>Number separator:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="1">
+         <widget class="QComboBox" name="comboBoxSeparator">
+          <property name="editable">
+           <bool>true</bool>
+          </property>
           <item>
            <property name="text">
-            <string>none</string>
+            <string>,</string>
            </property>
           </item>
           <item>
            <property name="text">
-            <string>I,J,K (normal vector)</string>
+            <string>;</string>
            </property>
           </item>
           <item>
            <property name="text">
-            <string>I,K (normal vector 2D)</string>
+            <string>\t</string>
            </property>
           </item>
           <item>
            <property name="text">
-            <string>R,G,B (color)</string>
+            <string>\w</string>
+           </property>
+          </item>
+         </widget>
+        </item>
+        <item row="1" column="0">
+         <widget class="QLabel" name="textLabel7">
+          <property name="text">
+           <string>Points format:</string>
+          </property>
+         </widget>
+        </item>
+       <item row="1" column="1">
+         <widget class="QComboBox" name="comboBoxPointsFormat">
+          <item>
+           <property name="text">
+            <string>X,Y,Z</string>
            </property>
           </item>
           <item>
            <property name="text">
-            <string>I (Gray value)</string>
+            <string>X,Y</string>
            </property>
           </item>
          </widget>
         </item>
+        <item row="2" column="0">
+         <widget class="QLabel" name="textLabel8">
+          <property name="text">
+           <string>Next block:</string>
+          </property>
+         </widget>
+        </item>
         <item row="2" column="1">
          <widget class="QComboBox" name="comboBoxNextBlock1">
           <item>
@@ -198,13 +231,42 @@
           </item>
          </widget>
         </item>
-        <item row="0" column="0">
-         <widget class="QLabel" name="textLabel6">
+        <item row="3" column="0">
+         <widget class="QLabel" name="textLabel8_2">
           <property name="text">
-           <string>Number separator:</string>
+           <string>Next block:</string>
           </property>
          </widget>
         </item>
+        <item row="3" column="1">
+         <widget class="QComboBox" name="comboBoxNextBlock2">
+          <item>
+           <property name="text">
+            <string>none</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>I,J,K (normal vector)</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>I,K (normal vector 2D)</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>R,G,B (color)</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>I (Gray value)</string>
+           </property>
+          </item>
+         </widget>
+        </item>
         <item row="4" column="0">
          <widget class="QLabel" name="textLabel8_2_2">
           <property name="text">
@@ -212,20 +274,6 @@
           </property>
          </widget>
         </item>
-        <item row="2" column="0">
-         <widget class="QLabel" name="textLabel8">
-          <property name="text">
-           <string>Next block:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="3" column="0">
-         <widget class="QLabel" name="textLabel8_2">
-          <property name="text">
-           <string>Next block:</string>
-          </property>
-         </widget>
-        </item>
         <item row="4" column="1">
          <widget class="QComboBox" name="comboBoxNextBlock3">
           <item>
@@ -255,55 +303,7 @@
           </item>
          </widget>
         </item>
-        <item row="0" column="1">
-         <widget class="QComboBox" name="comboBoxSeparator">
-          <property name="editable">
-           <bool>true</bool>
-          </property>
-          <item>
-           <property name="text">
-            <string>,</string>
-           </property>
-          </item>
-          <item>
-           <property name="text">
-            <string>;</string>
-           </property>
-          </item>
-          <item>
-           <property name="text">
-            <string>\t</string>
-           </property>
-          </item>
-          <item>
-           <property name="text">
-            <string>\w</string>
-           </property>
-          </item>
-         </widget>
-        </item>
-        <item row="1" column="1">
-         <widget class="QComboBox" name="comboBoxPointsFormat">
-          <item>
-           <property name="text">
-            <string>X,Y,Z</string>
-           </property>
-          </item>
-          <item>
-           <property name="text">
-            <string>X,Y</string>
-           </property>
-          </item>
-         </widget>
-        </item>
-        <item row="1" column="0">
-         <widget class="QLabel" name="textLabel7">
-          <property name="text">
-           <string>Points format:</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
+        </layout>
       </item>
      </layout>
     </widget>