From 669634782f77075ebfa2173fa766620b231672a4 Mon Sep 17 00:00:00 2001
From: James Cotton <peabody124@gmail.com>
Date: Thu, 11 Aug 2011 10:45:40 -0500
Subject: [PATCH] UI: Two aesthetic issues on cc_hw_settings.ui: 1) Don't
 override fonts when possible.  It makes the layout inconsistent.  We should
 come up with a stylesheet/system wide way for things like this. 2) Left align
 the telemetry speed field instead of making it full screen width 3) Move the
 "Settings apply after restart" message out of the button row.  This makes the
 buttons not in the same location between panels.

---
 .../src/plugins/config/cc_hw_settings.ui      | 58 +++++++++++--------
 1 file changed, 33 insertions(+), 25 deletions(-)

diff --git a/ground/openpilotgcs/src/plugins/config/cc_hw_settings.ui b/ground/openpilotgcs/src/plugins/config/cc_hw_settings.ui
index 29052623c..67a22d116 100644
--- a/ground/openpilotgcs/src/plugins/config/cc_hw_settings.ui
+++ b/ground/openpilotgcs/src/plugins/config/cc_hw_settings.ui
@@ -31,7 +31,7 @@
            <string/>
           </property>
           <property name="pixmap">
-           <pixmap>:/configgadget/images/coptercontrol.svg</pixmap>
+           <pixmap resource="configgadget.qrc">:/configgadget/images/coptercontrol.svg</pixmap>
           </property>
           <property name="scaledContents">
            <bool>true</bool>
@@ -103,13 +103,6 @@
        <layout class="QHBoxLayout" name="horizontalLayout">
         <item>
          <widget class="QLabel" name="label">
-          <property name="font">
-           <font>
-            <pointsize>11</pointsize>
-            <weight>75</weight>
-            <bold>true</bold>
-           </font>
-          </property>
           <property name="text">
            <string>Telemetry speed:</string>
           </property>
@@ -122,6 +115,19 @@
           </property>
          </widget>
         </item>
+        <item>
+         <spacer name="horizontalSpacer_3">
+          <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>
       </item>
       <item>
@@ -156,24 +162,24 @@
         </property>
        </spacer>
       </item>
+      <item>
+       <widget class="QLabel" name="label_6">
+        <property name="font">
+         <font>
+          <weight>75</weight>
+          <bold>true</bold>
+         </font>
+        </property>
+        <property name="text">
+         <string>Changes on this page only take effect after board reset or power cycle</string>
+        </property>
+        <property name="wordWrap">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
       <item>
        <layout class="QHBoxLayout" name="horizontalLayout_2">
-        <item>
-         <widget class="QLabel" name="label_6">
-          <property name="font">
-           <font>
-            <weight>75</weight>
-            <bold>true</bold>
-           </font>
-          </property>
-          <property name="text">
-           <string>Changes on this page only take effect after board reset or power cycle</string>
-          </property>
-          <property name="wordWrap">
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
         <item>
          <spacer name="horizontalSpacer">
           <property name="orientation">
@@ -231,6 +237,8 @@ Beware of not locking yourself out!</string>
    </item>
   </layout>
  </widget>
- <resources/>
+ <resources>
+  <include location="configgadget.qrc"/>
+ </resources>
  <connections/>
 </ui>