Implements consistent capitalisation. Was a mix of "Temp" "Temp." and "Temperature, settles on "Temp.". qt-deskigner seems to have folded top bottom left and right margins into just "margin" where they were all the same(0), hope that's ok.
Signed-off-by: Tim Wootton <t...@tee-jay.demon.co.uk> --- qt-ui/maintab.cpp | 20 ++++++------- qt-ui/maintab.ui | 85 +++++++++++++------------------------------------------ 2 files changed, 30 insertions(+), 75 deletions(-) diff --git a/qt-ui/maintab.cpp b/qt-ui/maintab.cpp index f84c63e..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.")); } } @@ -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 acf19a9..b6ddf9f 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,16 +42,7 @@ </rect> </property> <layout class="QGridLayout" name="gridLayout_2"> - <property name="leftMargin"> - <number>0</number> - </property> - <property name="topMargin"> - <number>0</number> - </property> - <property name="rightMargin"> - <number>0</number> - </property> - <property name="bottomMargin"> + <property name="margin"> <number>0</number> </property> <property name="spacing"> @@ -69,14 +60,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> @@ -335,16 +326,7 @@ </rect> </property> <layout class="QGridLayout" name="gridLayout_5"> - <property name="leftMargin"> - <number>0</number> - </property> - <property name="topMargin"> - <number>0</number> - </property> - <property name="rightMargin"> - <number>0</number> - </property> - <property name="bottomMargin"> + <property name="margin"> <number>0</number> </property> <property name="spacing"> @@ -356,16 +338,7 @@ <property name="spacing"> <number>0</number> </property> - <property name="leftMargin"> - <number>0</number> - </property> - <property name="topMargin"> - <number>0</number> - </property> - <property name="rightMargin"> - <number>0</number> - </property> - <property name="bottomMargin"> + <property name="margin"> <number>0</number> </property> <item> @@ -388,7 +361,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"> @@ -415,16 +388,7 @@ </rect> </property> <layout class="QGridLayout" name="gridLayout_6"> - <property name="leftMargin"> - <number>0</number> - </property> - <property name="topMargin"> - <number>0</number> - </property> - <property name="rightMargin"> - <number>0</number> - </property> - <property name="bottomMargin"> + <property name="margin"> <number>0</number> </property> <property name="spacing"> @@ -471,7 +435,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> @@ -490,7 +454,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> @@ -528,7 +492,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> @@ -547,7 +511,7 @@ <item row="2" column="1"> <widget class="QGroupBox" name="groupBox_7"> <property name="title"> - <string>Ave. Depth</string> + <string>Avge. depth</string> </property> <layout class="QHBoxLayout" name="horizontalLayout_8"> <item> @@ -585,7 +549,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> @@ -604,7 +568,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 +587,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> @@ -642,7 +606,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> @@ -725,16 +689,7 @@ </rect> </property> <layout class="QGridLayout" name="gridLayout_7"> - <property name="leftMargin"> - <number>0</number> - </property> - <property name="topMargin"> - <number>0</number> - </property> - <property name="rightMargin"> - <number>0</number> - </property> - <property name="bottomMargin"> + <property name="margin"> <number>0</number> </property> <property name="spacing"> @@ -755,7 +710,7 @@ <item row="0" column="1"> <widget class="QGroupBox" name="groupBox_8b"> <property name="title"> - <string>Temperature</string> + <string>Temp.</string> </property> <layout class="QHBoxLayout" name="horizontalLayout_5b"> <item> @@ -813,7 +768,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> @@ -871,7 +826,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 _______________________________________________ subsurface mailing list subsurface@hohndel.org http://lists.hohndel.org/cgi-bin/mailman/listinfo/subsurface