Merge pull request #7795 from DonLakeFlyer/Options

Use Options control in Corridor scan

src/PlanView/CorridorScanEditor.qml

@@ -70,7 +70,9 @@ Rectangle {
             cameraCalc:                     missionItem.cameraCalc
             vehicleFlightIsFrontal:         true
             distanceToSurfaceLabel:         qsTr("Altitude")
-            distanceToSurfaceAltitudeMode:  missionItem.followTerrain ? QGroundControl.AltitudeModeAboveTerrain : QGroundControl.AltitudeModeRelative
+            distanceToSurfaceAltitudeMode:  missionItem.followTerrain ?
+                                                QGroundControl.AltitudeModeAboveTerrain :
+                                                missionItem.cameraCalc.distanceToSurfaceRelative
             frontalDistanceLabel:           qsTr("Trigger Dist")
             sideDistanceLabel:              qsTr("Spacing")
         }
@@ -100,26 +102,30 @@ Rectangle {
                 Layout.fillWidth:       true
             }
 
-            FactCheckBox {
-                text:               qsTr("Take images in turnarounds")
-                fact:               missionItem.cameraTriggerInTurnAround
-                enabled:            missionItem.hoverAndCaptureAllowed ? !missionItem.hoverAndCapture.rawValue : true
+            QGCOptionsComboBox {
                 Layout.columnSpan:  2
-            }
+                Layout.fillWidth:   true
 
-            QGCCheckBox {
-                id:                 relAlt
-                text:               qsTr("Relative altitude")
+                model: [
+                    {
+                        text:       qsTr("Images in turnarounds"),
+                        fact:       missionItem.cameraTriggerInTurnAround,
+                        enabled:    missionItem.hoverAndCaptureAllowed ? !missionItem.hoverAndCapture.rawValue : true,
+                        visible:    true
+                    },
+                    {
+                        text:       qsTr("Relative altitude"),
+                        enabled:    missionItem.cameraCalc.isManualCamera && !missionItem.followTerrain,
+                        visible:    QGroundControl.corePlugin.options.showMissionAbsoluteAltitude || (!missionItem.cameraCalc.distanceToSurfaceRelative && !missionItem.followTerrain),
                         checked:    missionItem.cameraCalc.distanceToSurfaceRelative
-                enabled:            missionItem.cameraCalc.isManualCamera && !missionItem.followTerrain
-                visible:            QGroundControl.corePlugin.options.showMissionAbsoluteAltitude || (!missionItem.cameraCalc.distanceToSurfaceRelative && !missionItem.followTerrain)
-                Layout.alignment:   Qt.AlignLeft
-                Layout.columnSpan:  2
-                onClicked:          missionItem.cameraCalc.distanceToSurfaceRelative = checked
+                    }
+                ]
 
-                Connections {
-                    target: missionItem.cameraCalc
-                    onDistanceToSurfaceRelativeChanged: relAlt.checked = missionItem.cameraCalc.distanceToSurfaceRelative
+                onItemClicked: {
+                    if (index == 1) {
+                        missionItem.cameraCalc.distanceToSurfaceRelative = !missionItem.cameraCalc.distanceToSurfaceRelative
+                        console.log(missionItem.cameraCalc.distanceToSurfaceRelative)
+                    }
                 }
             }
         }

src/QmlControls/QGCComboBox.qml

@@ -23,10 +23,14 @@ ComboBox {
 
     property bool centeredLabel:  false
 
+    property var _qgcPal: QGCPalette { colorGroupEnabled: enabled }
+
+    Component.onCompleted: indicator.color = Qt.binding(function() { return _qgcPal.text })
+
     background: Rectangle {
         implicitWidth:                  ScreenTools.implicitComboBoxWidth
         implicitHeight:                 ScreenTools.implicitComboBoxHeight
-        color:                          qgcPal.window
+        color:                          _qgcPal.window
         border.width:                   enabled ? 1 : 0
         border.color:                   "#999"
     }
@@ -38,12 +42,12 @@ ComboBox {
 
             contentItem: Text {
                 text:                   control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole] : model[control.textRole]) : modelData
-                color:                  control.currentIndex === index ? qgcPal.buttonHighlightText : qgcPal.buttonText
+                color:                  control.currentIndex === index ? _qgcPal.buttonHighlightText : _qgcPal.buttonText
                 verticalAlignment:      Text.AlignVCenter
             }
 
             background: Rectangle {
-                color:                  control.currentIndex === index ? qgcPal.buttonHighlight : qgcPal.button
+                color:                  control.currentIndex === index ? _qgcPal.buttonHighlight : _qgcPal.button
             }
 
             highlighted:                control.highlightedIndex === index
@@ -59,7 +63,7 @@ ComboBox {
             anchors.verticalCenter:     parent.verticalCenter
             anchors.horizontalCenter:   centeredLabel ? parent.horizontalCenter : undefined
             text:                       control.currentText
-            color:                      qgcPal.text
+            color:                      _qgcPal.text
         }
     }
 }

src/QmlControls/QGCOptionsComboBox.qml

@@ -30,6 +30,8 @@ ComboBox {
     property string _flashText
     property bool   _showFlash:     false
 
+    Component.onCompleted: indicator.color = Qt.binding(function() { return _controlQGCPal.text })
+
     background: Rectangle {
         implicitWidth:                  ScreenTools.implicitComboBoxWidth
         implicitHeight:                 ScreenTools.implicitComboBoxHeight
@@ -58,7 +60,6 @@ ComboBox {
                                          (modelData.fact.typeIsBool ? (modelData.fact.value === false ? Qt.Unchecked : Qt.Checked) : (modelData.fact.value === 0 ? Qt.Unchecked : Qt.Checked)) :
                                          modelData.checked }
 
-
         contentItem: RowLayout {
             spacing: ScreenTools.defaultFontPixelWidth