From 8131a1cee8bdd154818c5a76b5551644350b1660 Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Thu, 26 Jun 2014 16:53:42 -0300 Subject: Make the dive planner dialog prettier. It was too much vertical and cluttered, making the usage of the application a bit strange. Signed-off-by: Tomaz Canabrava Signed-off-by: Dirk Hohndel --- qt-ui/plannerSettings.ui | 624 +++++++++++++++++++++++++++-------------------- 1 file changed, 363 insertions(+), 261 deletions(-) (limited to 'qt-ui') diff --git a/qt-ui/plannerSettings.ui b/qt-ui/plannerSettings.ui index 271906e70..9cb802848 100644 --- a/qt-ui/plannerSettings.ui +++ b/qt-ui/plannerSettings.ui @@ -6,331 +6,444 @@ 0 0 - 537 - 435 + 1116 + 292 Form + + 2 + + + 2 + + + 2 + + + 2 + + + 2 + - - - - 0 - 0 - + + + Rates - - QFrame::StyledPanel - - - QFrame::Raised - - - - - - surface to the bottom - + + + 2 + + + 2 + + + 2 + + + 2 + + + 2 + + + + + Ascent + + + + 2 + + + 2 + + + 2 + + + 2 + + + 2 + + + + + 75%-50% avg. depth + + + + + + + m/min + + + 1 + + + + + + + below 75% avg. depth + + + + + + + m/min + + + 1 + + + + + + + 6m/20ft to surface + + + + + + + m/min + + + 1 + + + + + + + m/min + + + 1 + + + + + + + 50% avg. depth - 6m/20ft + + + + - - - - bar - - - 2.000000000000000 - - - 0.100000000000000 - - - 1.400000000000000 - + + + + Descent + + + + 2 + + + 2 + + + 2 + + + 2 + + + 2 + + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + m/min + + + 1 + + + 18 + + + + + + + + 0 + 0 + + + + surface to the bottom + + + + - - - - - 0 - 0 - - - + + + + Qt::Vertical + + - 16777215 - 20 + 20 + 40 - - m/min - - - 1 - - - 18 - - - - - - - bar - - - 2.000000000000000 - - - 0.100000000000000 - - - 1.600000000000000 - - + - - - - m/min - - - 1 - - - - - + + + + + + + Planning + + + + 2 + + + 2 + + + 2 + + + 2 + + + 2 + + + - bottom pO₂ + plan backgas breaks - - + + - <html><head/><body><p><span style=" font-weight:600;">Descent rate</span></p></body></html> + GF low - - + + - 6m/20ft to surface + Last Stop at 6m/20ft - - + + - deco pO₂ + GF high - - - - 75%-50% avg. depth + + + + 1 + + + 150 - - + + - below 75% avg. depth + Drop to first depth - - - - 50% avg. depth - 6m/20ft + + + + 1 + + + 150 - - - - <html><head/><body><p><span style=" font-weight:600;">Ascent rates</span></p></body></html> + + + + Qt::Vertical - + + + 20 + 40 + + + + + + + + + + Gas Options + + + + 2 + + + 2 + + + 2 + + + 2 + + + 2 + - + - m/min + bar - - 1 + + 2.000000000000000 + + + 0.100000000000000 + + + 1.600000000000000 - - + + - m/min + bar - - 1 + + 2.000000000000000 + + + 0.100000000000000 + + + 1.400000000000000 - - + + - <html><head/><body><p><span style=" font-weight:600;">Gas options</span></p></body></html> + deco pO₂ - - - - m/min - - - 1 + + + + bottom pO₂ - - + + - + bottom SAC - + + + + deco SAC - - + + + + Qt::Vertical + + + + 20 + 40 + + + - - - - 0 - 0 - - - - QFrame::StyledPanel - - - QFrame::Raised + + + Dive Notes - - - QLayout::SetNoConstraint + + + 2 - - - - - 0 - 0 - - - - <html><head/><body><p><span style=" font-weight:600;">Planning options</span></p></body></html> - - - - - - - QFrame::NoFrame - - - QFrame::Raised - - - - - - GF low - - - - - - - 1 - - - 150 - - - - - - - GF high - - - - - - - 1 - - - 150 - - - - - - - - - - Drop to first depth - - - - - - - Last Stop at 6m/20ft - - - - - - - plan backgas breaks - - - - - - - - 0 - 0 - - + + 2 + + + 2 + + + 2 + + + 2 + + + - <html><head/><body><p><span style=" font-weight:600;">Dive note options</span></p></body></html> + verbatim diveplan - + In dive plan, show runtime (absolute time) of stops @@ -343,7 +456,7 @@ - + true @@ -359,7 +472,7 @@ - + In diveplan, list transitions or treat them as implicit @@ -369,35 +482,24 @@ - - - - - 20 - 0 - - + + - Qt::Horizontal + Qt::Vertical - - - - - - verbatim diveplan + + + 20 + 40 + - + - - lastStop - backgasBreaks - -- cgit v1.2.3-70-g09d2