Reorganise the Information tab of the Info panel

1)  Reorganise the existing widgets in the Information tab
2)  Move divemode widget and visibility widget from Notes tab to
    Information tab
3)  Translate water density to a word indicating water type
4)  Reorganise the Notes tab to compensate for the moving the
    divemode and visibility widgets to the Information tab
5)  Remove the problems in showing a QGroupBox in Qt Windows. I do
    this by removing the CSS specifying border characteristics

Signed-off-by: willemferguson <willemferguson@zoology.up.ac.za>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

1 files changed, 321 insertions, 88 deletions

diff --git a/desktop-widgets/tab-widgets/TabDiveInformation.ui b/desktop-widgets/tab-widgets/TabDiveInformation.ui
index b35ddf01d..41be1bd8a 100644
--- a/desktop-widgets/tab-widgets/TabDiveInformation.ui
+++ b/desktop-widgets/tab-widgets/TabDiveInformation.ui
@@ -15,6 +15,9 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
+    <widget class="KMessageWidget" name="multiDiveWarningMessage"/>
+   </item>
+   <item>
     <widget class="QScrollArea" name="scrollArea_3">
      <property name="frameShape">
       <enum>QFrame::NoFrame</enum>
@@ -48,35 +51,65 @@
         <number>0</number>
        </property>
        <property name="horizontalSpacing">
-        <number>6</number>
+        <number>4</number>
        </property>
        <property name="verticalSpacing">
         <number>0</number>
        </property>
+
+       <item row="0" column="0">
+        <widget class="QLabel" name="diveHeadingLabel">
+         <property name="text">
+          <string>DIVE</string>
+         </property>
+        </widget>
+       </item>
+
        <item row="0" column="0">
-        <widget class="QGroupBox" name="groupBox_5">
+        <widget class="QLabel" name="diveHeadingLabel">
+         <property name="text">
+          <string>DIVE</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="0">
+        <widget class="QGroupBox" name="diveModeBox">
          <property name="title">
-          <string>Date</string>
+          <string>Dive mode</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignHCenter</set>
+         </property>
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Ignored" vsizetype="Preferred">
+          </sizepolicy>
+         </property>
+         <layout class="QHBoxLayout" name="diveModeLayout">
+         <property name="alignment">
+          <set>Qt::AlignBottom</set>
          </property>
-         <layout class="QHBoxLayout" name="diveInfoDateLayout">
           <item>
-           <widget class="QLabel" name="dateText">
-            <property name="text">
-             <string/>
-            </property>
-            <property name="alignment">
-             <set>Qt::AlignCenter</set>
-            </property>
+           <widget class="QComboBox" name="diveType">
            </widget>
           </item>
          </layout>
         </widget>
        </item>
-       <item row="0" column="2">
+
+       <item row="1" column="1">
         <widget class="QGroupBox" name="groupBox_12">
          <property name="title">
           <string>Interval</string>
          </property>
+         <property name="alignment">
+          <set>Qt::AlignHCenter</set>
+         </property>
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Ignored" vsizetype="Preferred">
+           <horstretch>1</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
          <layout class="QHBoxLayout" name="diveInfoSurfintervallLayout">
           <item>
            <widget class="QLabel" name="surfaceIntervalText">
@@ -84,78 +117,124 @@
              <string/>
             </property>
             <property name="alignment">
-             <set>Qt::AlignCenter</set>
+             <set>Qt::AlignHCenter</set>
             </property>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
-       <item row="1" column="0">
-        <widget class="QGroupBox" name="groupBox_3">
+       <item row="1" column="2">
+        <widget class="QGroupBox" name="groupBox_11">
          <property name="title">
-          <string>Gases used</string>
+          <string>Duration</string>
          </property>
-         <layout class="QHBoxLayout" name="diveInfoGasesUsedLayout">
+         <property name="alignment">
+          <set>Qt::AlignHCenter</set>
+         </property>
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Ignored" vsizetype="Preferred">
+           <horstretch>1</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <layout class="QHBoxLayout" name="diveInfoDiveTimeLayout">
           <item>
-           <widget class="QLabel" name="oxygenHeliumText">
+           <widget class="QLabel" name="diveTimeText">
             <property name="text">
              <string/>
             </property>
             <property name="alignment">
-             <set>Qt::AlignCenter</set>
+             <set>Qt::AlignHCenter</set>
             </property>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
-       <item row="1" column="1">
-        <widget class="QGroupBox" name="groupBox_4">
+       <item row="1" column="3">
+        <widget class="QGroupBox" name="groupBox_6">
          <property name="title">
-          <string>Gas consumed</string>
+          <string>Max. depth</string>
          </property>
-         <layout class="QHBoxLayout" name="diveInfoGasConsumedLayout">
+         <property name="alignment">
+          <set>Qt::AlignHCenter</set>
+         </property>
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Ignored" vsizetype="Preferred">
+           <horstretch>1</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <layout class="QHBoxLayout" name="diveInfoMaxDepthLayout">
           <item>
-           <widget class="QLabel" name="gasUsedText">
+           <widget class="QLabel" name="maximumDepthText">
             <property name="text">
              <string/>
             </property>
             <property name="alignment">
-             <set>Qt::AlignCenter</set>
+             <set>Qt::AlignHCenter</set>
             </property>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
-       <item row="1" column="2">
-        <widget class="QGroupBox" name="groupBox">
+
+       <item row="1" column="4">
+        <widget class="QGroupBox" name="groupBox_7">
          <property name="title">
-          <string>SAC</string>
+          <string>Avg. depth</string>
          </property>
-         <layout class="QHBoxLayout" name="diveInfoSacLayout">
+         <property name="alignment">
+          <set>Qt::AlignHCenter</set>
+         </property>
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Ignored" vsizetype="Preferred">
+           <horstretch>1</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <layout class="QHBoxLayout" name="diveInfoAvgDepthLayout">
           <item>
-           <widget class="QLabel" name="sacText">
+           <widget class="QLabel" name="averageDepthText">
             <property name="text">
              <string/>
             </property>
             <property name="alignment">
-             <set>Qt::AlignCenter</set>
+             <set>Qt::AlignHCenter</set>
             </property>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
+
        <item row="2" column="0">
-        <widget class="QGroupBox" name="groupBox_15">
+        <widget class="QLabel" name="gasHeadingLabel">
+         <property name="text">
+          <string>GAS</string>
+         </property>
+        </widget>
+       </item>
+
+       <item row="3" column="0">
+        <widget class="QGroupBox" name="groupBox_3">
          <property name="title">
-          <string>CNS</string>
+          <string> Gas name</string>
          </property>
-         <layout class="QHBoxLayout" name="diveInfoCnsLayout">
+         <property name="alignment">
+          <set>Qt::AlignHCenter</set>
+         </property>
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Ignored" vsizetype="Preferred">
+           <horstretch>1</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <layout class="QHBoxLayout" name="diveInfoGasesUsedLayout">
           <item>
-           <widget class="QLabel" name="maxcnsText">
+           <widget class="QLabel" name="oxygenHeliumText">
             <property name="text">
              <string/>
             </property>
@@ -167,14 +246,23 @@
          </layout>
         </widget>
        </item>
-       <item row="2" column="1">
-        <widget class="QGroupBox" name="groupBox_2">
+       <item row="3" column="1">
+        <widget class="QGroupBox" name="groupBox_4">
          <property name="title">
-          <string>OTU</string>
+          <string>Gas consumed</string>
          </property>
-         <layout class="QHBoxLayout" name="diveInfoOtuLayout">
+         <property name="alignment">
+          <set>Qt::AlignHCenter</set>
+         </property>
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Ignored" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <layout class="QHBoxLayout" name="diveInfoGasConsumedLayout">
           <item>
-           <widget class="QLabel" name="otuText">
+           <widget class="QLabel" name="gasUsedText">
             <property name="text">
              <string/>
             </property>
@@ -186,14 +274,23 @@
          </layout>
         </widget>
        </item>
-       <item row="3" column="1">
-        <widget class="QGroupBox" name="groupBox_6">
+       <item row="3" column="2">
+        <widget class="QGroupBox" name="groupBox">
          <property name="title">
-          <string>Max. depth</string>
+          <string>SAC</string>
          </property>
-         <layout class="QHBoxLayout" name="diveInfoMaxDepthLayout">
+         <property name="alignment">
+          <set>Qt::AlignHCenter</set>
+         </property>
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Ignored" vsizetype="Maximum">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <layout class="QHBoxLayout" name="diveInfoSacLayout">
           <item>
-           <widget class="QLabel" name="maximumDepthText">
+           <widget class="QLabel" name="sacText">
             <property name="text">
              <string/>
             </property>
@@ -205,14 +302,23 @@
          </layout>
         </widget>
        </item>
-       <item row="3" column="0">
-        <widget class="QGroupBox" name="groupBox_7">
+       <item row="3" column="3">
+        <widget class="QGroupBox" name="groupBox_15">
          <property name="title">
-          <string>Avg. depth</string>
+          <string>CNS</string>
          </property>
-         <layout class="QHBoxLayout" name="diveInfoAvgDepthLayout">
+         <property name="alignment">
+          <set>Qt::AlignHCenter</set>
+         </property>
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Ignored" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>1</verstretch>
+          </sizepolicy>
+         </property>
+         <layout class="QHBoxLayout" name="diveInfoCnsLayout">
           <item>
-           <widget class="QLabel" name="averageDepthText">
+           <widget class="QLabel" name="maxcnsText">
             <property name="text">
              <string/>
             </property>
@@ -224,42 +330,63 @@
          </layout>
         </widget>
        </item>
-
-       <item row="2" column="2" colspan="1">
-        <widget class="QGroupBox" name="groupBox_10">
+       <item row="3" column="4">
+        <widget class="QGroupBox" name="groupBox_2">
          <property name="title">
-          <string>Atm. pressure</string>
+          <string>OTU</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignHCenter</set>
          </property>
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-         <layout class="QHBoxLayout" name="diveInfoAirPressureLayout">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Ignored" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <layout class="QHBoxLayout" name="diveInfoOtuLayout">
           <item>
-           <widget class="QLineEdit" name="atmPressVal">
-            <property name="readOnly">
-             <bool>false</bool>
+           <widget class="QLabel" name="otuText">
+            <property name="text">
+             <string/>
+            </property>
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+            <property name="alignment">
+             <set>Qt::AlignCenter</set>
             </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QComboBox" name="atmPressType">
            </widget>
           </item>
          </layout>
         </widget>
        </item>
 
-       <item row="3" column="2">
+       <item row="4" column="0">
+        <widget class="QLabel" name="environmentHeadingLabel">
+         <property name="text">
+          <string>ENVIRONMENT</string>
+         </property>
+        </widget>
+       </item>
+
+       <item row="5" column="0">
         <widget class="QGroupBox" name="groupBox_9">
          <property name="title">
           <string>Air temp.</string>
          </property>
+         <property name="alignment">
+          <set>Qt::AlignHCenter</set>
+         </property>
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Ignored" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
          <layout class="QHBoxLayout" name="diveInfoAirTempLayout">
           <item>
            <widget class="QLabel" name="airTemperatureText">
@@ -267,18 +394,28 @@
              <string/>
             </property>
             <property name="alignment">
-             <set>Qt::AlignCenter</set>
+             <set>Qt::AlignHCenter</set>
             </property>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
-       <item row="4" column="0">
+
+       <item row="5" column="1">
         <widget class="QGroupBox" name="groupBox_8">
          <property name="title">
           <string>Water temp.</string>
          </property>
+         <property name="alignment">
+          <set>Qt::AlignHCenter</set>
+         </property>
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Ignored" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
          <layout class="QHBoxLayout" name="diveInfoWaterTempLayout">
           <item>
            <widget class="QLabel" name="waterTemperatureText">
@@ -286,49 +423,139 @@
              <string/>
             </property>
             <property name="alignment">
-             <set>Qt::AlignCenter</set>
+             <set>Qt::AlignHCenter</set>
             </property>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
-       <item row="0" column="1">
-        <widget class="QGroupBox" name="groupBox_11">
+
+       <item row="5" column="2" colspan="3">
+        <layout class="QGridLayout" name="envGroupLayout">
+         <property name="horizontalSpacing">
+          <number>4</number>
+         </property>
+
+       <item row="0" column="0">
+        <widget class="QGroupBox" name="groupBox_1">
          <property name="title">
-          <string>Dive time</string>
+          <string>Water type/Density</string>
          </property>
-         <layout class="QHBoxLayout" name="diveInfoDiveTimeLayout">
+         <property name="alignment">
+          <set>Qt::AlignHCenter</set>
+         </property>
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Ignored" vsizetype="Preferred">
+           <horstretch>1</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <layout class="QHBoxLayout" name="diveInfoWaterDensityLayout">
+
           <item>
-           <widget class="QLabel" name="diveTimeText">
-            <property name="text">
-             <string/>
-            </property>
+        <widget class="QLabel" name="waterTypeText">
+         <property name="text">
+          <string>EN13319</string>
+         </property>
+        </widget>
+          </item>
+
+          <item>
+           <widget class="QLabel" name="salinityText">
             <property name="alignment">
              <set>Qt::AlignCenter</set>
             </property>
            </widget>
           </item>
+
          </layout>
         </widget>
        </item>
-       <item row="4" column="1">
-        <widget class="QGroupBox" name="groupBox_1">
+
+       <item row="0" column="1">
+        <widget class="QGroupBox" name="groupBox_10">
          <property name="title">
-          <string>Water type</string>
+          <string>Atm. pressure/Altitude</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignHCenter</set>
          </property>
-         <layout class="QHBoxLayout" name="diveInfoSalinityLayout">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Ignored" vsizetype="Preferred">
+             <horstretch>1</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+         <layout class="QHBoxLayout" name="diveInfoAirPressureLayout">
           <item>
-           <widget class="QLabel" name="salinityText">
-            <property name="alignment">
-             <set>Qt::AlignCenter</set>
+           <widget class="QLineEdit" name="atmPressVal">
+            <property name="readOnly">
+             <bool>false</bool>
             </property>
            </widget>
           </item>
+          <item>
+           <widget class="QComboBox" name="atmPressType">
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>
-       <item row="5" column="0">
+
+       </layout>
+       </item>
+
+       <item row="6" column="1" alignment="Qt::AlignVCenter">
+        <widget class="QGroupBox" name="groupBox_visibility">
+         <property name="title">
+          <string>Visibility</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignHCenter</set>
+         </property>
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <layout class="QGridLayout" name="visibilityLayout">
+          <property name="verticalSpacing">
+           <number>0</number>
+          </property>
+          <item row="0" column="0" colspan="2" alignment="Qt::AlignHCenter">
+           <widget class="StarWidget" name="visibility" native="true">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="focusPolicy">
+             <enum>Qt::StrongFocus</enum>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0" alignment="Qt::AlignLeft">
+           <widget class="QLabel" name="visLabel1">
+            <property name="text">
+             <string>Bad</string>
+            </property>
+           </widget>
+           </item>
+           <item row="1" column="1" alignment="Qt::AlignRight">
+            <widget class="QLabel" name="visLabel2">
+             <property name="text">
+              <string>Good</string>
+             </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+
+       <item row="7" column="0">
         <spacer>
          <property name="orientation">
           <enum>Qt::Vertical</enum>
@@ -336,6 +563,12 @@
          <property name="sizeType">
           <enum>QSizePolicy::Expanding</enum>
          </property>
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>