zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge pull request #4757 from DonLakeFlyer/MissionSettings 

Mission Settings: Better visuals for mobile and connected vehicle
QGC4.4
Don Gagne 8 years ago committed by GitHub
parent
299a36aa4a 1c252066e3
commit
3da11f8b0d
1 changed files with 14 additions and 42 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 56
      src/MissionEditor/MissionSettingsEditor.qml

56
src/MissionEditor/MissionSettingsEditor.qml
Unescape View File

@ -40,6 +40,7 @@ Rectangle { @@ -40,6 +40,7 @@ Rectangle {
property bool _showHoverSpeed: _missionVehicle.multiRotor || missionController.vehicle.vtol
property bool _multipleFirmware: QGroundControl.supportedFirmwareCount > 2
property real _fieldWidth: ScreenTools.defaultFontPixelWidth * 16
property bool _mobile: ScreenTools.isMobile
readonly property string _firmwareLabel: qsTr("Firmware:")
readonly property string _vehicleLabel: qsTr("Vehicle:")
@ -68,6 +69,8 @@ Rectangle { @@ -68,6 +69,8 @@ Rectangle {
anchors.left: parent.left
anchors.right: parent.right
spacing: _margin
visible: _mobile ? index == 2 : true // Cheating here since we known we only have Lat/Lon/Alt
QGCLabel { text: object.name; Layout.fillWidth: true }
FactTextField {
Layout.preferredWidth: _fieldWidth
@ -84,11 +87,17 @@ Rectangle { @@ -84,11 +87,17 @@ Rectangle {
}
QGCLabel {
width: parent.width
wrapMode: Text.WordWrap
font.pointSize: ScreenTools.smallFontPointSize
text: qsTr("Actual position set by vehicle at flight time.")
horizontalAlignment: Text.AlignHCenter
width: parent.width
wrapMode: Text.WordWrap
font.pointSize: ScreenTools.smallFontPointSize
text: qsTr("Actual position set by vehicle at flight time.")
horizontalAlignment: Text.AlignHCenter
}
QGCButton {
text: qsTr("Set Home To Map Center")
onClicked: editorRoot.moveHomeToMapCenter()
anchors.horizontalCenter: parent.horizontalCenter
}
QGCLabel {
@ -125,17 +134,6 @@ Rectangle { @@ -125,17 +134,6 @@ Rectangle {
}
QGCLabel {
text: _firmwareLabel
visible: !_showOfflineEditingCombos
Layout.fillWidth: true
}
QGCLabel {
text: _missionVehicle.firmwareTypeString
visible: !_showOfflineEditingCombos
Layout.preferredWidth: _fieldWidth
}
QGCLabel {
text: _vehicleLabel
visible: _showOfflineEditingCombos
Layout.fillWidth: true
@ -149,17 +147,6 @@ Rectangle { @@ -149,17 +147,6 @@ Rectangle {
}
QGCLabel {
text: _vehicleLabel
visible: !_showOfflineEditingCombos
Layout.fillWidth: true
}
QGCLabel {
text: _missionVehicle.vehicleTypeString
visible: !_showOfflineEditingCombos
Layout.preferredWidth: _fieldWidth
}
QGCLabel {
text: qsTr("Cruise speed:")
visible: _showCruiseSpeed
Layout.fillWidth: true
@ -201,21 +188,6 @@ Rectangle { @@ -201,21 +188,6 @@ Rectangle {
text: qsTr("Speeds are only used for time calculations. Actual vehicle speed will not be affected.")
horizontalAlignment: Text.AlignHCenter
}
Rectangle {
anchors.left: parent.left
anchors.right: parent.right
height: 1
color: qgcPal.text
}
QGCButton {
width: parent.width * 0.9
text: qsTr("Set Home To Map Center")
onClicked: editorRoot.moveHomeToMapCenter()
anchors.horizontalCenter: parent.horizontalCenter
}
} // Column
} // Item
} // Component

Write Preview
Loading…
Cancel
Save