[PATCH 14/14] Prefer "temp." vs "temp" and sometimes "temperature"

Tim Wootton tim at tee-jay.demon.co.uk
Fri Jul 11 01:21:47 PDT 2014


For consitency in the UI
There are plenty more of these to find, and once in a while
"Temperature" looks more apropriate, like in a title, but most
of the time "temp." works best.

Signed-off-by: Tim Wootton <tim at tee-jay.demon.co.uk>
---
 qt-ui/maintab.cpp | 8 ++++----
 qt-ui/maintab.ui  | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/qt-ui/maintab.cpp b/qt-ui/maintab.cpp
index a19a29b..db63f11 100644
--- a/qt-ui/maintab.cpp
+++ b/qt-ui/maintab.cpp
@@ -239,11 +239,11 @@ void MainTab::displayMessage(QString str)
 void MainTab::updateTextLabels(bool showUnits)
 {
 	if (showUnits) {
-		ui.airTempLabel->setText(tr("Air temp [%1]").arg(get_temp_unit()));
-		ui.waterTempLabel->setText(tr("Water temp [%1]").arg(get_temp_unit()));
+		ui.airTempLabel->setText(tr("Air temp. [%1]").arg(get_temp_unit()));
+		ui.waterTempLabel->setText(tr("Water temp. [%1]").arg(get_temp_unit()));
 	} else {
-		ui.airTempLabel->setText(tr("Air temp"));
-		ui.waterTempLabel->setText(tr("Water temp"));
+		ui.airTempLabel->setText(tr("Air temp."));
+		ui.waterTempLabel->setText(tr("Water temp."));
 	}
 }
 
diff --git a/qt-ui/maintab.ui b/qt-ui/maintab.ui
index 62f32f4..7fa8620 100644
--- a/qt-ui/maintab.ui
+++ b/qt-ui/maintab.ui
@@ -69,14 +69,14 @@
           <item>
            <widget class="QLabel" name="airTempLabel">
             <property name="text">
-             <string>Air temp</string>
+             <string>Air temp.</string>
             </property>
            </widget>
           </item>
           <item>
            <widget class="QLabel" name="waterTempLabel">
             <property name="text">
-             <string>Water temp</string>
+             <string>Water temp.</string>
             </property>
            </widget>
           </item>
@@ -604,7 +604,7 @@
         <item row="3" column="1">
          <widget class="QGroupBox" name="groupBox_9">
           <property name="title">
-           <string>Air temperature</string>
+           <string>Air temp.</string>
           </property>
           <layout class="QHBoxLayout" name="horizontalLayout_11">
            <item>
@@ -623,7 +623,7 @@
         <item row="3" column="2">
          <widget class="QGroupBox" name="groupBox_8">
           <property name="title">
-           <string>Water temperature</string>
+           <string>Water temp.</string>
           </property>
           <layout class="QHBoxLayout" name="horizontalLayout_9">
            <item>
-- 
2.0.0



More information about the subsurface mailing list