diff options
| -rw-r--r-- | qt-ui/diveplanner.cpp | 3 | ||||
| -rw-r--r-- | qt-ui/diveplanner.ui | 213 | ||||
| -rw-r--r-- | qt-ui/globe.cpp | 6 | ||||
| -rw-r--r-- | qt-ui/maintab.cpp | 5 | ||||
| -rw-r--r-- | qt-ui/maintab.ui | 1160 |
5 files changed, 807 insertions, 580 deletions
diff --git a/qt-ui/diveplanner.cpp b/qt-ui/diveplanner.cpp index f23970a29..4fbdc5eb0 100644 --- a/qt-ui/diveplanner.cpp +++ b/qt-ui/diveplanner.cpp @@ -887,6 +887,9 @@ DivePlannerWidget::DivePlannerWidget(QWidget* parent, Qt::WindowFlags f): QWidge ui->decoStopSAC->setText("17"); ui->lowGF->setText("30"); ui->highGF->setText("75"); + + setMinimumWidth(0); + setMinimumHeight(0); } void DivePlannerWidget::startTimeChanged(const QTime& time) diff --git a/qt-ui/diveplanner.ui b/qt-ui/diveplanner.ui index 1bcd912a4..462c26e48 100644 --- a/qt-ui/diveplanner.ui +++ b/qt-ui/diveplanner.ui @@ -14,88 +14,143 @@ <string>Form</string> </property> <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0"> - <widget class="QLabel" name="label"> - <property name="text"> - <string>Start Time</string> + <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"> + <number>0</number> + </property> + <item row="6" column="1"> + <widget class="QScrollArea" name="scrollArea"> + <property name="frameShape"> + <enum>QFrame::NoFrame</enum> </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="QLabel" name="label_2"> - <property name="text"> - <string>ATM Pressure</string> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QTimeEdit" name="startTime"/> - </item> - <item row="1" column="1"> - <widget class="QLineEdit" name="ATMPressure"/> - </item> - <item row="3" column="1"> - <widget class="QLineEdit" name="decoStopSAC"/> - </item> - <item row="5" column="0"> - <widget class="QLineEdit" name="lowGF"/> - </item> - <item row="4" column="0"> - <widget class="QLabel" name="label_5"> - <property name="text"> - <string>Low GF</string> - </property> - </widget> - </item> - <item row="2" column="0"> - <widget class="QLabel" name="label_3"> - <property name="text"> - <string>Bottom SAC</string> - </property> - </widget> - </item> - <item row="3" column="0"> - <widget class="QLineEdit" name="bottomSAC"/> - </item> - <item row="4" column="1"> - <widget class="QLabel" name="label_6"> - <property name="text"> - <string>High GF</string> - </property> - </widget> - </item> - <item row="5" column="1"> - <widget class="QLineEdit" name="highGF"/> - </item> - <item row="2" column="1"> - <widget class="QLabel" name="label_4"> - <property name="text"> - <string>SAC on DECO Stop</string> - </property> - </widget> - </item> - <item row="6" column="0"> - <widget class="QCheckBox" name="lastStop"> - <property name="text"> - <string>Last Stop at 6m</string> + <property name="frameShadow"> + <enum>QFrame::Plain</enum> </property> - </widget> - </item> - <item row="8" column="0" colspan="2"> - <widget class="QDialogButtonBox" name="buttonBox"> - <property name="standardButtons"> - <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> - </property> - </widget> - </item> - <item row="7" column="0" colspan="2"> - <widget class="TableView" name="tableWidget" native="true"> - <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> + <property name="widgetResizable"> + <bool>true</bool> </property> + <widget class="QWidget" name="scrollAreaWidgetContents"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>400</width> + <height>352</height> + </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"> + <number>0</number> + </property> + <property name="spacing"> + <number>2</number> + </property> + <item row="1" column="1"> + <widget class="QLineEdit" name="ATMPressure"/> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="label_3"> + <property name="text"> + <string>Bottom SAC</string> + </property> + </widget> + </item> + <item row="4" column="1"> + <widget class="QLabel" name="label_6"> + <property name="text"> + <string>High GF</string> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="QLabel" name="label_4"> + <property name="text"> + <string>SAC on DECO Stop</string> + </property> + </widget> + </item> + <item row="3" column="0"> + <widget class="QLineEdit" name="bottomSAC"/> + </item> + <item row="3" column="1"> + <widget class="QLineEdit" name="decoStopSAC"/> + </item> + <item row="4" column="0"> + <widget class="QLabel" name="label_5"> + <property name="text"> + <string>Low GF</string> + </property> + </widget> + </item> + <item row="5" column="0"> + <widget class="QLineEdit" name="lowGF"/> + </item> + <item row="5" column="1"> + <widget class="QLineEdit" name="highGF"/> + </item> + <item row="6" column="0"> + <widget class="QCheckBox" name="lastStop"> + <property name="text"> + <string>Last Stop at 6m</string> + </property> + </widget> + </item> + <item row="7" column="0" colspan="2"> + <widget class="TableView" name="tableWidget" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + </widget> + </item> + <item row="8" column="0" colspan="2"> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="standardButtons"> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QTimeEdit" name="startTime"/> + </item> + <item row="0" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Start Time</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>ATM Pressure</string> + </property> + </widget> + </item> + </layout> + </widget> </widget> </item> </layout> diff --git a/qt-ui/globe.cpp b/qt-ui/globe.cpp index c16af93cf..87dc4275b 100644 --- a/qt-ui/globe.cpp +++ b/qt-ui/globe.cpp @@ -57,7 +57,11 @@ GlobeGPS::GlobeGPS(QWidget* parent) : MarbleWidget(parent), loadedDives(0) setShowOverviewMap(false); setShowScaleBar(true); setShowCompass(false); - connect(this, SIGNAL(mouseClickGeoPosition(qreal, qreal, GeoDataCoordinates::Unit)), this, SLOT(mouseClicked(qreal, qreal, GeoDataCoordinates::Unit))); + connect(this, SIGNAL(mouseClickGeoPosition(qreal, qreal, GeoDataCoordinates::Unit)), + this, SLOT(mouseClicked(qreal, qreal, GeoDataCoordinates::Unit))); + + setMinimumHeight(0); + setMinimumWidth(0); } void GlobeGPS::mouseClicked(qreal lon, qreal lat, GeoDataCoordinates::Unit unit) diff --git a/qt-ui/maintab.cpp b/qt-ui/maintab.cpp index 43529ec3c..98247566a 100644 --- a/qt-ui/maintab.cpp +++ b/qt-ui/maintab.cpp @@ -93,6 +93,9 @@ MainTab::MainTab(QWidget *parent) : QTabWidget(parent), ui->divemaster->setCompleter(completers.divemaster); ui->location->setCompleter(completers.location); ui->suit->setCompleter(completers.suit); + + setMinimumHeight(0); + setMinimumWidth(0); } void MainTab::addDiveStarted() @@ -315,7 +318,7 @@ void MainTab::updateDiveInfo(int dive) ui->airPressureText->setText(QString("%1mbar").arg(d->surface_pressure.mbar)); else ui->airPressureText->clear(); - ui->depthLimits->setMaximum(get_depth_string(stats_selection.max_depth, TRUE)); + (get_depth_string(stats_selection.max_depth, TRUE)); ui->depthLimits->setMinimum(get_depth_string(stats_selection.min_depth, TRUE)); ui->depthLimits->setAverage(get_depth_string(stats_selection.avg_depth, TRUE)); ui->sacLimits->setMaximum(get_volume_string(stats_selection.max_sac, TRUE).append(tr("/min"))); diff --git a/qt-ui/maintab.ui b/qt-ui/maintab.ui index e56350ada..031aa0df0 100644 --- a/qt-ui/maintab.ui +++ b/qt-ui/maintab.ui @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>505</width> - <height>610</height> + <width>535</width> + <height>517</height> </rect> </property> <property name="windowTitle"> @@ -21,168 +21,208 @@ <string>Dive Notes</string> </attribute> <layout class="QGridLayout" name="gridLayout_3"> - <item row="6" column="0" colspan="2"> - <widget class="QLineEdit" name="coordinates"> - <property name="readOnly"> - <bool>false</bool> - </property> - </widget> - </item> - <item row="13" column="0" colspan="2"> - <widget class="QTextEdit" name="notes"> - <property name="readOnly"> - <bool>false</bool> - </property> - </widget> - </item> - <item row="3" column="0"> - <widget class="QLabel" name="LocationLabel"> - <property name="text"> - <string>Location</string> - </property> - </widget> - </item> - <item row="8" column="0"> - <widget class="QLineEdit" name="divemaster"> - <property name="readOnly"> - <bool>false</bool> - </property> - </widget> - </item> - <item row="10" column="1"> - <widget class="QLineEdit" name="suit"> - <property name="readOnly"> - <bool>false</bool> - </property> - </widget> - </item> - <item row="8" column="1"> - <widget class="QLineEdit" name="buddy"> - <property name="readOnly"> - <bool>false</bool> - </property> - </widget> - </item> - <item row="4" column="0" colspan="2"> - <widget class="QLineEdit" name="location"> - <property name="readOnly"> - <bool>false</bool> + <item row="3" column="1"> + <widget class="QScrollArea" name="scrollArea"> + <property name="frameShape"> + <enum>QFrame::NoFrame</enum> </property> - </widget> - </item> - <item row="7" column="0"> - <widget class="QLabel" name="DivemasterLabel"> - <property name="text"> - <string>Divemaster</string> + <property name="frameShadow"> + <enum>QFrame::Plain</enum> </property> - </widget> - </item> - <item row="7" column="1"> - <widget class="QLabel" name="BuddyLabel"> - <property name="text"> - <string>Buddy</string> + <property name="widgetResizable"> + <bool>true</bool> </property> - </widget> - </item> - <item row="9" column="0"> - <layout class="QHBoxLayout" name="ratingVisibilityLabels"> - <item> - <widget class="QLabel" name="RatingLabel"> - <property name="text"> - <string>Rating</string> + <widget class="QWidget" name="scrollAreaWidgetContents"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>513</width> + <height>468</height> + </rect> + </property> + <layout class="QGridLayout" name="gridLayout_2"> + <property name="leftMargin"> + <number>0</number> </property> - </widget> - </item> - <item> - <widget class="QLabel" name="visibilityLabel"> - <property name="text"> - <string>Visibility</string> + <property name="topMargin"> + <number>0</number> </property> - </widget> - </item> - </layout> - </item> - <item row="9" column="1"> - <widget class="QLabel" name="SuitLabel"> - <property name="text"> - <string>Suit</string> - </property> - </widget> - </item> - <item row="11" column="0"> - <widget class="QLabel" name="NotesLabel"> - <property name="text"> - <string>Notes</string> - </property> - </widget> - </item> - <item row="10" column="0"> - <layout class="QHBoxLayout" name="ratingVisibilityWidgets"> - <item> - <widget class="StarWidget" name="rating" native="true"/> - </item> - <item> - <widget class="StarWidget" name="visibility" native="true"/> - </item> - </layout> - </item> - <item row="5" column="0"> - <widget class="QLabel" name="CoordinatedLabel"> - <property name="text"> - <string>Coordinates</string> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="DateTimeLabel"> - <property name="text"> - <string>Starttime</string> - </property> - </widget> - </item> - <item row="0" column="0" colspan="2"> - <widget class="KMessageWidget" name="diveNotesMessage" native="true"/> - </item> - <item row="14" column="0" colspan="2"> - <widget class="QDialogButtonBox" name="notesButtonBox"> - <property name="standardButtons"> - <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> - </property> - </widget> - </item> - <item row="2" column="0"> - <widget class="QDateTimeEdit" name="dateTimeEdit"> - <property name="displayFormat"> - <string>M/d/yy h:mm</string> - </property> - <property name="calendarPopup"> - <bool>true</bool> - </property> - </widget> - </item> - <item row="2" column="1"> - <layout class="QHBoxLayout" name="airWaterTempLayout"> - <item> - <widget class="QLineEdit" name="airtemp"> - <property name="readOnly"> - <bool>false</bool> + <property name="rightMargin"> + <number>0</number> </property> - </widget> - </item> - <item> - <widget class="QLineEdit" name="watertemp"> - <property name="readOnly"> - <bool>false</bool> + <property name="bottomMargin"> + <number>0</number> </property> - </widget> - </item> - </layout> - </item> - <item row="1" column="1"> - <widget class="QLabel" name="TemperaturesLabel"> - <property name="text"> - <string>air / water Temperatures</string> - </property> + <property name="spacing"> + <number>2</number> + </property> + <item row="0" column="0" colspan="2"> + <widget class="KMessageWidget" name="diveNotesMessage" native="true"/> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="DateTimeLabel"> + <property name="text"> + <string>Starttime</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QLabel" name="TemperaturesLabel"> + <property name="text"> + <string>air / water Temperatures</string> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QDateTimeEdit" name="dateTimeEdit"> + <property name="displayFormat"> + <string>M/d/yy h:mm</string> + </property> + <property name="calendarPopup"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="2" column="1"> + <layout class="QHBoxLayout" name="airWaterTempLayout"> + <item> + <widget class="QLineEdit" name="airtemp"> + <property name="readOnly"> + <bool>false</bool> + </property> + </widget> + </item> + <item> + <widget class="QLineEdit" name="watertemp"> + <property name="readOnly"> + <bool>false</bool> + </property> + </widget> + </item> + </layout> + </item> + <item row="3" column="0"> + <widget class="QLabel" name="LocationLabel"> + <property name="text"> + <string>Location</string> + </property> + </widget> + </item> + <item row="4" column="0" colspan="2"> + <widget class="QLineEdit" name="location"> + <property name="readOnly"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="5" column="0"> + <widget class="QLabel" name="CoordinatedLabel"> + <property name="text"> + <string>Coordinates</string> + </property> + </widget> + </item> + <item row="6" column="0" colspan="2"> + <widget class="QLineEdit" name="coordinates"> + <property name="readOnly"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="7" column="0"> + <widget class="QLabel" name="DivemasterLabel"> + <property name="text"> + <string>Divemaster</string> + </property> + </widget> + </item> + <item row="7" column="1"> + <widget class="QLabel" name="BuddyLabel"> + <property name="text"> + <string>Buddy</string> + </property> + </widget> + </item> + <item row="8" column="0"> + <widget class="QLineEdit" name="divemaster"> + <property name="readOnly"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="8" column="1"> + <widget class="QLineEdit" name="buddy"> + <property name="readOnly"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="9" column="0"> + <layout class="QHBoxLayout" name="ratingVisibilityLabels"> + <item> + <widget class="QLabel" name="RatingLabel"> + <property name="text"> + <string>Rating</string> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="visibilityLabel"> + <property name="text"> + <string>Visibility</string> + </property> + </widget> + </item> + </layout> + </item> + <item row="9" column="1"> + <widget class="QLabel" name="SuitLabel"> + <property name="text"> + <string>Suit</string> + </property> + </widget> + </item> + <item row="10" column="0"> + <layout class="QHBoxLayout" name="ratingVisibilityWidgets"> + <item> + <widget class="StarWidget" name="rating" native="true"/> + </item> + <item> + <widget class="StarWidget" name="visibility" native="true"/> + </item> + </layout> + </item> + <item row="10" column="1"> + <widget class="QLineEdit" name="suit"> + <property name="readOnly"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="11" column="0"> + <widget class="QLabel" name="NotesLabel"> + <property name="text"> + <string>Notes</string> + </property> + </widget> + </item> + <item row="12" column="0" colspan="2"> + <widget class="QTextEdit" name="notes"> + <property name="readOnly"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="13" column="0" colspan="2"> + <widget class="QDialogButtonBox" name="notesButtonBox"> + <property name="standardButtons"> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> + </property> + </widget> + </item> + </layout> + </widget> </widget> </item> </layout> @@ -192,35 +232,84 @@ <string>Equipment</string> </attribute> <layout class="QGridLayout" name="gridLayout_4"> - <item row="1" column="0"> - <widget class="QWidget" name="widget" native="true"> - <layout class="QVBoxLayout" name="verticalLayout"> - <property name="spacing"> - <number>0</number> - </property> - <property name="margin"> - <number>0</number> - </property> - <item> - <widget class="QSplitter" name="splitter"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <widget class="TableView" name="cylinders" native="true"/> - <widget class="TableView" name="weights" native="true"/> - </widget> - </item> - </layout> - </widget> - </item> <item row="0" column="0"> - <widget class="KMessageWidget" name="diveEquipmentMessage" native="true"/> - </item> - <item row="2" column="0"> - <widget class="QDialogButtonBox" name="equipmentButtonBox"> - <property name="standardButtons"> - <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> + <widget class="QScrollArea" name="scrollArea_2"> + <property name="frameShape"> + <enum>QFrame::NoFrame</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Plain</enum> + </property> + <property name="widgetResizable"> + <bool>true</bool> </property> + <widget class="QWidget" name="scrollAreaWidgetContents_2"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>513</width> + <height>468</height> + </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"> + <number>0</number> + </property> + <property name="spacing"> + <number>2</number> + </property> + <item row="0" column="0"> + <widget class="KMessageWidget" name="diveEquipmentMessage" native="true"/> + </item> + <item row="1" column="0"> + <widget class="QWidget" name="widget" native="true"> + <layout class="QVBoxLayout" name="verticalLayout"> + <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"> + <number>0</number> + </property> + <item> + <widget class="QSplitter" name="splitter"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <widget class="TableView" name="cylinders" native="true"/> + <widget class="TableView" name="weights" native="true"/> + </widget> + </item> + </layout> + </widget> + </item> + <item row="2" column="0"> + <widget class="QDialogButtonBox" name="equipmentButtonBox"> + <property name="standardButtons"> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> + </property> + </widget> + </item> + </layout> + </widget> </widget> </item> </layout> @@ -230,232 +319,272 @@ <string>Dive Info</string> </attribute> <layout class="QGridLayout" name="gridLayout"> - <item row="1" column="2"> - <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 row="1" column="0"> - <widget class="QGroupBox" name="groupBox_3"> - <property name="title"> - <string>Gases Used</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 row="2" column="2"> - <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 row="0" 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 row="3" 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="3" 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="1" column="1"> - <widget class="QGroupBox" name="groupBox_4"> - <property name="title"> - <string>Gas Consumed</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="2" column="0"> - <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="2" column="1"> - <widget class="QGroupBox" name="groupBox_7"> - <property name="title"> - <string>Ave. Depth</string> + <widget class="QScrollArea" name="scrollArea_3"> + <property name="frameShape"> + <enum>QFrame::NoFrame</enum> </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="3" 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="0" column="2"> - <widget class="QGroupBox" name="groupBox_12"> - <property name="title"> - <string>Interval</string> + <property name="frameShadow"> + <enum>QFrame::Plain</enum> </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="0" column="1"> - <widget class="QGroupBox" name="groupBox_11"> - <property name="title"> - <string>Dive Time</string> + <property name="widgetResizable"> + <bool>true</bool> </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 class="QWidget" name="scrollAreaWidgetContents_3"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>513</width> + <height>468</height> + </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"> + <number>0</number> + </property> + <property name="spacing"> + <number>2</number> + </property> + <item row="0" 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 row="0" column="2"> + <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="1" column="0"> + <widget class="QGroupBox" name="groupBox_3"> + <property name="title"> + <string>Gases Used</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 row="1" column="1"> + <widget class="QGroupBox" name="groupBox_4"> + <property name="title"> + <string>Gas Consumed</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="2"> + <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 row="2" column="0"> + <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="2" column="1"> + <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="2" column="2"> + <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 row="3" 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="3" 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="3" 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="0" column="1"> + <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> </widget> </item> </layout> @@ -465,90 +594,136 @@ <string>Stats</string> </attribute> <layout class="QGridLayout" name="gridLayout1"> - <item row="0" column="2"> - <widget class="QGroupBox" name="groupBox_4b"> - <property name="title"> - <string>SAC</string> - </property> - <layout class="QHBoxLayout" name="horizontalLayout_10b"> - <item> - <widget class="MinMaxAvgWidget" name="sacLimits" native="true"/> - </item> - </layout> - </widget> - </item> <item row="0" column="1"> - <widget class="QGroupBox" name="groupBox_8b"> - <property name="title"> - <string>Temperature</string> - </property> - <layout class="QHBoxLayout" name="horizontalLayout_5b"> - <item> - <widget class="MinMaxAvgWidget" name="tempLimits" native="true"/> - </item> - </layout> - </widget> - </item> - <item row="0" column="0"> - <widget class="QGroupBox" name="groupBoxb"> - <property name="title"> - <string>Depth</string> - </property> - <layout class="QHBoxLayout" name="horizontalLayout_2b"> - <item> - <widget class="MinMaxAvgWidget" name="depthLimits" native="true"/> - </item> - </layout> - </widget> - </item> - <item row="1" column="0"> - <widget class="QGroupBox" name="groupBox_13"> - <property name="title"> - <string>Duration</string> + <widget class="QScrollArea" name="scrollArea_4"> + <property name="frameShape"> + <enum>QFrame::NoFrame</enum> </property> - <layout class="QHBoxLayout" name="horizontalLayout_12b"> - <item> - <widget class="MinMaxAvgWidget" name="timeLimits" native="true"/> - </item> - </layout> - </widget> - </item> - <item row="1" column="1"> - <widget class="QGroupBox" name="groupBox_11b"> - <property name="title"> - <string>Total Time</string> + <property name="frameShadow"> + <enum>QFrame::Plain</enum> </property> - <layout class="QHBoxLayout" name="horizontalLayout_11b"> - <item> - <widget class="QLabel" name="totalTimeAllText"> - <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_7b"> - <property name="title"> - <string>Dives</string> + <property name="widgetResizable"> + <bool>true</bool> </property> - <layout class="QHBoxLayout" name="horizontalLayout_15"> - <item> - <widget class="QLabel" name="divesAllText"> - <property name="text"> - <string/> - </property> - <property name="alignment"> - <set>Qt::AlignCenter</set> - </property> - </widget> - </item> - </layout> + <widget class="QWidget" name="scrollAreaWidgetContents_4"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>513</width> + <height>468</height> + </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"> + <number>0</number> + </property> + <property name="spacing"> + <number>2</number> + </property> + <item row="0" column="0"> + <widget class="QGroupBox" name="groupBoxb"> + <property name="title"> + <string>Depth</string> + </property> + <layout class="QHBoxLayout" name="horizontalLayout_2b"> + <item> + <widget class="MinMaxAvgWidget" name="depthLimits" native="true"/> + </item> + </layout> + </widget> + </item> + <item row="0" column="1"> + <widget class="QGroupBox" name="groupBox_8b"> + <property name="title"> + <string>Temperature</string> + </property> + <layout class="QHBoxLayout" name="horizontalLayout_5b"> + <item> + <widget class="MinMaxAvgWidget" name="tempLimits" native="true"/> + </item> + </layout> + </widget> + </item> + <item row="0" column="2"> + <widget class="QGroupBox" name="groupBox_4b"> + <property name="title"> + <string>SAC</string> + </property> + <layout class="QHBoxLayout" name="horizontalLayout_10b"> + <item> + <widget class="MinMaxAvgWidget" name="sacLimits" native="true"/> + </item> + </layout> + </widget> + </item> + <item row="1" column="0"> + <widget class="QGroupBox" name="groupBox_14"> + <property name="title"> + <string>Duration</string> + </property> + <layout class="QHBoxLayout" name="horizontalLayout_12b"> + <item> + <widget class="MinMaxAvgWidget" name="timeLimits" native="true"/> + </item> + </layout> + </widget> + </item> + <item row="1" column="1"> + <widget class="QGroupBox" name="groupBox_11b"> + <property name="title"> + <string>Total Time</string> + </property> + <layout class="QHBoxLayout" name="horizontalLayout_11b"> + <item> + <widget class="QLabel" name="totalTimeAllText"> + <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_7b"> + <property name="title"> + <string>Dives</string> + </property> + <layout class="QHBoxLayout" name="horizontalLayout_15"> + <item> + <widget class="QLabel" name="divesAllText"> + <property name="text"> + <string/> + </property> + <property name="alignment"> + <set>Qt::AlignCenter</set> + </property> + </widget> + </item> + </layout> + </widget> + </item> + </layout> + <zorder>groupBox_8b</zorder> + <zorder>groupBox_4b</zorder> + <zorder>groupBox_11b</zorder> + <zorder>groupBox_14</zorder> + <zorder>groupBoxb</zorder> + <zorder>groupBox_7b</zorder> + </widget> </widget> </item> </layout> @@ -580,19 +755,6 @@ <container>1</container> </customwidget> </customwidgets> - <tabstops> - <tabstop>dateTimeEdit</tabstop> - <tabstop>airtemp</tabstop> - <tabstop>watertemp</tabstop> - <tabstop>location</tabstop> - <tabstop>coordinates</tabstop> - <tabstop>divemaster</tabstop> - <tabstop>buddy</tabstop> - <tabstop>suit</tabstop> - <tabstop>notes</tabstop> - <tabstop>notesButtonBox</tabstop> - <tabstop>equipmentButtonBox</tabstop> - </tabstops> <resources/> <connections/> </ui> |