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 @@
Form
- -
-
-
- Start Time
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
-
+
+
+ QFrame::NoFrame
-
-
- -
-
-
- ATM Pressure
+
+ QFrame::Plain
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- Low GF
-
-
-
- -
-
-
- Bottom SAC
-
-
-
- -
-
-
- -
-
-
- High GF
-
-
-
- -
-
-
- -
-
-
- SAC on DECO Stop
-
-
-
- -
-
-
- Last Stop at 6m
-
-
-
- -
-
-
- QDialogButtonBox::Cancel|QDialogButtonBox::Ok
-
-
-
- -
-
-
-
- 0
- 0
-
+
+ true
+
+
+
+ 0
+ 0
+ 400
+ 352
+
+
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 2
+
+
-
+
+
+ -
+
+
+ Bottom SAC
+
+
+
+ -
+
+
+ High GF
+
+
+
+ -
+
+
+ SAC on DECO Stop
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ Low GF
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ Last Stop at 6m
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ -
+
+
+ QDialogButtonBox::Cancel|QDialogButtonBox::Ok
+
+
+
+ -
+
+
+ -
+
+
+ Start Time
+
+
+
+ -
+
+
+ ATM Pressure
+
+
+
+
+
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 @@
0
0
- 505
- 610
+ 535
+ 517
@@ -21,168 +21,208 @@
Dive Notes
- -
-
-
- false
+
-
+
+
+ QFrame::NoFrame
-
-
- -
-
-
- false
+
+ QFrame::Plain
-
-
- -
-
-
- Location
-
-
-
- -
-
-
- false
-
-
-
- -
-
-
- false
-
-
-
- -
-
-
- false
-
-
-
- -
-
-
- false
-
-
-
- -
-
-
- Divemaster
-
-
-
- -
-
-
- Buddy
-
-
-
- -
-
-
-
-
-
- Rating
-
-
-
- -
-
-
- Visibility
-
-
-
-
-
- -
-
-
- Suit
-
-
-
- -
-
-
- Notes
-
-
-
- -
-
-
-
-
-
- -
-
-
-
-
- -
-
-
- Coordinates
-
-
-
- -
-
-
- Starttime
-
-
-
- -
-
-
- -
-
-
- QDialogButtonBox::Cancel|QDialogButtonBox::Ok
-
-
-
- -
-
-
- M/d/yy h:mm
-
-
+
true
-
-
- -
-
-
-
-
-
- false
+
+
+
+ 0
+ 0
+ 513
+ 468
+
+
+
+
+ 0
-
-
- -
-
-
- false
+
+ 0
-
-
-
-
- -
-
-
- air / water Temperatures
-
+
+ 0
+
+
+ 0
+
+
+ 2
+
+
-
+
+
+ -
+
+
+ Starttime
+
+
+
+ -
+
+
+ air / water Temperatures
+
+
+
+ -
+
+
+ M/d/yy h:mm
+
+
+ true
+
+
+
+ -
+
+
-
+
+
+ false
+
+
+
+ -
+
+
+ false
+
+
+
+
+
+ -
+
+
+ Location
+
+
+
+ -
+
+
+ false
+
+
+
+ -
+
+
+ Coordinates
+
+
+
+ -
+
+
+ false
+
+
+
+ -
+
+
+ Divemaster
+
+
+
+ -
+
+
+ Buddy
+
+
+
+ -
+
+
+ false
+
+
+
+ -
+
+
+ false
+
+
+
+ -
+
+
-
+
+
+ Rating
+
+
+
+ -
+
+
+ Visibility
+
+
+
+
+
+ -
+
+
+ Suit
+
+
+
+ -
+
+
-
+
+
+ -
+
+
+
+
+ -
+
+
+ false
+
+
+
+ -
+
+
+ Notes
+
+
+
+ -
+
+
+ false
+
+
+
+ -
+
+
+ QDialogButtonBox::Cancel|QDialogButtonBox::Ok
+
+
+
+
+
@@ -192,35 +232,84 @@
Equipment
- -
-
-
-
- 0
-
-
- 0
-
-
-
-
-
- Qt::Vertical
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
- QDialogButtonBox::Cancel|QDialogButtonBox::Ok
+
+
+ QFrame::NoFrame
+
+ QFrame::Plain
+
+
+ true
+
+
+
+
+ 0
+ 0
+ 513
+ 468
+
+
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 2
+
+
-
+
+
+ -
+
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
-
+
+
+ Qt::Vertical
+
+
+
+
+
+
+
+
+ -
+
+
+ QDialogButtonBox::Cancel|QDialogButtonBox::Ok
+
+
+
+
+
@@ -230,232 +319,272 @@
Dive Info
- -
-
-
- SAC
-
-
-
-
-
-
-
-
-
- Qt::AlignCenter
-
-
-
-
-
-
- -
-
-
- Gases Used
-
-
-
-
-
-
-
-
-
- Qt::AlignCenter
-
-
-
-
-
-
- -
-
-
- OTU
-
-
-
-
-
-
-
-
-
- Qt::AlignCenter
-
-
-
-
-
-
-
-
-
- Date
+
+
+ QFrame::NoFrame
-
-
-
-
-
-
-
-
- Qt::AlignCenter
-
-
-
-
-
-
- -
-
-
- Air Pressure
+
+ QFrame::Plain
-
-
-
-
-
-
-
-
- Qt::AlignCenter
-
-
-
-
-
-
- -
-
-
- Air Temperature
+
+ true
-
-
-
-
-
-
-
-
- Qt::AlignCenter
-
-
-
-
-
-
- -
-
-
- Gas Consumed
-
-
-
-
-
-
-
-
-
- Qt::AlignCenter
-
-
-
-
-
-
- -
-
-
- Max. Depth
-
-
-
-
-
-
-
-
-
- Qt::AlignCenter
-
-
-
-
-
-
- -
-
-
- Ave. Depth
-
-
-
-
-
-
-
-
-
- Qt::AlignCenter
-
-
-
-
-
-
- -
-
-
- Water Temperature
-
-
-
-
-
-
-
-
-
- Qt::AlignCenter
-
-
-
-
-
-
- -
-
-
- Interval
-
-
-
-
-
-
-
-
-
- Qt::AlignCenter
-
-
-
-
-
-
- -
-
-
- Dive Time
-
-
-
-
-
-
-
-
-
- Qt::AlignCenter
-
-
-
-
+
+
+
+ 0
+ 0
+ 513
+ 468
+
+
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 2
+
+ -
+
+
+ Date
+
+
+
-
+
+
+
+
+
+ Qt::AlignCenter
+
+
+
+
+
+
+ -
+
+
+ Interval
+
+
+
-
+
+
+
+
+
+ Qt::AlignCenter
+
+
+
+
+
+
+ -
+
+
+ Gases Used
+
+
+
-
+
+
+
+
+
+ Qt::AlignCenter
+
+
+
+
+
+
+ -
+
+
+ Gas Consumed
+
+
+
-
+
+
+
+
+
+ Qt::AlignCenter
+
+
+
+
+
+
+ -
+
+
+ SAC
+
+
+
-
+
+
+
+
+
+ Qt::AlignCenter
+
+
+
+
+
+
+ -
+
+
+ Max. Depth
+
+
+
-
+
+
+
+
+
+ Qt::AlignCenter
+
+
+
+
+
+
+ -
+
+
+ Ave. Depth
+
+
+
-
+
+
+
+
+
+ Qt::AlignCenter
+
+
+
+
+
+
+ -
+
+
+ OTU
+
+
+
-
+
+
+
+
+
+ Qt::AlignCenter
+
+
+
+
+
+
+ -
+
+
+ Air Pressure
+
+
+
-
+
+
+
+
+
+ Qt::AlignCenter
+
+
+
+
+
+
+ -
+
+
+ Air Temperature
+
+
+
-
+
+
+
+
+
+ Qt::AlignCenter
+
+
+
+
+
+
+ -
+
+
+ Water Temperature
+
+
+
-
+
+
+
+
+
+ Qt::AlignCenter
+
+
+
+
+
+
+ -
+
+
+ Dive Time
+
+
+
-
+
+
+
+
+
+ Qt::AlignCenter
+
+
+
+
+
+
+
+
@@ -465,90 +594,136 @@
Stats
- -
-
-
- SAC
-
-
-
-
-
-
-
-
-
-
-
-
- Temperature
+
+
+ QFrame::NoFrame
-
-
-
-
-
-
-
-
- -
-
-
- Depth
+
+ QFrame::Plain
-
-
-
-
-
-
-
-
- -
-
-
- Duration
+
+ true
-
-
-
-
-
-
-
-
- -
-
-
- Total Time
-
-
-
-
-
-
-
-
-
- Qt::AlignCenter
-
-
-
-
-
-
- -
-
-
- Dives
-
-
-
-
-
-
-
-
-
- Qt::AlignCenter
-
-
-
-
+
+
+
+ 0
+ 0
+ 513
+ 468
+
+
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 2
+
+ -
+
+
+ Depth
+
+
+
-
+
+
+
+
+
+ -
+
+
+ Temperature
+
+
+
-
+
+
+
+
+
+ -
+
+
+ SAC
+
+
+
-
+
+
+
+
+
+ -
+
+
+ Duration
+
+
+
-
+
+
+
+
+
+ -
+
+
+ Total Time
+
+
+
-
+
+
+
+
+
+ Qt::AlignCenter
+
+
+
+
+
+
+ -
+
+
+ Dives
+
+
+
-
+
+
+
+
+
+ Qt::AlignCenter
+
+
+
+
+
+
+
+ groupBox_8b
+ groupBox_4b
+ groupBox_11b
+ groupBox_14
+ groupBoxb
+ groupBox_7b
+
@@ -580,19 +755,6 @@
1
-
- dateTimeEdit
- airtemp
- watertemp
- location
- coordinates
- divemaster
- buddy
- suit
- notes
- notesButtonBox
- equipmentButtonBox
-