diff options
| -rw-r--r-- | qt-ui/maintab.cpp | 7 | ||||
| -rw-r--r-- | qt-ui/maintab.ui | 526 |
2 files changed, 226 insertions, 307 deletions
diff --git a/qt-ui/maintab.cpp b/qt-ui/maintab.cpp index ca2f18ef0..1de80271e 100644 --- a/qt-ui/maintab.cpp +++ b/qt-ui/maintab.cpp @@ -48,13 +48,6 @@ MainTab::MainTab(QWidget *parent) : QTabWidget(parent), ui->rating->installEventFilter(this); ui->visibility->installEventFilter(this); - /* example of where code is more concise than Qt designer */ - QList<QObject *> infoTabWidgets = ui->infoTab->children(); - Q_FOREACH(QObject* obj, infoTabWidgets) { - QLabel* label = qobject_cast<QLabel *>(obj); - if (label) - label->setAlignment(Qt::AlignHCenter); - } QList<QObject *> statisticsTabWidgets = ui->statisticsTab->children(); Q_FOREACH(QObject* obj, statisticsTabWidgets) { QLabel* label = qobject_cast<QLabel *>(obj); diff --git a/qt-ui/maintab.ui b/qt-ui/maintab.ui index 18014c8a0..11984c7b2 100644 --- a/qt-ui/maintab.ui +++ b/qt-ui/maintab.ui @@ -6,7 +6,7 @@ <rect> <x>0</x> <y>0</y> - <width>400</width> + <width>409</width> <height>368</height> </rect> </property> @@ -14,7 +14,7 @@ <string>TabWidget</string> </property> <property name="currentIndex"> - <number>1</number> + <number>2</number> </property> <property name="documentMode"> <bool>true</bool> @@ -217,308 +217,234 @@ <attribute name="title"> <string>Dive Info</string> </attribute> - <layout class="QVBoxLayout" name="verticalLayout"> - <item> - <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> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QGroupBox" name="groupBox"> + <property name="title"> + <string>SAC</string> + </property> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <item> + <widget class="QLabel" name="sacText"> + <property name="text"> + <string/> + </property> + <property name="alignment"> + <set>Qt::AlignCenter</set> + </property> + </widget> + </item> + </layout> + </widget> </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="sacLabel"> - <property name="font"> - <font> - <weight>75</weight> - <bold>true</bold> - </font> - </property> - <property name="text"> - <string>SAC</string> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="QLabel" name="outLabel"> - <property name="font"> - <font> - <weight>75</weight> - <bold>true</bold> - </font> - </property> - <property name="text"> - <string>OTU</string> - </property> - </widget> - </item> - <item row="0" column="2"> - <widget class="QLabel" name="oxygenHeliumLabel"> - <property name="font"> - <font> - <weight>75</weight> - <bold>true</bold> - </font> - </property> - <property name="text"> - <string>0²/He</string> - </property> - </widget> - </item> - <item row="0" column="3"> - <widget class="QLabel" name="gasUsedLabel"> - <property name="font"> - <font> - <weight>75</weight> - <bold>true</bold> - </font> - </property> - <property name="text"> - <string>Gas Used</string> - </property> - </widget> - </item> - <item row="1" column="3"> - <widget class="QLabel" name="gasUsedText"> - <property name="text"> - <string>TextLabel</string> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="sacText"> - <property name="text"> - <string>TextLabel</string> - </property> - </widget> - </item> - <item row="1" column="1"> - <widget class="QLabel" name="otuText"> - <property name="text"> - <string>TextLabel</string> - </property> - </widget> - </item> - <item row="1" column="2"> - <widget class="QLabel" name="oxygenHeliumText"> - <property name="text"> - <string>TextLabel</string> - </property> - </widget> - </item> - </layout> + <item row="0" column="1"> + <widget class="QGroupBox" name="groupBox_3"> + <property name="title"> + <string>O²/HE</string> + </property> + <layout class="QHBoxLayout" name="horizontalLayout_4"> + <item> + <widget class="QLabel" name="oxygenHeliumText"> + <property name="text"> + <string/> + </property> + <property name="alignment"> + <set>Qt::AlignCenter</set> + </property> + </widget> + </item> + </layout> + </widget> </item> - <item> - <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 row="1" column="0"> + <widget class="QGroupBox" name="groupBox_2"> + <property name="title"> + <string>OTU</string> + </property> + <layout class="QHBoxLayout" name="horizontalLayout_3"> + <item> + <widget class="QLabel" name="otuText"> + <property name="text"> + <string/> + </property> + <property name="alignment"> + <set>Qt::AlignCenter</set> + </property> + </widget> + </item> + </layout> + </widget> </item> - <item> - <layout class="QGridLayout" name="diveInfoLowerGridLayout"> - <property name="margin"> - <number>10</number> - </property> - <property name="spacing"> - <number>15</number> - </property> - <item row="0" column="0"> - <widget class="QLabel" name="dateLabel"> - <property name="font"> - <font> - <weight>75</weight> - <bold>true</bold> - </font> - </property> - <property name="text"> - <string>Date</string> - </property> - </widget> - </item> - <item row="3" column="0"> - <widget class="QLabel" name="maximumDepthText"> - <property name="text"> - <string>TextLabel</string> - </property> - </widget> - </item> - <item row="4" column="0"> - <widget class="QLabel" name="waterTempertureLabel"> - <property name="font"> - <font> - <weight>75</weight> - <bold>true</bold> - </font> - </property> - <property name="text"> - <string>Water Temp.</string> - </property> - </widget> - </item> - <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="diveTimeText"> - <property name="text"> - <string>TextLabel</string> - </property> - </widget> - </item> - <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> - <bold>true</bold> - </font> - </property> - <property name="text"> - <string>Air Pressure</string> - </property> - </widget> - </item> - <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>Ave. Depth</string> - </property> - </widget> - </item> - <item row="2" column="0"> - <widget class="QLabel" name="maximumDepthLabel"> - <property name="font"> - <font> - <weight>75</weight> - <bold>true</bold> - </font> - </property> - <property name="text"> - <string>Max. Depth</string> - </property> - </widget> - </item> - <item row="4" column="1"> - <widget class="QLabel" name="airTempertatureLabel"> - <property name="font"> - <font> - <weight>75</weight> - <bold>true</bold> - </font> - </property> - <property name="text"> - <string>Air Temp.</string> - </property> - </widget> - </item> - <item row="3" column="1"> - <widget class="QLabel" name="averageDepthText"> - <property name="text"> - <string>TextLabel</string> - </property> - </widget> - </item> - <item row="5" column="2"> - <widget class="QLabel" name="airPressureText"> - <property name="text"> - <string>TextLabel</string> - </property> - </widget> - </item> - <item row="5" column="0"> - <widget class="QLabel" name="waterTemperatureText"> - <property name="text"> - <string>TextLabel</string> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="dateText"> - <property name="text"> - <string>TextLabel</string> - </property> - </widget> - </item> - <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> - <bold>true</bold> - </font> - </property> - <property name="text"> - <string>Dive Time</string> - </property> - </widget> - </item> - </layout> + <item row="4" column="0"> + <widget class="QGroupBox" name="groupBox_5"> + <property name="title"> + <string>Date</string> + </property> + <layout class="QHBoxLayout" name="horizontalLayout_6"> + <item> + <widget class="QLabel" name="dateText"> + <property name="text"> + <string/> + </property> + <property name="alignment"> + <set>Qt::AlignCenter</set> + </property> + </widget> + </item> + </layout> + </widget> </item> - <item> - <spacer name="verticalSpacer"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> + <item row="5" column="0"> + <widget class="QGroupBox" name="groupBox_10"> + <property name="title"> + <string>Air Pressure</string> + </property> + <layout class="QHBoxLayout" name="horizontalLayout_10"> + <item> + <widget class="QLabel" name="airPressureText"> + <property name="text"> + <string/> + </property> + <property name="alignment"> + <set>Qt::AlignCenter</set> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item row="4" column="1"> + <widget class="QGroupBox" name="groupBox_9"> + <property name="title"> + <string>Air Temperature</string> + </property> + <layout class="QHBoxLayout" name="horizontalLayout_11"> + <item> + <widget class="QLabel" name="airTemperatureText"> + <property name="text"> + <string/> + </property> + <property name="alignment"> + <set>Qt::AlignCenter</set> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item row="0" column="2"> + <widget class="QGroupBox" name="groupBox_4"> + <property name="title"> + <string>Gas Used</string> + </property> + <layout class="QHBoxLayout" name="horizontalLayout_5"> + <item> + <widget class="QLabel" name="gasUsedText"> + <property name="text"> + <string/> + </property> + <property name="alignment"> + <set>Qt::AlignCenter</set> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item row="1" column="1"> + <widget class="QGroupBox" name="groupBox_6"> + <property name="title"> + <string>Max. Depth</string> + </property> + <layout class="QHBoxLayout" name="horizontalLayout_7"> + <item> + <widget class="QLabel" name="maximumDepthText"> + <property name="text"> + <string/> + </property> + <property name="alignment"> + <set>Qt::AlignCenter</set> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item row="1" column="2"> + <widget class="QGroupBox" name="groupBox_7"> + <property name="title"> + <string>Ave. Depth</string> + </property> + <layout class="QHBoxLayout" name="horizontalLayout_8"> + <item> + <widget class="QLabel" name="averageDepthText"> + <property name="text"> + <string/> + </property> + <property name="alignment"> + <set>Qt::AlignCenter</set> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item row="4" column="2"> + <widget class="QGroupBox" name="groupBox_8"> + <property name="title"> + <string>Water Temperature</string> + </property> + <layout class="QHBoxLayout" name="horizontalLayout_9"> + <item> + <widget class="QLabel" name="waterTemperatureText"> + <property name="text"> + <string/> + </property> + <property name="alignment"> + <set>Qt::AlignCenter</set> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item row="5" column="1"> + <widget class="QGroupBox" name="groupBox_12"> + <property name="title"> + <string>Interval</string> + </property> + <layout class="QHBoxLayout" name="horizontalLayout_13"> + <item> + <widget class="QLabel" name="surfaceIntervalText"> + <property name="text"> + <string/> + </property> + <property name="alignment"> + <set>Qt::AlignCenter</set> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item row="5" column="2"> + <widget class="QGroupBox" name="groupBox_11"> + <property name="title"> + <string>Dive Time</string> + </property> + <layout class="QHBoxLayout" name="horizontalLayout_12"> + <item> + <widget class="QLabel" name="diveTimeText"> + <property name="text"> + <string/> + </property> + <property name="alignment"> + <set>Qt::AlignCenter</set> + </property> + </widget> + </item> + </layout> + </widget> </item> </layout> </widget> |