Layout issues: Fix the layout ugliness on Mac & Linux

I seem to have found a sane way to create layouts:
If it's the 'outer' layout, the one that encapsulates everything:
- Horizontal Spacing: 5
- Vertical Spacing: 5

If it's a vertical inner layout that is grouping items like label +
control:
- Spacing: 0
This way the label will be 'touching' the item, without empty space, so
you know that the label refers to that widget.

If it's an horizontal inner layout:
- Spacing: 5
Different from the Vertical Layout, we don't want to make horizontal items
touch each other, a bit of space is fundamental to the eyes.

If it's a Grid Layout:
- Vertical Space: 0
- Horizontal Space: 5

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

2 files changed, 190 insertions, 75 deletions

diff --git a/qt-ui/maintab.ui b/qt-ui/maintab.ui
index da8cabecb..490e2ff44 100644
--- a/qt-ui/maintab.ui
+++ b/qt-ui/maintab.ui
@@ -18,6 +18,18 @@
     <string>Notes</string>
    </attribute>
    <layout class="QGridLayout" name="diveNotesLayout">
+    <property name="leftMargin">
+     <number>5</number>
+    </property>
+    <property name="topMargin">
+     <number>5</number>
+    </property>
+    <property name="rightMargin">
+     <number>5</number>
+    </property>
+    <property name="bottomMargin">
+     <number>5</number>
+    </property>
     <property name="spacing">
      <number>0</number>
     </property>
@@ -40,18 +52,39 @@
         <rect>
          <x>0</x>
          <y>0</y>
-         <width>417</width>
-         <height>744</height>
+         <width>449</width>
+         <height>758</height>
         </rect>
        </property>
-       <layout class="QVBoxLayout" name="verticalLayout">
+       <layout class="QVBoxLayout" name="verticalLayout_3">
+        <property name="leftMargin">
+         <number>0</number>
+        </property>
+        <property name="topMargin">
+         <number>0</number>
+        </property>
+        <property name="rightMargin">
+         <number>0</number>
+        </property>
+        <property name="bottomMargin">
+         <number>0</number>
+        </property>
         <item>
          <layout class="QGridLayout" name="gridLayout">
+          <property name="horizontalSpacing">
+           <number>5</number>
+          </property>
+          <property name="verticalSpacing">
+           <number>0</number>
+          </property>
           <item row="0" column="0">
            <widget class="QLabel" name="label_2">
             <property name="text">
              <string>Date</string>
             </property>
+            <property name="alignment">
+             <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+            </property>
            </widget>
           </item>
           <item row="0" column="1">
@@ -59,6 +92,9 @@
             <property name="text">
              <string>Time</string>
             </property>
+            <property name="alignment">
+             <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+            </property>
            </widget>
           </item>
           <item row="0" column="2">
@@ -66,6 +102,9 @@
             <property name="text">
              <string>Air temp.</string>
             </property>
+            <property name="alignment">
+             <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+            </property>
            </widget>
           </item>
           <item row="0" column="3">
@@ -73,6 +112,9 @@
             <property name="text">
              <string>Water temp.</string>
             </property>
+            <property name="alignment">
+             <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+            </property>
            </widget>
           </item>
           <item row="1" column="0">
@@ -115,44 +157,62 @@
          </layout>
         </item>
         <item>
-         <layout class="QHBoxLayout" name="LocationLabelLayout">
+         <layout class="QVBoxLayout" name="verticalLayout">
+          <property name="spacing">
+           <number>0</number>
+          </property>
           <item>
            <widget class="QLabel" name="LocationLabel">
             <property name="text">
              <string>Location</string>
             </property>
-           </widget>
-          </item>
-         </layout>
-        </item>
-        <item>
-         <layout class="QHBoxLayout" name="horizontalLayout_2">
-          <item>
-           <widget class="QLineEdit" name="location">
-            <property name="readOnly">
-             <bool>false</bool>
+            <property name="alignment">
+             <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QPushButton" name="manageDiveSite">
-            <property name="text">
-             <string>manage</string>
+           <layout class="QHBoxLayout" name="horizontalLayout_2">
+            <property name="spacing">
+             <number>2</number>
             </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QtWaitingSpinner" name="waitingSpinner" native="true"/>
+            <item>
+             <widget class="QLineEdit" name="location">
+              <property name="readOnly">
+               <bool>false</bool>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QPushButton" name="manageDiveSite">
+              <property name="text">
+               <string>manage</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QtWaitingSpinner" name="waitingSpinner" native="true"/>
+            </item>
+           </layout>
           </item>
          </layout>
         </item>
         <item>
          <layout class="QGridLayout" name="gridLayout_4">
+          <property name="horizontalSpacing">
+           <number>5</number>
+          </property>
+          <property name="verticalSpacing">
+           <number>0</number>
+          </property>
           <item row="0" column="0">
            <widget class="QLabel" name="DivemasterLabel">
             <property name="text">
              <string>Divemaster</string>
             </property>
+            <property name="alignment">
+             <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+            </property>
            </widget>
           </item>
           <item row="0" column="1">
@@ -160,6 +220,9 @@
             <property name="text">
              <string>Buddy</string>
             </property>
+            <property name="alignment">
+             <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+            </property>
            </widget>
           </item>
           <item row="1" column="0">
@@ -180,6 +243,12 @@
         </item>
         <item>
          <layout class="QGridLayout" name="gridLayout_3">
+          <property name="horizontalSpacing">
+           <number>5</number>
+          </property>
+          <property name="verticalSpacing">
+           <number>0</number>
+          </property>
           <item row="0" column="0">
            <widget class="QLabel" name="RatingLabel">
             <property name="sizePolicy">
@@ -250,6 +319,12 @@
         </item>
         <item>
          <layout class="QGridLayout" name="gridLayout_2">
+          <property name="horizontalSpacing">
+           <number>5</number>
+          </property>
+          <property name="verticalSpacing">
+           <number>0</number>
+          </property>
           <item row="1" column="1">
            <widget class="QComboBox" name="DiveType"/>
           </item>
@@ -258,6 +333,9 @@
             <property name="text">
              <string>Tags</string>
             </property>
+            <property name="alignment">
+             <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+            </property>
            </widget>
           </item>
           <item row="0" column="1">
@@ -265,6 +343,9 @@
             <property name="text">
              <string>Dive mode</string>
             </property>
+            <property name="alignment">
+             <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+            </property>
            </widget>
           </item>
           <item row="1" column="0">
@@ -295,65 +376,87 @@
          </layout>
         </item>
         <item>
-         <widget class="QLabel" name="NotesLabel">
-          <property name="text">
-           <string>Notes</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <layout class="QHBoxLayout" name="notesAndSocialNetworksLayout">
+         <layout class="QVBoxLayout" name="verticalLayout_2">
           <property name="spacing">
            <number>0</number>
           </property>
           <item>
-           <widget class="QTextEdit" name="notes">
-            <property name="readOnly">
-             <bool>false</bool>
+           <widget class="QLabel" name="NotesLabel">
+            <property name="text">
+             <string>Notes</string>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QWidget" name="socialNetworks" native="true">
-            <layout class="QVBoxLayout" name="socialNetworksLayout">
-             <property name="spacing">
-              <number>0</number>
-             </property>
-             <item>
-              <spacer name="verticalSpacer">
-               <property name="orientation">
-                <enum>Qt::Vertical</enum>
+           <layout class="QHBoxLayout" name="notesAndSocialNetworksLayout">
+            <property name="spacing">
+             <number>0</number>
+            </property>
+            <item>
+             <widget class="QTextEdit" name="notes">
+              <property name="readOnly">
+               <bool>false</bool>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QWidget" name="socialNetworks" native="true">
+              <layout class="QVBoxLayout" name="socialNetworksLayout">
+               <property name="spacing">
+                <number>0</number>
                </property>
-               <property name="sizeHint" stdset="0">
-                <size>
-                 <width>20</width>
-                 <height>40</height>
-                </size>
+               <property name="leftMargin">
+                <number>0</number>
                </property>
-              </spacer>
-             </item>
-             <item>
-              <widget class="QPushButton" name="facebookPublish">
-               <property name="text">
-                <string/>
+               <property name="topMargin">
+                <number>0</number>
                </property>
-               <property name="icon">
-                <iconset resource="../subsurface.qrc">
-                 <normaloff>:/facebook</normaloff>:/facebook</iconset>
+               <property name="rightMargin">
+                <number>0</number>
                </property>
-               <property name="iconSize">
-                <size>
-                 <width>32</width>
-                 <height>32</height>
-                </size>
+               <property name="bottomMargin">
+                <number>0</number>
                </property>
-               <property name="flat">
-                <bool>true</bool>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </widget>
+               <item>
+                <spacer name="verticalSpacer">
+                 <property name="orientation">
+                  <enum>Qt::Vertical</enum>
+                 </property>
+                 <property name="sizeHint" stdset="0">
+                  <size>
+                   <width>20</width>
+                   <height>40</height>
+                  </size>
+                 </property>
+                </spacer>
+               </item>
+               <item>
+                <widget class="QPushButton" name="facebookPublish">
+                 <property name="text">
+                  <string/>
+                 </property>
+                 <property name="icon">
+                  <iconset resource="../subsurface.qrc">
+                   <normaloff>:/facebook</normaloff>:/facebook</iconset>
+                 </property>
+                 <property name="iconSize">
+                  <size>
+                   <width>32</width>
+                   <height>32</height>
+                  </size>
+                 </property>
+                 <property name="flat">
+                  <bool>true</bool>
+                 </property>
+                </widget>
+               </item>
+              </layout>
+             </widget>
+            </item>
+           </layout>
           </item>
          </layout>
         </item>
@@ -387,8 +490,8 @@
         <rect>
          <x>0</x>
          <y>0</y>
-         <width>98</width>
-         <height>55</height>
+         <width>435</width>
+         <height>736</height>
         </rect>
        </property>
        <layout class="QGridLayout" name="equipmentTabScrollAreaLayout">
@@ -443,8 +546,8 @@
         <rect>
          <x>0</x>
          <y>0</y>
-         <width>330</width>
-         <height>334</height>
+         <width>435</width>
+         <height>736</height>
         </rect>
        </property>
        <layout class="QGridLayout" name="diveInfoScrollAreaLayout">
@@ -760,8 +863,8 @@
         <rect>
          <x>0</x>
          <y>0</y>
-         <width>328</width>
-         <height>208</height>
+         <width>435</width>
+         <height>736</height>
         </rect>
        </property>
        <layout class="QGridLayout" name="statsScrollAreaLayout">
diff --git a/qt-ui/mainwindow.ui b/qt-ui/mainwindow.ui
index 8e98bed6c..c7367bc66 100644
--- a/qt-ui/mainwindow.ui
+++ b/qt-ui/mainwindow.ui
@@ -15,6 +15,18 @@
     <property name="spacing">
      <number>0</number>
     </property>
+    <property name="leftMargin">
+     <number>0</number>
+    </property>
+    <property name="topMargin">
+     <number>0</number>
+    </property>
+    <property name="rightMargin">
+     <number>0</number>
+    </property>
+    <property name="bottomMargin">
+     <number>0</number>
+    </property>
     <item>
      <widget class="MultiFilter" name="multiFilter" native="true"/>
     </item>
@@ -243,7 +255,7 @@
   </action>
   <action name="actionEditDeviceNames">
    <property name="text">
-    <string>&amp;Edit device names</string>
+    <string>Edit device &amp;names</string>
    </property>
   </action>
   <action name="actionAddDive">
@@ -699,7 +711,7 @@
   </action>
   <action name="actionHash_images">
    <property name="text">
-    <string>Find moved images</string>
+    <string>&amp;Find moved images</string>
    </property>
   </action>
  </widget>