From e74c3390f76b54c298106804af52941322365a8d Mon Sep 17 00:00:00 2001
From: Andrew Thoms <openpilot@andrewspizza.net>
Date: Mon, 20 Jun 2011 00:31:30 -0400
Subject: [PATCH] OP-532 Minor UI layout changes

---
 ground/openpilotgcs/src/plugins/config/ccpm.ui         | 10 ++++++++--
 .../src/plugins/config/configccpmwidget.cpp            |  7 ++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/ground/openpilotgcs/src/plugins/config/ccpm.ui b/ground/openpilotgcs/src/plugins/config/ccpm.ui
index 8d0c3fb41..9c5c8b3e1 100644
--- a/ground/openpilotgcs/src/plugins/config/ccpm.ui
+++ b/ground/openpilotgcs/src/plugins/config/ccpm.ui
@@ -943,7 +943,7 @@
                 <item>
                  <widget class="QLabel" name="ccpmCollectiveChLabel">
                   <property name="enabled">
-                   <bool>false</bool>
+                   <bool>true</bool>
                   </property>
                   <property name="sizePolicy">
                    <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
@@ -965,12 +965,18 @@
                   </property>
                   <property name="font">
                    <font>
-                    <pointsize>12</pointsize>
+                    <pointsize>11</pointsize>
                    </font>
                   </property>
+                  <property name="layoutDirection">
+                   <enum>Qt::LeftToRight</enum>
+                  </property>
                   <property name="text">
                    <string>Collective Ch</string>
                   </property>
+                  <property name="alignment">
+                   <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                  </property>
                   <property name="wordWrap">
                    <bool>true</bool>
                   </property>
diff --git a/ground/openpilotgcs/src/plugins/config/configccpmwidget.cpp b/ground/openpilotgcs/src/plugins/config/configccpmwidget.cpp
index b02510c78..9e7833986 100644
--- a/ground/openpilotgcs/src/plugins/config/configccpmwidget.cpp
+++ b/ground/openpilotgcs/src/plugins/config/configccpmwidget.cpp
@@ -175,7 +175,10 @@ ConfigccpmWidget::ConfigccpmWidget(QWidget *parent) : ConfigTaskWidget(parent)
 
     QStringList channels;
     channels << "Channel1" << "Channel2" <<
-            "Channel3" << "Channel4" << "Channel5" << "Channel6" << "Channel7" << "Channel8" << "None" ;
+    "Channel3" << "Channel4" << "Channel5" << "Channel6" << "Channel7" << "Channel8"  ;
+    m_ccpm->ccpmCollectiveChannel->addItems(channels);
+    m_ccpm->ccpmCollectiveChannel->setCurrentIndex(8);
+    channels << "None" ;
     m_ccpm->ccpmEngineChannel->addItems(channels);
     m_ccpm->ccpmEngineChannel->setCurrentIndex(8);
     m_ccpm->ccpmTailChannel->addItems(channels);
@@ -188,8 +191,6 @@ ConfigccpmWidget::ConfigccpmWidget(QWidget *parent) : ConfigTaskWidget(parent)
     m_ccpm->ccpmServoYChannel->setCurrentIndex(8);
     m_ccpm->ccpmServoZChannel->addItems(channels);
     m_ccpm->ccpmServoZChannel->setCurrentIndex(8);
-    m_ccpm->ccpmCollectiveChannel->addItems(channels);
-    m_ccpm->ccpmCollectiveChannel->setCurrentIndex(8);
 
     QStringList Types;
     Types << "CCPM 2 Servo 90º" << "CCPM 3 Servo 120º" << "CCPM 3 Servo 140º" << "FP 2 Servo 90º"  << "Custom - User Angles" << "Custom - Advanced Settings"  ;