From fc8c216a3ed31aec2de122e56de929e208529688 Mon Sep 17 00:00:00 2001
From: Don Gagne <don@thegagnes.com>
Date: Sat, 23 Aug 2014 10:48:23 -0700
Subject: [PATCH] Added new RCChannelWidget

---
 qgroundcontrol.pro | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro
index f9bffbd29..cd7c6c790 100644
--- a/qgroundcontrol.pro
+++ b/qgroundcontrol.pro
@@ -274,6 +274,9 @@ FORMS += \
     src/ui/designer/QGCParamSlider.ui \
     src/ui/designer/QGCActionButton.ui \
     src/ui/designer/QGCCommandButton.ui \
+    src/ui/designer/QGCComboBox.ui \
+    src/ui/designer/QGCTextLabel.ui \
+    src/ui/designer/QGCXYPlot.ui \
     src/ui/QGCMAVLinkLogPlayer.ui \
     src/ui/QGCWaypointListMulti.ui \
     src/ui/QGCUASFileViewMulti.ui \
@@ -309,8 +312,6 @@ FORMS += \
     src/ui/QGCHilFlightGearConfiguration.ui \
     src/ui/QGCHilJSBSimConfiguration.ui \
     src/ui/QGCHilXPlaneConfiguration.ui \
-    src/ui/designer/QGCComboBox.ui \
-    src/ui/designer/QGCTextLabel.ui \
     src/ui/uas/UASQuickView.ui \
     src/ui/uas/UASQuickViewItemSelect.ui \
     src/ui/uas/UASActionsWidget.ui \
@@ -355,7 +356,6 @@ FORMS += \
     src/ui/px4_configuration/QGCPX4MulticopterConfig.ui \
     src/ui/px4_configuration/QGCPX4SensorCalibration.ui \
     src/ui/px4_configuration/PX4RCCalibration.ui \
-    src/ui/designer/QGCXYPlot.ui \
     src/ui/QGCUASFileView.ui
 
 HEADERS += \
@@ -435,6 +435,11 @@ HEADERS += \
     src/ui/designer/QGCParamSlider.h \
     src/ui/designer/QGCCommandButton.h \
     src/ui/designer/QGCToolWidgetItem.h \
+    src/ui/designer/QGCComboBox.h \
+    src/ui/designer/QGCTextLabel.h \
+    src/ui/designer/QGCRadioChannelDisplay.h \
+    src/ui/designer/QGCXYPlot.h \
+    src/ui/designer/RCChannelWidget.h \
     src/ui/QGCMAVLinkLogPlayer.h \
     src/comm/MAVLinkSimulationWaypointPlanner.h \
     src/comm/MAVLinkSimulationMAV.h \
@@ -483,8 +488,6 @@ HEADERS += \
     src/ui/QGCHilFlightGearConfiguration.h \
     src/ui/QGCHilJSBSimConfiguration.h \
     src/ui/QGCHilXPlaneConfiguration.h \
-    src/ui/designer/QGCComboBox.h \
-    src/ui/designer/QGCTextLabel.h \
     src/ui/submainwindow.h \
     src/ui/uas/UASQuickView.h \
     src/ui/uas/UASQuickViewItem.h \
@@ -493,7 +496,6 @@ HEADERS += \
     src/ui/uas/UASQuickViewTextItem.h \
     src/ui/uas/UASQuickViewGaugeItem.h \
     src/ui/uas/UASActionsWidget.h \
-    src/ui/designer/QGCRadioChannelDisplay.h \
     src/ui/QGCTabbedInfoView.h \
     src/ui/UASRawStatusView.h \
     src/ui/PrimaryFlightDisplay.h \
@@ -544,7 +546,6 @@ HEADERS += \
     src/ui/px4_configuration/QGCPX4MulticopterConfig.h \
     src/ui/px4_configuration/QGCPX4SensorCalibration.h \
     src/ui/px4_configuration/PX4RCCalibration.h \
-    src/ui/designer/QGCXYPlot.h \
     src/ui/menuactionhelper.h \
     src/uas/UASManagerInterface.h \
     src/uas/QGCUASParamManagerInterface.h \
@@ -625,6 +626,11 @@ SOURCES += \
     src/ui/designer/QGCParamSlider.cc \
     src/ui/designer/QGCCommandButton.cc \
     src/ui/designer/QGCToolWidgetItem.cc \
+    src/ui/designer/QGCComboBox.cc \
+    src/ui/designer/QGCTextLabel.cc \
+    src/ui/designer/QGCRadioChannelDisplay.cpp \
+    src/ui/designer/QGCXYPlot.cc \
+    src/ui/designer/RCChannelWidget.cc \
     src/ui/QGCMAVLinkLogPlayer.cc \
     src/comm/MAVLinkSimulationWaypointPlanner.cc \
     src/comm/MAVLinkSimulationMAV.cc \
@@ -671,8 +677,6 @@ SOURCES += \
     src/ui/QGCHilFlightGearConfiguration.cc \
     src/ui/QGCHilJSBSimConfiguration.cc \
     src/ui/QGCHilXPlaneConfiguration.cc \
-    src/ui/designer/QGCComboBox.cc \
-    src/ui/designer/QGCTextLabel.cc \
     src/ui/submainwindow.cpp \
     src/ui/uas/UASQuickViewItem.cc \
     src/ui/uas/UASQuickView.cc \
@@ -681,7 +685,6 @@ SOURCES += \
     src/ui/uas/UASQuickViewGaugeItem.cc \
     src/ui/uas/UASQuickViewItemSelect.cc \
     src/ui/uas/UASActionsWidget.cpp \
-    src/ui/designer/QGCRadioChannelDisplay.cpp \
     src/ui/QGCTabbedInfoView.cpp \
     src/ui/UASRawStatusView.cpp \
     src/ui/PrimaryFlightDisplay.cc \
@@ -732,7 +735,6 @@ SOURCES += \
     src/ui/px4_configuration/QGCPX4MulticopterConfig.cc \
     src/ui/px4_configuration/QGCPX4SensorCalibration.cc \
     src/ui/px4_configuration/PX4RCCalibration.cc \
-    src/ui/designer/QGCXYPlot.cc \
     src/ui/menuactionhelper.cpp \
     src/uas/QGCUASFileManager.cc \
     src/ui/QGCUASFileView.cc \
-- 
2.22.0