From 335d3f9c07ec5d7a053a5699922c3514affecc59 Mon Sep 17 00:00:00 2001
From: willemferguson <willemferguson@zoology.up.ac.za>
Date: Tue, 3 Nov 2020 09:03:32 +0200
Subject: Reorganise the current statistics tab

As the title above says....

Signed-off-by: willemferguson <willemferguson@zoology.up.ac.za>
---
 desktop-widgets/tab-widgets/TabDiveStatistics.ui | 220 ++++++++++++++++++-----
 1 file changed, 177 insertions(+), 43 deletions(-)

diff --git a/desktop-widgets/tab-widgets/TabDiveStatistics.ui b/desktop-widgets/tab-widgets/TabDiveStatistics.ui
index be2d01229..ec7ce2610 100644
--- a/desktop-widgets/tab-widgets/TabDiveStatistics.ui
+++ b/desktop-widgets/tab-widgets/TabDiveStatistics.ui
@@ -57,7 +57,7 @@
         <number>0</number>
        </property>
        <item>
-        <layout class="QGridLayout" name="gridLayout_2">
+        <layout class="QGridLayout" name="gridLayout_2a">
          <property name="sizeConstraint">
           <enum>QLayout::SetMinimumSize</enum>
          </property>
@@ -67,111 +67,243 @@
          <property name="verticalSpacing">
           <number>0</number>
          </property>
-         <item row="1" column="0">
+
+         <item row="0" column="0">
           <widget class="QGroupBox" name="groupBoxb">
            <property name="title">
             <string>Max. depth</string>
            </property>
+           <property name="alignment">
+            <set>Qt::AlignHCenter</set>
+           </property>
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+            </sizepolicy>
+           </property>
            <layout class="QHBoxLayout" name="statsDepthLayout">
+            <property name="sizeConstraint">
+             <enum>QLayout::SetMinimumSize</enum>
+            </property>
             <item>
              <widget class="MinMaxAvgWidget" name="depthLimits" native="true"/>
             </item>
            </layout>
           </widget>
          </item>
-         <item row="0" column="2">
-          <widget class="QGroupBox" name="groupBox_4b">
+
+         <item row="0" column="1">
+          <widget class="QGroupBox" name="groupBox_14">
            <property name="title">
-            <string>SAC</string>
+            <string>Duration</string>
            </property>
-           <layout class="QHBoxLayout" name="statsSacLayout">
+           <property name="alignment">
+            <set>Qt::AlignHCenter</set>
+           </property>
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+            </sizepolicy>
+           </property>
+           <layout class="QHBoxLayout" name="statsDurationLayout">
+            <property name="sizeConstraint">
+             <enum>QLayout::SetMinimumSize</enum>
+            </property>
             <item>
-             <widget class="MinMaxAvgWidget" name="sacLimits" native="true"/>
+             <widget class="MinMaxAvgWidget" name="timeLimits" native="true"/>
             </item>
            </layout>
           </widget>
          </item>
-         <item row="0" column="1">
+
+         <item row="0" column="2">
           <widget class="QGroupBox" name="groupBox_8b">
            <property name="title">
             <string>Temperature</string>
            </property>
+           <property name="alignment">
+            <set>Qt::AlignHCenter</set>
+           </property>
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+            </sizepolicy>
+           </property>
            <layout class="QHBoxLayout" name="statsTempLayout">
+            <property name="sizeConstraint">
+             <enum>QLayout::SetMinimumSize</enum>
+            </property>
             <item>
              <widget class="MinMaxAvgWidget" name="tempLimits" native="true"/>
             </item>
            </layout>
           </widget>
          </item>
-         <item row="1" column="1">
-          <widget class="QGroupBox" name="groupBox_11b">
+
+         <item row="0" column="3">
+          <widget class="QGroupBox" name="groupBox_4b">
            <property name="title">
-            <string>Total time</string>
+            <string>SAC</string>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignHCenter</set>
+           </property>
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+            </sizepolicy>
            </property>
-           <layout class="QHBoxLayout" name="statsTotalTimeLayout">
+           <layout class="QHBoxLayout" name="statsSacLayout">
+            <property name="sizeConstraint">
+             <enum>QLayout::SetMinimumSize</enum>
+            </property>
             <item>
-             <widget class="QLabel" name="totalTimeAllText">
-              <property name="text">
-               <string/>
-              </property>
-              <property name="alignment">
-               <set>Qt::AlignCenter</set>
-              </property>
-             </widget>
+             <widget class="MinMaxAvgWidget" name="sacLimits" native="true"/>
             </item>
            </layout>
           </widget>
          </item>
-         <item row="0" column="0">
-          <widget class="QGroupBox" name="groupBox_14">
-           <property name="title">
-            <string>Duration</string>
+
+         <item row="1" column="0">
+          <widget class="QLabel" name="emptyline">
+           <property name="text">
+            <string></string>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignLeft</set>
            </property>
-           <layout class="QHBoxLayout" name="statsDurationLayout">
-            <item>
-             <widget class="MinMaxAvgWidget" name="timeLimits" native="true"/>
-            </item>
-           </layout>
           </widget>
          </item>
-         <item row="2" column="1">
-          <widget class="QGroupBox" name="groupBox_7b">
+
+         <item row="2" column="0" colspan="2">
+          <widget class="QGroupBox" name="groupBoxa1">
            <property name="title">
-            <string>Dives</string>
+            <string>All selected dives</string>
            </property>
-           <layout class="QHBoxLayout" name="statsDivesLayout">
-            <item>
+           <property name="alignment">
+            <set>Qt::AlignHCenter</set>
+           </property>
+           <layout class="QGridLayout" name="gridLayout_2">
+            <property name="sizeConstraint">
+             <enum>QLayout::SetMinimumSize</enum>
+            </property>
+            <property name="horizontalSpacing">
+             <number>6</number>
+            </property>
+            <property name="verticalSpacing">
+             <number>0</number>
+            </property>
+
+            <item row="0" column="0">
+             <widget class="QLabel" name="totalDivesLabel">
+              <property name="text">
+               <string>Total number of dives selected :</string>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignLeft</set>
+              </property>
+             </widget>
+            </item>
+
+            <item row="0" column="1">
              <widget class="QLabel" name="divesAllText">
               <property name="text">
                <string/>
               </property>
               <property name="alignment">
-               <set>Qt::AlignCenter</set>
+               <set>Qt::AlignLeft</set>
+              </property>
+             </widget>
+            </item>
+
+            <item row="1" column="0">
+             <widget class="QLabel" name="totalTimeLabel">
+              <property name="text">
+               <string>Total duration of selected dives :</string>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignLeft</set>
+              </property>
+             </widget>
+            </item>
+
+            <item row="1" column="1">
+             <widget class="QLabel" name="totalTimeAllText">
+              <property name="text">
+               <string></string>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignLeft</set>
               </property>
              </widget>
             </item>
+
+            <item row="2" column="0">
+             <spacer name="verticalSpacer_1">
+              <property name="orientation">
+               <enum>Qt::Vertical</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>5</width>
+                <height>5</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+
            </layout>
           </widget>
          </item>
-         <item row="1" column="2" rowspan="2">
+
+         <item row="2" column="2" rowspan="2" colspan="2" >
           <widget class="QGroupBox" name="groupBox_13">
            <property name="title">
             <string>Gas consumption</string>
            </property>
+           <property name="alignment">
+            <set>Qt::AlignHCenter</set>
+           </property>
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
            <layout class="QHBoxLayout" name="statsGasConsumptionLayout">
+            <property name="sizeConstraint">
+             <enum>QLayout::SetMaximumSize</enum>
+            </property>
+
             <item>
-             <widget class="QLabel" name="gasConsumption">
-              <property name="text">
-               <string/>
+             <widget class="QScrollArea" name="scrollArea_14">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
               </property>
-              <property name="alignment">
-               <set>Qt::AlignCenter</set>
+              <property name="frameShape">
+               <enum>QFrame::NoFrame</enum>
               </property>
-             </widget>
+              <property name="frameShadow">
+               <enum>QFrame::Plain</enum>
+              </property>
+              <property name="widgetResizable">
+               <bool>true</bool>
+              </property>
+
+              <widget class="QLabel" name="gasConsumption">
+               <property name="text">
+                <string/>
+               </property>
+               <property name="alignment">
+                <set>Qt::AlignTop</set>
+               </property>
+              </widget>
+
+             </widget>    
             </item>
            </layout>
           </widget>
          </item>
+
          <item row="3" column="0">
           <spacer name="verticalSpacer_2">
            <property name="orientation">
@@ -180,11 +312,12 @@
            <property name="sizeHint" stdset="0">
             <size>
              <width>20</width>
-             <height>40</height>
+             <height>5</height>
             </size>
            </property>
           </spacer>
          </item>
+
         </layout>
        </item>
       </layout>
@@ -193,6 +326,7 @@
    </item>
   </layout>
  </widget>
+
  <customwidgets>
   <customwidget>
    <class>MinMaxAvgWidget</class>
-- 
cgit v1.2.3-70-g09d2