Unverified Commit 07e72c2b authored by Don Gagne's avatar Don Gagne Committed by GitHub

Merge pull request #7506 from DonLakeFlyer/MultipleFirmware

Switch to clearer property usage
parents 28cbba56 a0dede6d
...@@ -25,7 +25,6 @@ Rectangle { ...@@ -25,7 +25,6 @@ Rectangle {
property var _missionVehicle: _masterControler.controllerVehicle property var _missionVehicle: _masterControler.controllerVehicle
property bool _vehicleHasHomePosition: _missionVehicle.homePosition.isValid property bool _vehicleHasHomePosition: _missionVehicle.homePosition.isValid
property bool _offlineEditing: _missionVehicle.isOfflineEditingVehicle property bool _offlineEditing: _missionVehicle.isOfflineEditingVehicle
property bool _showOfflineVehicleCombos: _multipleFirmware
property bool _enableOfflineVehicleCombos: _offlineEditing && _noMissionItemsAdded property bool _enableOfflineVehicleCombos: _offlineEditing && _noMissionItemsAdded
property bool _showCruiseSpeed: !_missionVehicle.multiRotor property bool _showCruiseSpeed: !_missionVehicle.multiRotor
property bool _showHoverSpeed: _missionVehicle.multiRotor || _missionVehicle.vtol property bool _showHoverSpeed: _missionVehicle.multiRotor || _missionVehicle.vtol
...@@ -146,13 +145,13 @@ Rectangle { ...@@ -146,13 +145,13 @@ Rectangle {
QGCLabel { QGCLabel {
text: _firmwareLabel text: _firmwareLabel
Layout.fillWidth: true Layout.fillWidth: true
visible: _showOfflineVehicleCombos visible: _multipleFirmware
} }
FactComboBox { FactComboBox {
fact: QGroundControl.settingsManager.appSettings.offlineEditingFirmwareType fact: QGroundControl.settingsManager.appSettings.offlineEditingFirmwareType
indexModel: false indexModel: false
Layout.preferredWidth: _fieldWidth Layout.preferredWidth: _fieldWidth
visible: _showOfflineVehicleCombos visible: _multipleFirmware
enabled: _enableOfflineVehicleCombos enabled: _enableOfflineVehicleCombos
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment