From 606bf377c539610950114f2bf2f55af0de4a2209 Mon Sep 17 00:00:00 2001
From: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>
Date: Thu, 17 Jul 2014 19:45:55 +0200
Subject: Use "6m" and "20ft" instead of "6m/20ft".

Get rid of unit type shortcut in planner.  Also use "to" instead of "-" in ascent rate intervals.

Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 qt-ui/diveplanner.cpp    |  4 ++++
 qt-ui/plannerSettings.ui | 12 ++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/qt-ui/diveplanner.cpp b/qt-ui/diveplanner.cpp
index e0a6959de..8882664c9 100644
--- a/qt-ui/diveplanner.cpp
+++ b/qt-ui/diveplanner.cpp
@@ -451,9 +451,13 @@ void PlannerSettingsWidget::settingsChanged()
 	if (get_units()->length == units::FEET) {
 		vs.append(tr("ft/min"));
 		ui.lastStop->setText(tr("Last stop at 20ft"));
+		ui.asc50to6->setText(tr("50% avg. depth to 20ft"));
+		ui.asc6toSurf->setText(tr("20ft to surface"));
 	} else {
 		vs.append(tr("m/min"));
 		ui.lastStop->setText(tr("Last stop at 6m"));
+		ui.asc50to6->setText(tr("50% avg. depth to 6m"));
+		ui.asc6toSurf->setText(tr("6m to surface"));
 	}
 	updateUnitsUI();
 	ui.ascRate75->setSuffix(vs);
diff --git a/qt-ui/plannerSettings.ui b/qt-ui/plannerSettings.ui
index 3cca8e961..6867ca069 100644
--- a/qt-ui/plannerSettings.ui
+++ b/qt-ui/plannerSettings.ui
@@ -91,7 +91,7 @@
          <item row="1" column="0">
           <widget class="QLabel" name="label_2">
            <property name="text">
-            <string>75%-50% avg. depth</string>
+            <string>75% to 50% avg. depth</string>
            </property>
           </widget>
          </item>
@@ -106,9 +106,9 @@
           </widget>
          </item>
          <item row="2" column="0">
-          <widget class="QLabel" name="label_3">
+          <widget class="QLabel" name="asc50to6">
            <property name="text">
-            <string>50% avg. depth - 6m/20ft</string>
+            <string>50% avg. depth to 6m</string>
            </property>
           </widget>
          </item>
@@ -123,9 +123,9 @@
           </widget>
          </item>
          <item row="3" column="0">
-          <widget class="QLabel" name="label_4">
+          <widget class="QLabel" name="asc6toSurf">
            <property name="text">
-            <string>6m/20ft to surface</string>
+            <string>6m to surface</string>
            </property>
           </widget>
          </item>
@@ -285,7 +285,7 @@
       <item row="3" column="0" colspan="2">
        <widget class="QCheckBox" name="lastStop">
         <property name="text">
-         <string>Last Stop at 6m/20ft</string>
+         <string>Last Stop at 6m</string>
         </property>
        </widget>
       </item>
-- 
cgit v1.2.3-70-g09d2