Skip to content

Q
qgroundcontrol
Commit 1a2ce057 authored by Don Gagne's avatar Don Gagne Committed by GitHub
Browse files
Options

Merge pull request #4527 from DonLakeFlyer/SimpleMission 

Plan-Simple Item: Use all remaining width for text fields
parents 21ebc83a 61226f2d
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 47 deletions
src/MissionEditor/SimpleItemEditor.qml
View file @ 1a2ce057
...@@ -2,6 +2,7 @@ import QtQuick 2.5 ...@@ -2,6 +2,7 @@ import QtQuick 2.5
import QtQuick.Controls 1.2 import QtQuick.Controls 1.2
import QtQuick.Controls.Styles 1.2 import QtQuick.Controls.Styles 1.2
import QtQuick.Dialogs 1.2 import QtQuick.Dialogs 1.2
import QtQuick.Layouts 1.2
import QGroundControl.ScreenTools 1.0 import QGroundControl.ScreenTools 1.0
import QGroundControl.Vehicle 1.0 import QGroundControl.Vehicle 1.0
...@@ -42,65 +43,65 @@ Rectangle { ...@@ -42,65 +43,65 @@ Rectangle {
width: parent.width width: parent.width
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
font.pointSize: ScreenTools.smallFontPointSize font.pointSize: ScreenTools.smallFontPointSize
text: missionItem.sequenceNumber == 0 ? text: missionItem.rawEdit ?
qsTr("Planned home position. Actual home position set by Vehicle.") : qsTr("Provides advanced access to all commands/parameters. Be very careful!") :
(missionItem.rawEdit ? missionItem.commandDescription
qsTr("Provides advanced access to all commands/parameters. Be very careful!") :
missionItem.commandDescription)
} }
Repeater { GridLayout {
model: missionItem.comboboxFacts anchors.left: parent.left
anchors.right: parent.right
columns: 2
Item { Repeater {
width: valuesColumn.width model: missionItem.comboboxFacts
height: comboBoxFact.height
QGCLabel { QGCLabel {
id: comboBoxLabel text: object.name
anchors.baseline: comboBoxFact.baseline visible: object.name != ""
text: object.name Layout.column: 0
visible: object.name != "" Layout.row: index
} }
}
Repeater {
model: missionItem.comboboxFacts
FactComboBox { FactComboBox {
id: comboBoxFact indexModel: false
anchors.right: parent.right model: object.enumStrings
width: comboBoxLabel.visible ? _editFieldWidth : parent.width fact: object
indexModel: false Layout.column: 1
model: object.enumStrings Layout.row: index
fact: object Layout.fillWidth: true
} }
} }
} }
Repeater { GridLayout {
model: missionItem.textFieldFacts anchors.left: parent.left
anchors.right: parent.right
columns: 2
Item { Repeater {
width: valuesColumn.width model: missionItem.textFieldFacts
height: textField.height
QGCLabel { QGCLabel {
id: textFieldLabel text: object.name
anchors.baseline: textField.baseline Layout.column: 0
text: object.name Layout.row: index
} }
}
FactTextField { Repeater {
id: textField model: missionItem.textFieldFacts
anchors.right: parent.right
width: _editFieldWidth
showUnits: true
fact: object
visible: !_root.readOnly
}
FactLabel { FactTextField {
anchors.baseline: textFieldLabel.baseline showUnits: true
anchors.right: parent.right
fact: object fact: object
visible: _root.readOnly Layout.column: 1
Layout.row: index
Layout.fillWidth: true
} }
} }
} }
...@@ -113,13 +114,6 @@ Rectangle { ...@@ -113,13 +114,6 @@ Rectangle {
fact: object fact: object
} }
} }
QGCButton {
text: qsTr("Move Home to map center")
visible: missionItem.homePosition
onClicked: editorRoot.moveHomeToMapCenter()
anchors.horizontalCenter: parent.horizontalCenter
}
} // Column } // Column
} // Item } // Item
} // Component } // 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