From 2e2ccc1c521daa7b750c5b0d4b351adc4182fd57 Mon Sep 17 00:00:00 2001
From: Stefan Fuchs <sfuchs@gmx.de>
Date: Mon, 13 Mar 2017 21:19:25 +0100
Subject: [PATCH] Prefix and suffix changes in preferences and planner
 preferences

In preferences->profile:
Move "bar" from text description to entry field (5x)
Move "l/min" from text description to entry field
Add suffix "%" to GF values
Rename VPM-B conservatism

In planner preferences:
Add prefix "+" to VPM-B conservatism

Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
---
 desktop-widgets/plannerSettings.ui            |  3 ++
 .../preferences/preferences_graph.ui          | 38 +++++++++++++++----
 2 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/desktop-widgets/plannerSettings.ui b/desktop-widgets/plannerSettings.ui
index f1eddb70a..22dcda86a 100644
--- a/desktop-widgets/plannerSettings.ui
+++ b/desktop-widgets/plannerSettings.ui
@@ -501,6 +501,9 @@
           </item>
           <item row="12" column="2">
            <widget class="QSpinBox" name="vpmb_conservatism">
+            <property name="prefix">
+             <string>+</string>
+            </property>
             <property name="maximum">
              <number>4</number>
             </property>
diff --git a/desktop-widgets/preferences/preferences_graph.ui b/desktop-widgets/preferences/preferences_graph.ui
index 381819117..881c057ec 100644
--- a/desktop-widgets/preferences/preferences_graph.ui
+++ b/desktop-widgets/preferences/preferences_graph.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>650</width>
-    <height>578</height>
+    <height>581</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -26,7 +26,7 @@
          <bool>true</bool>
         </property>
         <property name="text">
-         <string>Threshold for pO₂ (bar)</string>
+         <string>Threshold for pO₂</string>
         </property>
        </widget>
       </item>
@@ -35,6 +35,9 @@
         <property name="enabled">
          <bool>true</bool>
         </property>
+        <property name="suffix">
+         <string>bar</string>
+        </property>
         <property name="singleStep">
          <double>0.100000000000000</double>
         </property>
@@ -46,7 +49,7 @@
          <bool>true</bool>
         </property>
         <property name="text">
-         <string>Threshold for pN₂ (bar)</string>
+         <string>Threshold for pN₂</string>
         </property>
        </widget>
       </item>
@@ -55,6 +58,9 @@
         <property name="enabled">
          <bool>true</bool>
         </property>
+        <property name="suffix">
+         <string>bar</string>
+        </property>
         <property name="singleStep">
          <double>0.100000000000000</double>
         </property>
@@ -66,7 +72,7 @@
          <bool>true</bool>
         </property>
         <property name="text">
-         <string>Threshold for pHe (bar)</string>
+         <string>Threshold for pHe</string>
         </property>
        </widget>
       </item>
@@ -75,6 +81,9 @@
         <property name="enabled">
          <bool>true</bool>
         </property>
+        <property name="suffix">
+         <string>bar</string>
+        </property>
         <property name="singleStep">
          <double>0.100000000000000</double>
         </property>
@@ -86,7 +95,7 @@
          <bool>true</bool>
         </property>
         <property name="text">
-         <string>pO₂ in calculating MOD (bar)</string>
+         <string>pO₂ in calculating MOD</string>
         </property>
        </widget>
       </item>
@@ -95,6 +104,9 @@
         <property name="enabled">
          <bool>true</bool>
         </property>
+        <property name="suffix">
+         <string>bar</string>
+        </property>
         <property name="singleStep">
          <double>0.100000000000000</double>
         </property>
@@ -110,12 +122,15 @@
       <item row="4" column="1">
        <widget class="QLabel" name="label_27">
         <property name="text">
-         <string>Dive planner default setpoint (bar)</string>
+         <string>Dive planner default setpoint</string>
         </property>
        </widget>
       </item>
       <item row="4" column="2">
        <widget class="QDoubleSpinBox" name="defaultSetpoint">
+        <property name="suffix">
+         <string>bar</string>
+        </property>
         <property name="decimals">
          <number>2</number>
         </property>
@@ -222,6 +237,9 @@
       </item>
       <item row="3" column="4">
        <widget class="QSpinBox" name="gfhigh">
+        <property name="suffix">
+         <string>%</string>
+        </property>
         <property name="minimum">
          <number>1</number>
         </property>
@@ -242,6 +260,9 @@
       </item>
       <item row="3" column="2">
        <widget class="QSpinBox" name="gflow">
+        <property name="suffix">
+         <string>%</string>
+        </property>
         <property name="minimum">
          <number>1</number>
         </property>
@@ -267,7 +288,7 @@
       <item row="5" column="1">
        <widget class="QLabel" name="MetabolicRate">
         <property name="text">
-         <string>Metabolic rate (ℓ O₂/min)</string>
+         <string>Metabolic rate O₂</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignCenter</set>
@@ -276,6 +297,9 @@
       </item>
       <item row="5" column="2">
        <widget class="QDoubleSpinBox" name="psro2rate">
+        <property name="suffix">
+         <string>ℓ/min</string>
+        </property>
         <property name="decimals">
          <number>3</number>
         </property>