[PATCH 03/14] Revert "maintab capitalisation and other text consitency"
Tim Wootton
tim at tee-jay.demon.co.uk
Thu Jul 10 16:06:40 PDT 2014
This reverts commit 6f389c806ca1d74c5a02c231c5b4f3bb69183e7b.
---
qt-ui/maintab.cpp | 20 ++++++-------
qt-ui/maintab.ui | 85 ++++++++++++++++++++++++++++++++++++++++++-------------
2 files changed, 75 insertions(+), 30 deletions(-)
diff --git a/qt-ui/maintab.cpp b/qt-ui/maintab.cpp
index db63f11..f84c63e 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"));
}
}
@@ -384,7 +384,7 @@ void MainTab::updateDiveInfo(bool clear)
ui.dateEdit->setDate(localTime.date());
ui.timeEdit->setTime(localTime.time());
if (MainWindow::instance() && MainWindow::instance()->dive_list()->selectedTrips().count() == 1) {
- setTabText(0, tr("Trip notes"));
+ setTabText(0, tr("Trip Notes"));
// only use trip relevant fields
ui.coordinates->setVisible(false);
ui.CoordinatedLabel->setVisible(false);
@@ -406,14 +406,14 @@ void MainTab::updateDiveInfo(bool clear)
ui.watertemp->setVisible(false);
// rename the remaining fields and fill data from selected trip
dive_trip_t *currentTrip = *MainWindow::instance()->dive_list()->selectedTrips().begin();
- ui.LocationLabel->setText(tr("Trip location"));
+ ui.LocationLabel->setText(tr("Trip Location"));
ui.location->setText(currentTrip->location);
- ui.NotesLabel->setText(tr("Trip notes"));
+ ui.NotesLabel->setText(tr("Trip Notes"));
ui.notes->setText(currentTrip->notes);
clearEquipment();
ui.equipmentTab->setEnabled(false);
} else {
- setTabText(0, tr("Dive notes"));
+ setTabText(0, tr("Dive Notes"));
// make all the fields visible writeable
ui.coordinates->setVisible(true);
ui.CoordinatedLabel->setVisible(true);
@@ -498,8 +498,8 @@ void MainTab::updateDiveInfo(bool clear)
// the overall average depth is really confusing when listed between the
// deepest and shallowest dive - let's just not set it
// ui.depthLimits->setAverage(get_depth_string(stats_selection.avg_depth, true));
- ui.depthLimits->overrideMaxToolTipText(tr("Deepest dive"));
- ui.depthLimits->overrideMinToolTipText(tr("Shallowest dive"));
+ ui.depthLimits->overrideMaxToolTipText(tr("Deepest Dive"));
+ ui.depthLimits->overrideMinToolTipText(tr("Shallowest Dive"));
ui.sacLimits->setMaximum(get_volume_string(stats_selection.max_sac, true).append(tr("/min")));
ui.sacLimits->setMinimum(get_volume_string(stats_selection.min_sac, true).append(tr("/min")));
ui.sacLimits->setAverage(get_volume_string(stats_selection.avg_sac, true).append(tr("/min")));
diff --git a/qt-ui/maintab.ui b/qt-ui/maintab.ui
index b6ddf9f..acf19a9 100644
--- a/qt-ui/maintab.ui
+++ b/qt-ui/maintab.ui
@@ -15,7 +15,7 @@
</property>
<widget class="QWidget" name="notesTab">
<attribute name="title">
- <string>Dive notes</string>
+ <string>Dive Notes</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_3">
<item row="2" column="1">
@@ -42,7 +42,16 @@
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_2">
- <property name="margin">
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
<number>0</number>
</property>
<property name="spacing">
@@ -60,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>
@@ -326,7 +335,16 @@
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_5">
- <property name="margin">
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
<number>0</number>
</property>
<property name="spacing">
@@ -338,7 +356,16 @@
<property name="spacing">
<number>0</number>
</property>
- <property name="margin">
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
<number>0</number>
</property>
<item>
@@ -361,7 +388,7 @@
</widget>
<widget class="QWidget" name="infoTab">
<attribute name="title">
- <string>Dive info</string>
+ <string>Dive Info</string>
</attribute>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
@@ -388,7 +415,16 @@
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_6">
- <property name="margin">
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
<number>0</number>
</property>
<property name="spacing">
@@ -435,7 +471,7 @@
<item row="1" column="0">
<widget class="QGroupBox" name="groupBox_3">
<property name="title">
- <string>Gases used</string>
+ <string>Gases Used</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
@@ -454,7 +490,7 @@
<item row="1" column="1">
<widget class="QGroupBox" name="groupBox_4">
<property name="title">
- <string>Gas consumed</string>
+ <string>Gas Consumed</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_5">
<item>
@@ -492,7 +528,7 @@
<item row="2" column="0">
<widget class="QGroupBox" name="groupBox_6">
<property name="title">
- <string>Max. depth</string>
+ <string>Max. Depth</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_7">
<item>
@@ -511,7 +547,7 @@
<item row="2" column="1">
<widget class="QGroupBox" name="groupBox_7">
<property name="title">
- <string>Avge. depth</string>
+ <string>Ave. Depth</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_8">
<item>
@@ -549,7 +585,7 @@
<item row="3" column="0">
<widget class="QGroupBox" name="groupBox_10">
<property name="title">
- <string>Air pressure</string>
+ <string>Air Pressure</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_10">
<item>
@@ -568,7 +604,7 @@
<item row="3" column="1">
<widget class="QGroupBox" name="groupBox_9">
<property name="title">
- <string>Air temp.</string>
+ <string>Air Temperature</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_11">
<item>
@@ -587,7 +623,7 @@
<item row="3" column="2">
<widget class="QGroupBox" name="groupBox_8">
<property name="title">
- <string>Water temp.</string>
+ <string>Water Temperature</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_9">
<item>
@@ -606,7 +642,7 @@
<item row="0" column="1">
<widget class="QGroupBox" name="groupBox_11">
<property name="title">
- <string>Dive time</string>
+ <string>Dive Time</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_12">
<item>
@@ -689,7 +725,16 @@
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_7">
- <property name="margin">
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
<number>0</number>
</property>
<property name="spacing">
@@ -710,7 +755,7 @@
<item row="0" column="1">
<widget class="QGroupBox" name="groupBox_8b">
<property name="title">
- <string>Temp.</string>
+ <string>Temperature</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_5b">
<item>
@@ -768,7 +813,7 @@
<item>
<widget class="QGroupBox" name="groupBox_11b">
<property name="title">
- <string>Total time</string>
+ <string>Total Time</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_11b">
<item>
@@ -826,7 +871,7 @@
<item>
<widget class="QGroupBox" name="groupBox_13">
<property name="title">
- <string>Gas consumption</string>
+ <string>Gas Consumption</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_15b">
<item>
--
2.0.0
More information about the subsurface
mailing list