From 6f43c16ea9cc2c0323c5ac78059cf3a118c9a528 Mon Sep 17 00:00:00 2001
From: Rick Walsh <rickmwalsh@gmail.com>
Date: Fri, 16 Sep 2016 23:47:23 +1000
Subject: [PATCH] Preferences UI: graph tabstop order should match display
 order

When 'tabbing' through data fields, the order should be the same as the order
displayed on the screen. Getting the order right in the .ui file fixes the
tabstop order without needing to define it explicitly.

Signed-off-by: Rick Walsh <rickmwalsh@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 .../preferences/preferences_graph.ui          | 74 +++++++++----------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/desktop-widgets/preferences/preferences_graph.ui b/desktop-widgets/preferences/preferences_graph.ui
index fed40bbbf..e0d0cda54 100644
--- a/desktop-widgets/preferences/preferences_graph.ui
+++ b/desktop-widgets/preferences/preferences_graph.ui
@@ -133,6 +133,13 @@
       <string>Misc</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_2">
+      <item row="0" column="0">
+       <widget class="QLabel" name="label_19">
+        <property name="text">
+         <string>GFLow</string>
+        </property>
+       </widget>
+      </item>
       <item row="0" column="1">
        <widget class="QSpinBox" name="gflow">
         <property name="minimum">
@@ -143,6 +150,30 @@
         </property>
        </widget>
       </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="label_20">
+        <property name="text">
+         <string>GFHigh</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QSpinBox" name="gfhigh">
+        <property name="minimum">
+         <number>1</number>
+        </property>
+        <property name="maximum">
+         <number>150</number>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="label_26">
+        <property name="text">
+         <string>Default CCR set-point for dive planning</string>
+        </property>
+       </widget>
+      </item>
       <item row="2" column="1">
        <widget class="QDoubleSpinBox" name="defaultSetpoint">
         <property name="suffix">
@@ -159,13 +190,6 @@
         </property>
        </widget>
       </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="label_26">
-        <property name="text">
-         <string>Default CCR set-point for dive planning</string>
-        </property>
-       </widget>
-      </item>
       <item row="3" column="0">
        <widget class="QLabel" name="pSCR">
         <property name="text">
@@ -173,30 +197,6 @@
         </property>
        </widget>
       </item>
-      <item row="0" column="0">
-       <widget class="QLabel" name="label_19">
-        <property name="text">
-         <string>GFLow</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="label_20">
-        <property name="text">
-         <string>GFHigh</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QSpinBox" name="gfhigh">
-        <property name="minimum">
-         <number>1</number>
-        </property>
-        <property name="maximum">
-         <number>150</number>
-        </property>
-       </widget>
-      </item>
       <item row="3" column="1">
        <widget class="QDoubleSpinBox" name="psro2rate">
         <property name="suffix">
@@ -224,10 +224,10 @@
         </property>
        </widget>
       </item>
-      <item row="7" column="0" colspan="2">
-       <widget class="QCheckBox" name="show_ccr_sensors">
+      <item row="5" column="0" colspan="2">
+       <widget class="QCheckBox" name="gf_low_at_maxdepth">
         <property name="text">
-         <string>CCR: show individual O₂ sensor values when viewing pO₂</string>
+         <string>GFLow at max depth</string>
         </property>
        </widget>
       </item>
@@ -238,10 +238,10 @@
         </property>
        </widget>
       </item>
-      <item row="5" column="0" colspan="2">
-       <widget class="QCheckBox" name="gf_low_at_maxdepth">
+      <item row="7" column="0" colspan="2">
+       <widget class="QCheckBox" name="show_ccr_sensors">
         <property name="text">
-         <string>GFLow at max depth</string>
+         <string>CCR: show individual O₂ sensor values when viewing pO₂</string>
         </property>
        </widget>
       </item>