Skip to content

Q
qgroundcontrol
Commit 9461f5a3 authored by Don Gagne's avatar Don Gagne Committed by GitHub
Browse files
Options

Merge pull request #4802 from DonLakeFlyer/VehicleInfo 

Plan: Mission Settings - Vehicle info
parents cab21065 3f3db43a
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 3 deletions
src/MissionEditor/MissionSettingsEditor.qml
View file @ 9461f5a3
......@@ -41,7 +41,7 @@ Rectangle {
property var _missionVehicle: missionController.vehicle
property bool _offlineEditing: _missionVehicle.isOfflineEditingVehicle
property bool _showOfflineEditingCombos: _offlineEditing && _noMissionItemsAdded
property bool _showOfflineVehicleCombos: _offlineEditing && _multipleFirmware && _noMissionItemsAdded
property bool _showCruiseSpeed: !_missionVehicle.multiRotor
property bool _showHoverSpeed: _missionVehicle.multiRotor || _missionVehicle.vtol
property bool _multipleFirmware: QGroundControl.supportedFirmwareCount > 2
......@@ -123,7 +123,7 @@ Rectangle {
SectionHeader {
id: vehicleInfoSectionHeader
text: qsTr("Vehicle Info")
visible: _multipleFirmware && _showOfflineEditingCombos
visible: _offlineEditing
checked: false
exclusiveGroup: sectionHeaderGroup
}
......@@ -139,21 +139,25 @@ Rectangle {
QGCLabel {
text: _firmwareLabel
Layout.fillWidth: true
visible: _showOfflineVehicleCombos
}
FactComboBox {
fact: QGroundControl.settingsManager.appSettings.offlineEditingFirmwareType
indexModel: false
Layout.preferredWidth: _fieldWidth
visible: _showOfflineVehicleCombos
}
QGCLabel {
text: _vehicleLabel
Layout.fillWidth: true
visible: _showOfflineVehicleCombos
}
FactComboBox {
fact: QGroundControl.settingsManager.appSettings.offlineEditingVehicleType
indexModel: false
Layout.preferredWidth: _fieldWidth
visible: _showOfflineVehicleCombos
}
QGCLabel {
......
src/ui/preferences/GeneralSettings.qml
View file @ 9461f5a3
......@@ -338,7 +338,9 @@ QGCView {
//-----------------------------------------------------------------
//-- Mission AutoLoad
Row {
spacing: ScreenTools.defaultFontPixelWidth
spacing: ScreenTools.defaultFontPixelWidth
visible: _autoLoadDir.visible
QGCCheckBox {
id: autoLoadCheckbox
anchors.verticalCenter: parent.verticalCenter
......
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