From 9b51901f3566b568d6e80d1b5eca985d42e55fcf Mon Sep 17 00:00:00 2001
From: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>
Date: Tue, 3 Dec 2013 21:44:47 +0100
Subject: Text cleanup to amend lacking consistency
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Removed the "Visible:" header on the column selector.  It doesn't
  have to be there, and it's not in the similar equipment column selector
- PO2 --> pO₂ (and others)
- Use same initial case in the units selector in preferences

Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 qt-ui/divelistview.cpp |  2 --
 qt-ui/models.cpp       |  2 +-
 qt-ui/preferences.ui   | 24 ++++++++++++------------
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/qt-ui/divelistview.cpp b/qt-ui/divelistview.cpp
index b0b14fb9c..27027c84b 100644
--- a/qt-ui/divelistview.cpp
+++ b/qt-ui/divelistview.cpp
@@ -365,8 +365,6 @@ void DiveListView::reloadHeaderActions()
 	// Populate the context menu of the headers that will show
 	// the menu to show / hide columns.
 	if (!header()->actions().size()) {
-		QAction *visibleAction = new QAction(tr("Visible:"), header());
-		header()->addAction(visibleAction);
 		QSettings s;
 		s.beginGroup("DiveListColumnState");
 		for(int i = 0; i < model()->columnCount(); i++) {
diff --git a/qt-ui/models.cpp b/qt-ui/models.cpp
index 5dbb8ea22..6a1e007b7 100644
--- a/qt-ui/models.cpp
+++ b/qt-ui/models.cpp
@@ -63,7 +63,7 @@ void CleanerTableModel::setHeaderDataStrings(const QStringList& newHeaders)
 CylindersModel::CylindersModel(QObject* parent): current(0), rows(0)
 {
 	//	enum{REMOVE, TYPE, SIZE, WORKINGPRESS, START, END, O2, HE, DEPTH};
-	setHeaderDataStrings( QStringList() <<  "" << tr("Type") << tr("Size") << tr("WorkPress") << tr("StartPress") << tr("EndPress") <<  tr("O2%") << tr("He%") << tr("Switch at"));
+	setHeaderDataStrings( QStringList() <<  "" << tr("Type") << tr("Size") << tr("WorkPress") << tr("StartPress") << tr("EndPress") <<  trUtf8("O" UTF8_SUBSCRIPT_2 "%") << tr("He%") << tr("Switch at"));
 }
 
 CylindersModel *CylindersModel::instance()
diff --git a/qt-ui/preferences.ui b/qt-ui/preferences.ui
index b58acfed2..e80cc8493 100644
--- a/qt-ui/preferences.ui
+++ b/qt-ui/preferences.ui
@@ -301,7 +301,7 @@
             <item row="0" column="1">
              <widget class="QRadioButton" name="meter">
               <property name="text">
-               <string>Meter</string>
+	       <string>meter</string>
               </property>
               <attribute name="buttonGroup">
                <string notr="true">buttonGroup</string>
@@ -311,7 +311,7 @@
             <item row="0" column="2">
              <widget class="QRadioButton" name="feet">
               <property name="text">
-               <string>Feet</string>
+	       <string>feet</string>
               </property>
               <attribute name="buttonGroup">
                <string notr="true">buttonGroup</string>
@@ -328,7 +328,7 @@
             <item row="1" column="1">
              <widget class="QRadioButton" name="bar">
               <property name="text">
-               <string>Bar</string>
+	       <string>bar</string>
               </property>
               <attribute name="buttonGroup">
                <string notr="true">buttonGroup_2</string>
@@ -338,7 +338,7 @@
             <item row="1" column="2">
              <widget class="QRadioButton" name="psi">
               <property name="text">
-               <string>Psi</string>
+	       <string>psi</string>
               </property>
               <attribute name="buttonGroup">
                <string notr="true">buttonGroup_2</string>
@@ -355,7 +355,7 @@
             <item row="2" column="1">
              <widget class="QRadioButton" name="liter">
               <property name="text">
-               <string>Liter</string>
+	       <string>liter</string>
               </property>
               <attribute name="buttonGroup">
                <string notr="true">buttonGroup_3</string>
@@ -365,7 +365,7 @@
             <item row="2" column="2">
              <widget class="QRadioButton" name="cuft">
               <property name="text">
-               <string>CuFt</string>
+	       <string>cu ft</string>
               </property>
               <attribute name="buttonGroup">
                <string notr="true">buttonGroup_3</string>
@@ -382,7 +382,7 @@
             <item row="3" column="1">
              <widget class="QRadioButton" name="celsius">
               <property name="text">
-               <string>Celsius</string>
+	       <string>celsius</string>
               </property>
               <attribute name="buttonGroup">
                <string notr="true">buttonGroup_4</string>
@@ -392,7 +392,7 @@
             <item row="3" column="2">
              <widget class="QRadioButton" name="fahrenheit">
               <property name="text">
-               <string>Fahrenheit</string>
+	       <string>fahrenheit</string>
               </property>
               <attribute name="buttonGroup">
                <string notr="true">buttonGroup_4</string>
@@ -409,7 +409,7 @@
             <item row="4" column="1">
              <widget class="QRadioButton" name="kgs">
               <property name="text">
-               <string>Kg</string>
+	       <string>kg</string>
               </property>
               <attribute name="buttonGroup">
                <string notr="true">buttonGroup_5</string>
@@ -497,7 +497,7 @@
               <item>
                <widget class="QCheckBox" name="po2">
                 <property name="text">
-                 <string>pO2</string>
+		 <string>pO₂</string>
                 </property>
                </widget>
               </item>
@@ -538,7 +538,7 @@
               <item>
                <widget class="QCheckBox" name="pn2">
                 <property name="text">
-                 <string>pN2</string>
+		 <string>pN₂</string>
                 </property>
                </widget>
               </item>
@@ -643,7 +643,7 @@
                  <bool>false</bool>
                 </property>
                 <property name="text">
-                 <string>max PPO2</string>
+		 <string>max ppO₂</string>
                 </property>
                </widget>
               </item>
-- 
cgit v1.2.3-70-g09d2