summaryrefslogtreecommitdiffstats
path: root/qt-ui
diff options
context:
space:
mode:
Diffstat (limited to 'qt-ui')
-rw-r--r--qt-ui/maintab.cpp26
-rw-r--r--qt-ui/maintab.ui200
2 files changed, 132 insertions, 94 deletions
diff --git a/qt-ui/maintab.cpp b/qt-ui/maintab.cpp
index 2467dd0d7..d72df965c 100644
--- a/qt-ui/maintab.cpp
+++ b/qt-ui/maintab.cpp
@@ -27,19 +27,19 @@ void MainTab::clearEquipment()
void MainTab::clearInfo()
{
- ui->sac->setText(QString());
- ui->otu->setText(QString());
- ui->oxygenhelium->setText(QString());
- ui->gasused->setText(QString());
- ui->date->setText(QString());
- ui->divetime->setText(QString());
- ui->surfinterval->setText(QString());
- ui->maxdepth->setText(QString());
- ui->avgdepth->setText(QString());
- ui->visibility->setText(QString());
- ui->watertemperature->setText(QString());
- ui->airtemperature->setText(QString());
- ui->airpress->setText(QString());
+ ui->sacText->setText(QString());
+ ui->otuText->setText(QString());
+ ui->oxygenHeliumText->setText(QString());
+ ui->gasUsedText->setText(QString());
+ ui->dateText->setText(QString());
+ ui->diveTimeText->setText(QString());
+ ui->surfaceIntervalText->setText(QString());
+ ui->maximumDepthText->setText(QString());
+ ui->averageDepthText->setText(QString());
+ ui->visibilityText->setText(QString());
+ ui->waterTemperatureText->setText(QString());
+ ui->airTemperatureText->setText(QString());
+ ui->airPressureText->setText(QString());
}
void MainTab::clearStats()
diff --git a/qt-ui/maintab.ui b/qt-ui/maintab.ui
index a99b0aed7..82019e6c3 100644
--- a/qt-ui/maintab.ui
+++ b/qt-ui/maintab.ui
@@ -7,14 +7,14 @@
<x>0</x>
<y>0</y>
<width>400</width>
- <height>320</height>
+ <height>325</height>
</rect>
</property>
<property name="windowTitle">
<string>TabWidget</string>
</property>
<property name="currentIndex">
- <number>0</number>
+ <number>2</number>
</property>
<widget class="QWidget" name="notesTab">
<attribute name="title">
@@ -199,9 +199,31 @@
</attribute>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
- <layout class="QGridLayout" name="gridLayout">
+ <spacer name="verticalSpacer_4">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <layout class="QGridLayout" name="diveInfoUpperGridLayout">
+ <property name="horizontalSpacing">
+ <number>10</number>
+ </property>
+ <property name="verticalSpacing">
+ <number>15</number>
+ </property>
+ <property name="margin">
+ <number>10</number>
+ </property>
<item row="0" column="0">
- <widget class="QLabel" name="label_10">
+ <widget class="QLabel" name="sacLabel">
<property name="font">
<font>
<weight>75</weight>
@@ -209,12 +231,12 @@
</font>
</property>
<property name="text">
- <string>SAC:</string>
+ <string>SAC</string>
</property>
</widget>
</item>
<item row="0" column="1">
- <widget class="QLabel" name="label_11">
+ <widget class="QLabel" name="outLabel">
<property name="font">
<font>
<weight>75</weight>
@@ -222,12 +244,12 @@
</font>
</property>
<property name="text">
- <string>OTU:</string>
+ <string>OTU</string>
</property>
</widget>
</item>
<item row="0" column="2">
- <widget class="QLabel" name="label_12">
+ <widget class="QLabel" name="oxygenHeliumLabel">
<property name="font">
<font>
<weight>75</weight>
@@ -235,12 +257,12 @@
</font>
</property>
<property name="text">
- <string>0²/He:</string>
+ <string>0²/He</string>
</property>
</widget>
</item>
<item row="0" column="3">
- <widget class="QLabel" name="label_13">
+ <widget class="QLabel" name="gasUsedLabel">
<property name="font">
<font>
<weight>75</weight>
@@ -248,33 +270,33 @@
</font>
</property>
<property name="text">
- <string>Gas Used:</string>
+ <string>Gas Used</string>
</property>
</widget>
</item>
<item row="1" column="3">
- <widget class="QLabel" name="gasused">
+ <widget class="QLabel" name="gasUsedText">
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</item>
<item row="1" column="0">
- <widget class="QLabel" name="sac">
+ <widget class="QLabel" name="sacText">
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</item>
<item row="1" column="1">
- <widget class="QLabel" name="otu">
+ <widget class="QLabel" name="otuText">
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</item>
<item row="1" column="2">
- <widget class="QLabel" name="oxygenhelium">
+ <widget class="QLabel" name="oxygenHeliumText">
<property name="text">
<string>TextLabel</string>
</property>
@@ -283,38 +305,28 @@
</layout>
</item>
<item>
- <layout class="QGridLayout" name="gridLayout_2">
- <property name="bottomMargin">
+ <spacer name="verticalSpacer_3">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <layout class="QGridLayout" name="diveInfoLowerGridLayout">
+ <property name="margin">
<number>10</number>
</property>
- <item row="0" column="1">
- <widget class="QLabel" name="label_18">
- <property name="font">
- <font>
- <weight>75</weight>
- <bold>true</bold>
- </font>
- </property>
- <property name="text">
- <string>Dive Time:</string>
- </property>
- </widget>
- </item>
- <item row="0" column="2">
- <widget class="QLabel" name="label_17">
- <property name="font">
- <font>
- <weight>75</weight>
- <bold>true</bold>
- </font>
- </property>
- <property name="text">
- <string>Surf Interv:</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="QLabel" name="label_5">
+ <property name="spacing">
+ <number>15</number>
+ </property>
+ <item row="0" column="0">
+ <widget class="QLabel" name="dateLabel">
<property name="font">
<font>
<weight>75</weight>
@@ -322,26 +334,26 @@
</font>
</property>
<property name="text">
- <string>Avg Depth:</string>
+ <string>Date</string>
</property>
</widget>
</item>
- <item row="1" column="0">
- <widget class="QLabel" name="date">
+ <item row="3" column="0">
+ <widget class="QLabel" name="maximumDepthText">
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</item>
<item row="3" column="2">
- <widget class="QLabel" name="visibility">
+ <widget class="QLabel" name="visibilityText">
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</item>
- <item row="4" column="2">
- <widget class="QLabel" name="label_9">
+ <item row="2" column="2">
+ <widget class="QLabel" name="visibilityLabel">
<property name="font">
<font>
<weight>75</weight>
@@ -349,12 +361,12 @@
</font>
</property>
<property name="text">
- <string>Air Press:</string>
+ <string>Visibility</string>
</property>
</widget>
</item>
- <item row="2" column="0">
- <widget class="QLabel" name="label_4">
+ <item row="4" column="0">
+ <widget class="QLabel" name="waterTempertureLabel">
<property name="font">
<font>
<weight>75</weight>
@@ -362,26 +374,33 @@
</font>
</property>
<property name="text">
- <string>Max Depth:</string>
+ <string>Water Temp.</string>
</property>
</widget>
</item>
- <item row="1" column="2">
- <widget class="QLabel" name="surfinterval">
+ <item row="5" column="1">
+ <widget class="QLabel" name="airTemperatureText">
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</item>
<item row="1" column="1">
- <widget class="QLabel" name="divetime">
+ <widget class="QLabel" name="diveTimeText">
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</item>
- <item row="4" column="1">
- <widget class="QLabel" name="label_8">
+ <item row="1" column="2">
+ <widget class="QLabel" name="surfaceIntervalText">
+ <property name="text">
+ <string>TextLabel</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="2">
+ <widget class="QLabel" name="airPressureLabel">
<property name="font">
<font>
<weight>75</weight>
@@ -389,19 +408,25 @@
</font>
</property>
<property name="text">
- <string>Air Temp:</string>
+ <string>Air Pressure</string>
</property>
</widget>
</item>
- <item row="3" column="0">
- <widget class="QLabel" name="maxdepth">
+ <item row="2" column="1">
+ <widget class="QLabel" name="averageDepthLabel">
+ <property name="font">
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
<property name="text">
- <string>TextLabel</string>
+ <string>Ave. Depth</string>
</property>
</widget>
</item>
- <item row="2" column="2">
- <widget class="QLabel" name="label_6">
+ <item row="2" column="0">
+ <widget class="QLabel" name="maximumDepthLabel">
<property name="font">
<font>
<weight>75</weight>
@@ -409,12 +434,12 @@
</font>
</property>
<property name="text">
- <string>Visibility:</string>
+ <string>Max. Depth</string>
</property>
</widget>
</item>
- <item row="4" column="0">
- <widget class="QLabel" name="label_7">
+ <item row="4" column="1">
+ <widget class="QLabel" name="airTempertatureLabel">
<property name="font">
<font>
<weight>75</weight>
@@ -422,40 +447,53 @@
</font>
</property>
<property name="text">
- <string>Water Temp:</string>
+ <string>Air Temp.</string>
</property>
</widget>
</item>
<item row="3" column="1">
- <widget class="QLabel" name="averagedepth">
+ <widget class="QLabel" name="averageDepthText">
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</item>
- <item row="5" column="0">
- <widget class="QLabel" name="watertemperature">
+ <item row="5" column="2">
+ <widget class="QLabel" name="airPressureText">
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</item>
- <item row="5" column="1">
- <widget class="QLabel" name="airtemperature">
+ <item row="5" column="0">
+ <widget class="QLabel" name="waterTemperatureText">
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</item>
- <item row="5" column="2">
- <widget class="QLabel" name="airpress">
+ <item row="1" column="0">
+ <widget class="QLabel" name="dateText">
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</item>
- <item row="0" column="0">
- <widget class="QLabel" name="label">
+ <item row="0" column="2">
+ <widget class="QLabel" name="surfaceIntervalLabel">
+ <property name="font">
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
+ <property name="text">
+ <string>Interval</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QLabel" name="diveTimeLabel">
<property name="font">
<font>
<weight>75</weight>
@@ -463,7 +501,7 @@
</font>
</property>
<property name="text">
- <string>Date:</string>
+ <string>Dive Time</string>
</property>
</widget>
</item>
@@ -477,7 +515,7 @@
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
- <height>112</height>
+ <height>40</height>
</size>
</property>
</spacer>
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-12-30 21:13:24 +0000