Separate text labels for air and water temperatures

The "air / water Temperatures" label didn't look to good.

Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Henrik Brautaset Aronsen 2013-11-30 11:13:40 +01:00 committed by Dirk Hohndel
parent 197b8e0bee
commit 51d298c8d5
2 changed files with 20 additions and 7 deletions

View file

@ -352,8 +352,9 @@ void MainTab::updateDiveInfo(int dive)
ui.visibilityLabel->setVisible(false); ui.visibilityLabel->setVisible(false);
ui.tagWidget->setVisible(false); ui.tagWidget->setVisible(false);
ui.TagLabel->setVisible(false); ui.TagLabel->setVisible(false);
ui.TemperaturesLabel->setVisible(false); ui.airTempLabel->setVisible(false);
ui.airtemp->setVisible(false); ui.airtemp->setVisible(false);
ui.waterTempLabel->setVisible(false);
ui.watertemp->setVisible(false); ui.watertemp->setVisible(false);
// rename the remaining fields and fill data from selected trip // rename the remaining fields and fill data from selected trip
dive_trip_t *currentTrip = *mainWindow()->dive_list()->selectedTrips().begin(); dive_trip_t *currentTrip = *mainWindow()->dive_list()->selectedTrips().begin();
@ -378,8 +379,9 @@ void MainTab::updateDiveInfo(int dive)
ui.DivemasterLabel->setVisible(true); ui.DivemasterLabel->setVisible(true);
ui.TagLabel->setVisible(true); ui.TagLabel->setVisible(true);
ui.tagWidget->setVisible(true); ui.tagWidget->setVisible(true);
ui.TemperaturesLabel->setVisible(true); ui.airTempLabel->setVisible(true);
ui.airtemp->setVisible(true); ui.airtemp->setVisible(true);
ui.waterTempLabel->setVisible(true);
ui.watertemp->setVisible(true); ui.watertemp->setVisible(true);
/* and fill them from the dive */ /* and fill them from the dive */
ui.rating->setCurrentStars(d->rating); ui.rating->setCurrentStars(d->rating);

View file

@ -65,11 +65,22 @@
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="QLabel" name="TemperaturesLabel"> <layout class="QHBoxLayout" name="temperatureLabels">
<property name="text"> <item>
<string>air / water Temperatures</string> <widget class="QLabel" name="airTempLabel">
</property> <property name="text">
</widget> <string>Air temp</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="waterTempLabel">
<property name="text">
<string>Water temp</string>
</property>
</widget>
</item>
</layout>
</item> </item>
<item row="2" column="0"> <item row="2" column="0">
<widget class="QDateTimeEdit" name="dateTimeEdit"> <widget class="QDateTimeEdit" name="dateTimeEdit">