From 9fbaa4410f7609515eefe32bcf52d5e0d494d33f Mon Sep 17 00:00:00 2001
From: chris pember <chris.pember@gmail.com>
Date: Wed, 12 Sep 2012 19:12:23 -0700
Subject: [PATCH] new quick gui fixes branch, changed input form so the
 checkbox for calibrate is now a button, resized that and the wizard button to
 not be ginormous. no new functionality added, just desing changes

---
 .../openpilotgcs/src/plugins/config/input.ui  | 141 ++++++++++++------
 1 file changed, 99 insertions(+), 42 deletions(-)

diff --git a/ground/openpilotgcs/src/plugins/config/input.ui b/ground/openpilotgcs/src/plugins/config/input.ui
index 85d63b2f5..1e5ff4e4e 100755
--- a/ground/openpilotgcs/src/plugins/config/input.ui
+++ b/ground/openpilotgcs/src/plugins/config/input.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>670</width>
-    <height>693</height>
+    <width>680</width>
+    <height>671</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -27,9 +27,6 @@
        <string>RC Input</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_11">
-       <property name="spacing">
-        <number>6</number>
-       </property>
        <property name="margin">
         <number>0</number>
        </property>
@@ -110,17 +107,17 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>640</width>
-            <height>610</height>
+            <width>650</width>
+            <height>571</height>
            </rect>
           </property>
           <layout class="QGridLayout" name="gridLayout">
-           <property name="margin">
-            <number>12</number>
-           </property>
            <property name="verticalSpacing">
             <number>6</number>
            </property>
+           <property name="margin">
+            <number>12</number>
+           </property>
            <item row="1" column="0">
             <widget class="QGroupBox" name="groupBox_5">
              <property name="title">
@@ -150,20 +147,95 @@
                    <number>12</number>
                   </property>
                   <item>
-                   <widget class="QPushButton" name="configurationWizard">
-                    <property name="text">
-                     <string>Start Configuration Wizard</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item>
-                   <widget class="QCheckBox" name="runCalibration">
-                    <property name="enabled">
-                     <bool>true</bool>
-                    </property>
-                    <property name="text">
-                     <string>Run Calibration</string>
+                   <widget class="QGroupBox" name="groupBox_3">
+                    <property name="title">
+                     <string>Calibration and Configuration Options</string>
                     </property>
+                    <layout class="QHBoxLayout" name="horizontalLayout_7">
+                     <item>
+                      <spacer name="horizontalSpacer_10">
+                       <property name="orientation">
+                        <enum>Qt::Horizontal</enum>
+                       </property>
+                       <property name="sizeHint" stdset="0">
+                        <size>
+                         <width>40</width>
+                         <height>20</height>
+                        </size>
+                       </property>
+                      </spacer>
+                     </item>
+                     <item>
+                      <widget class="QPushButton" name="configurationWizard">
+                       <property name="text">
+                        <string>Start Configuration Wizard</string>
+                       </property>
+                       <property name="checkable">
+                        <bool>false</bool>
+                       </property>
+                       <property name="checked">
+                        <bool>false</bool>
+                       </property>
+                       <property name="autoDefault">
+                        <bool>false</bool>
+                       </property>
+                       <property name="default">
+                        <bool>false</bool>
+                       </property>
+                       <property name="flat">
+                        <bool>false</bool>
+                       </property>
+                      </widget>
+                     </item>
+                     <item>
+                      <spacer name="horizontalSpacer_7">
+                       <property name="orientation">
+                        <enum>Qt::Horizontal</enum>
+                       </property>
+                       <property name="sizeHint" stdset="0">
+                        <size>
+                         <width>40</width>
+                         <height>20</height>
+                        </size>
+                       </property>
+                      </spacer>
+                     </item>
+                     <item>
+                      <widget class="QPushButton" name="runCalibration">
+                       <property name="enabled">
+                        <bool>true</bool>
+                       </property>
+                       <property name="minimumSize">
+                        <size>
+                         <width>210</width>
+                         <height>0</height>
+                        </size>
+                       </property>
+                       <property name="autoFillBackground">
+                        <bool>false</bool>
+                       </property>
+                       <property name="text">
+                        <string>Manual Calibration</string>
+                       </property>
+                       <property name="checkable">
+                        <bool>true</bool>
+                       </property>
+                      </widget>
+                     </item>
+                     <item>
+                      <spacer name="horizontalSpacer_9">
+                       <property name="orientation">
+                        <enum>Qt::Horizontal</enum>
+                       </property>
+                       <property name="sizeHint" stdset="0">
+                        <size>
+                         <width>40</width>
+                         <height>20</height>
+                        </size>
+                       </property>
+                      </spacer>
+                     </item>
+                    </layout>
                    </widget>
                   </item>
                   <item>
@@ -187,9 +259,6 @@
                     <property name="spacing">
                      <number>0</number>
                     </property>
-                    <property name="margin">
-                     <number>0</number>
-                    </property>
                    </layout>
                   </item>
                   <item>
@@ -359,9 +428,6 @@
        <string>Flight Mode Switch Settings</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_8">
-       <property name="spacing">
-        <number>6</number>
-       </property>
        <property name="margin">
         <number>0</number>
        </property>
@@ -442,17 +508,14 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>640</width>
-            <height>610</height>
+            <width>650</width>
+            <height>571</height>
            </rect>
           </property>
           <layout class="QGridLayout" name="gridLayout_7">
            <property name="margin">
             <number>12</number>
            </property>
-           <property name="spacing">
-            <number>6</number>
-           </property>
            <item row="0" column="0">
             <widget class="QGroupBox" name="groupBox_2">
              <property name="minimumSize">
@@ -1057,9 +1120,6 @@ margin:1px;</string>
        <string>Arming Settings</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_12">
-       <property name="spacing">
-        <number>6</number>
-       </property>
        <property name="margin">
         <number>0</number>
        </property>
@@ -1140,14 +1200,11 @@ margin:1px;</string>
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>640</width>
-            <height>610</height>
+            <width>650</width>
+            <height>571</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_2">
-           <property name="spacing">
-            <number>6</number>
-           </property>
            <property name="margin">
             <number>12</number>
            </property>