From b54f41c47f5d7265f7b0bf3c19198daaf2b58653 Mon Sep 17 00:00:00 2001
From: Kjell Kernen <github@kernen.se>
Date: Fri, 28 Mar 2014 13:39:53 +0100
Subject: [PATCH] Tightened up the layout of the Telemetry tab of model edit.
 It is the widest one, so it is setting the mninimum width for all tabs.
 Important to keep it tight.

---
 companion/src/modeledit/telemetry.ui        | 42 ++++++++++++---------
 companion/src/modeledit/telemetry_analog.ui |  4 +-
 2 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/companion/src/modeledit/telemetry.ui b/companion/src/modeledit/telemetry.ui
index 884120b3d..98420efc7 100644
--- a/companion/src/modeledit/telemetry.ui
+++ b/companion/src/modeledit/telemetry.ui
@@ -13,7 +13,10 @@
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,0,0,0,0,0,0">
+  <layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,0,0,0,0,0">
+   <property name="spacing">
+    <number>0</number>
+   </property>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_14" stretch="0,0,0,0,0">
      <property name="sizeConstraint">
@@ -347,6 +350,9 @@
    </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_13" stretch="1,0,1">
+     <property name="spacing">
+      <number>0</number>
+     </property>
      <property name="sizeConstraint">
       <enum>QLayout::SetMinimumSize</enum>
      </property>
@@ -376,6 +382,9 @@
         </property>
         <item>
          <layout class="QGridLayout" name="gridLayout_34" columnstretch="0,1,1,1">
+          <property name="rightMargin">
+           <number>3</number>
+          </property>
           <property name="horizontalSpacing">
            <number>9</number>
           </property>
@@ -690,7 +699,7 @@
                <string>Sink Max</string>
               </property>
               <property name="alignment">
-               <set>Qt::AlignCenter</set>
+               <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
               </property>
              </widget>
             </item>
@@ -813,7 +822,7 @@
                <string>Climb Max</string>
               </property>
               <property name="alignment">
-               <set>Qt::AlignCenter</set>
+               <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
               </property>
              </widget>
             </item>
@@ -829,7 +838,7 @@
                <string>Sink Min</string>
               </property>
               <property name="alignment">
-               <set>Qt::AlignCenter</set>
+               <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
               </property>
              </widget>
             </item>
@@ -845,7 +854,7 @@
                <string>Climb Min</string>
               </property>
               <property name="alignment">
-               <set>Qt::AlignCenter</set>
+               <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
               </property>
              </widget>
             </item>
@@ -932,16 +941,16 @@
      </property>
      <layout class="QGridLayout" name="gridLayout_6">
       <property name="leftMargin">
-       <number>1</number>
+       <number>0</number>
       </property>
       <property name="topMargin">
-       <number>1</number>
+       <number>0</number>
       </property>
       <property name="rightMargin">
-       <number>1</number>
+       <number>0</number>
       </property>
       <property name="bottomMargin">
-       <number>1</number>
+       <number>6</number>
       </property>
       <property name="spacing">
        <number>0</number>
@@ -952,7 +961,7 @@
          <number>9</number>
         </property>
         <property name="verticalSpacing">
-         <number>6</number>
+         <number>0</number>
         </property>
         <item row="1" column="2">
          <widget class="QLabel" name="mahCount_label">
@@ -1031,6 +1040,12 @@
         </item>
         <item row="0" column="0">
          <widget class="QLabel" name="label_3">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
           <property name="font">
            <font>
             <weight>75</weight>
@@ -1047,13 +1062,6 @@
      </layout>
     </widget>
    </item>
-   <item>
-    <widget class="Line" name="line_6">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
    <item>
     <widget class="QTabWidget" name="customScreens">
      <property name="sizePolicy">
diff --git a/companion/src/modeledit/telemetry_analog.ui b/companion/src/modeledit/telemetry_analog.ui
index d09c7b421..44ada5d77 100644
--- a/companion/src/modeledit/telemetry_analog.ui
+++ b/companion/src/modeledit/telemetry_analog.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>272</width>
+    <width>276</width>
     <height>118</height>
    </rect>
   </property>
@@ -260,7 +260,7 @@
        </property>
       </widget>
      </item>
-     <item row="0" column="1" colspan="2">
+     <item row="0" column="1" colspan="3">
       <widget class="QComboBox" name="UnitCB">
        <property name="sizePolicy">
         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">