Skip to content

Q
qgroundcontrol
Commit 1c252066 authored by DonLakeFlyer's avatar DonLakeFlyer
Browse files
Options

Better visuals for mobile and connected vehicle

parent 1d444d01
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 42 deletions
src/MissionEditor/MissionSettingsEditor.qml
View file @ 1c252066
......@@ -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 {
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 {
}
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 {
......@@ -124,17 +133,6 @@ Rectangle {
Layout.preferredWidth: _fieldWidth
}
QGCLabel {
text: _firmwareLabel
visible: !_showOfflineEditingCombos
Layout.fillWidth: true
}
QGCLabel {
text: _missionVehicle.firmwareTypeString
visible: !_showOfflineEditingCombos
Layout.preferredWidth: _fieldWidth
}
QGCLabel {
text: _vehicleLabel
visible: _showOfflineEditingCombos
......@@ -148,17 +146,6 @@ Rectangle {
Layout.preferredWidth: _fieldWidth
}
QGCLabel {
text: _vehicleLabel
visible: !_showOfflineEditingCombos
Layout.fillWidth: true
}
QGCLabel {
text: _missionVehicle.vehicleTypeString
visible: !_showOfflineEditingCombos
Layout.preferredWidth: _fieldWidth
}
QGCLabel {
text: qsTr("Cruise speed:")
visible: _showCruiseSpeed
......@@ -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
......
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