From 116608201dae69e68f4366746e1a2de2adcfe1b2 Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Mon, 4 Aug 2014 13:18:20 -0300 Subject: Fix unresizable DiveList The issue with the dive list was actually the Planner Settings widget that was in the same space as the dive list but hidden, but since it had a minimum width we couldn't resize the dive list to be below the planner settings minimum. Fixed by inserting the contents of the Planner Settings into a QScroll Area. Fixes #679 Signed-off-by: Tomaz Canabrava Signed-off-by: Dirk Hohndel --- qt-ui/plannerSettings.ui | 981 ++++++++++++++++++++++++----------------------- 1 file changed, 503 insertions(+), 478 deletions(-) (limited to 'qt-ui') diff --git a/qt-ui/plannerSettings.ui b/qt-ui/plannerSettings.ui index e94dc88d8..0ad0f5b70 100644 --- a/qt-ui/plannerSettings.ui +++ b/qt-ui/plannerSettings.ui @@ -6,496 +6,521 @@ 0 0 - 1116 - 292 + 1102 + 442 Form - - - 2 - - - 2 - - - 2 - - - 2 - - - 2 - + - - - Rates + + + QFrame::NoFrame - - - 2 - - - 2 - - - 2 - - - 2 - - - 2 + + QFrame::Plain + + + true + + + + + 0 + 0 + 1089 + 404 + - - - - Ascent - - - - 2 - - - 2 - - - 2 - - - 2 - - - 2 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Rates - - - - below 75% avg. depth - - - - - - - m/min - - - 1 - - - - - - - 75% to 50% avg. depth - - - - - - - m/min - - - 1 - - - - - - - 50% avg. depth to 6m - - - - - - - m/min - - - 1 - - - - - - - 6m to surface - - - - - - - m/min - - - 1 - - - - - - - - - - Descent - - - - 2 + + + 2 + + + 2 + + + 2 + + + 2 + + + 2 + + + + + Ascent + + + + 2 + + + 2 + + + 2 + + + 2 + + + 2 + + + + + below 75% avg. depth + + + + + + + m/min + + + 1 + + + + + + + 75% to 50% avg. depth + + + + + + + m/min + + + 1 + + + + + + + 50% avg. depth to 6m + + + + + + + m/min + + + 1 + + + + + + + 6m to surface + + + + + + + m/min + + + 1 + + + + + + + + + + Descent + + + + 2 + + + 2 + + + 2 + + + 2 + + + 2 + + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + m/min + + + 1 + + + 18 + + + + + + + + 0 + 0 + + + + surface to the bottom + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + Planning - - 2 + + + 2 + + + 2 + + + 2 + + + 2 + + + 2 + + + + + GF low + + + + + + + 1 + + + 150 + + + + + + + GF high + + + + + + + 1 + + + 150 + + + + + + + Drop to first depth + + + + + + + Last stop at 6m + + + + + + + Plan backgas breaks + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + Gas options - - 2 + + + 2 + + + 2 + + + 2 + + + 2 + + + 2 + + + + + Bottom SAC + + + + + + + + + + Deco SAC + + + + + + + + + + Bottom pO₂ + + + + + + + bar + + + 2.000000000000000 + + + 0.100000000000000 + + + 1.400000000000000 + + + + + + + Deco pO₂ + + + + + + + bar + + + 2.000000000000000 + + + 0.100000000000000 + + + 1.600000000000000 + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + Dive notes - - 2 - - - 2 - - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - m/min - - - 1 - - - 18 - - - - - - - - 0 - 0 - - - - surface to the bottom - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - Planning - - - - 2 - - - 2 - - - 2 - - - 2 - - - 2 - - - - - GF low - - - - - - - 1 - - - 150 - - - - - - - GF high - - - - - - - 1 - - - 150 - - - - - - - Drop to first depth - - - - - - - Last stop at 6m - - - - - - - Plan backgas breaks - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - Gas options - - - - 2 - - - 2 - - - 2 - - - 2 - - - 2 - - - - - Bottom SAC - - - - - - - - - - Deco SAC - - - - - - - - - - Bottom pO₂ - - - - - - - bar - - - 2.000000000000000 - - - 0.100000000000000 - - - 1.400000000000000 - - - - - - - Deco pO₂ - - - - - - - bar - - - 2.000000000000000 - - - 0.100000000000000 - - - 1.600000000000000 - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - Dive notes - - - - 2 - - - 2 - - - 2 - - - 2 - - - 2 - - - - - In dive plan, show runtime (absolute time) of stops - - - Display runtime - - - true - - - - - - - true - - - In dive plan, show duration (relative time) of stops - - - Display segment duration - - - false - - - - - - - In diveplan, list transitions or treat them as implicit - - - Display transitions in deco - - - - - - - Verbatim diveplan - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - + + + 2 + + + 2 + + + 2 + + + 2 + + + 2 + + + + + In dive plan, show runtime (absolute time) of stops + + + Display runtime + + + true + + + + + + + true + + + In dive plan, show duration (relative time) of stops + + + Display segment duration + + + false + + + + + + + In diveplan, list transitions or treat them as implicit + + + Display transitions in deco + + + + + + + Verbatim diveplan + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + -- cgit v1.2.3-70-g09d2