From 0dfff01b0002f23e16d607c910df13bac43f8433 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Sun, 8 Sep 2019 15:36:49 -0700 Subject: [PATCH 1/2] Fix dropdown indicator color --- src/QmlControls/QGCComboBox.qml | 12 ++++++++---- src/QmlControls/QGCOptionsComboBox.qml | 3 ++- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/QmlControls/QGCComboBox.qml b/src/QmlControls/QGCComboBox.qml index 4b4d8ae..0dee2f7 100644 --- a/src/QmlControls/QGCComboBox.qml +++ b/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 } } } diff --git a/src/QmlControls/QGCOptionsComboBox.qml b/src/QmlControls/QGCOptionsComboBox.qml index 6a5d679..732d311 100644 --- a/src/QmlControls/QGCOptionsComboBox.qml +++ b/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 From 72c9bf6c75e8b6b5de925c4121f630ac4595d9c7 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Sun, 8 Sep 2019 15:37:02 -0700 Subject: [PATCH 2/2] Use Options control --- src/PlanView/CorridorScanEditor.qml | 44 +++++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/src/PlanView/CorridorScanEditor.qml b/src/PlanView/CorridorScanEditor.qml index 6c833a2..bc82745 100644 --- a/src/PlanView/CorridorScanEditor.qml +++ b/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 - } - - QGCCheckBox { - id: relAlt - text: qsTr("Relative altitude") - 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 + Layout.fillWidth: true - Connections { - target: missionItem.cameraCalc - onDistanceToSurfaceRelativeChanged: relAlt.checked = missionItem.cameraCalc.distanceToSurfaceRelative + 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 + } + ] + + onItemClicked: { + if (index == 1) { + missionItem.cameraCalc.distanceToSurfaceRelative = !missionItem.cameraCalc.distanceToSurfaceRelative + console.log(missionItem.cameraCalc.distanceToSurfaceRelative) + } } } }