Merge pull request #1268 from DonLakeFlyer/QGCComboBox

QGCComboBox initial implementation

qgroundcontrol.qrc

@@ -253,6 +253,8 @@
         <file alias="QGroundControl/Controls/QGCCheckBox.qml">src/QmlControls/QGCCheckBox.qml</file>
         <file alias="QGroundControl/Controls/QGCLabel.qml">src/QmlControls/QGCLabel.qml</file>
         <file alias="QGroundControl/Controls/QGCTextField.qml">src/QmlControls/QGCTextField.qml</file>
+        <file alias="QGroundControl/Controls/QGCComboBox.qml">src/QmlControls/QGCComboBox.qml</file>
+
         <file alias="QGroundControl/Controls/arrow-down.png">src/QmlControls/arrow-down.png</file>
 
         <file alias="octo_x.png">files/images/px4/airframes/octo_x.png</file>

src/QmlControls/QGCComboBox.qml

+import QtQuick 2.2
+import QtQuick.Controls 1.2
+import QtQuick.Controls.Styles 1.2
+
+import QGroundControl.Palette 1.0
+
+ComboBox {
+    property var __palette: QGCPalette { colorGroupEnabled: enabled }
+
+}

src/QmlControls/QmlTest.qml

@@ -498,6 +498,23 @@ Rectangle {
                     enabled: false
                 }
 
+                // QGCComboBox
+                Loader {
+                    sourceComponent: ctlRowHeader
+                    property var text: "QGCComboBox"
+                }
+                QGCComboBox {
+                    width: 100
+                    height: 20
+                    model: [ "Item 1", "Item 2", "Item 3" ]
+                }
+                QGCComboBox {
+                    width: 100
+                    height: 20
+                    model: [ "Item 1", "Item 2", "Item 3" ]
+                    enabled: false
+                }
+
                 // SubMenuButton
                 Loader {
                     sourceComponent: ctlRowHeader

src/QmlControls/qmldir

@@ -5,3 +5,4 @@ QGCButton 1.0 QGCButton.qml
 QGCRadioButton 1.0 QGCRadioButton.qml
 QGCCheckBox 1.0 QGCCheckBox.qml
 QGCTextField 1.0 QGCTextField.qml
+QGCComboBox 1.0 QGCComboBox.qml