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

Rework for mobile usability

QGC4.4
Don Gagne 8 years ago
parent
8de7cfc2c2
commit
5f20c3aca1
3 changed files with 52 additions and 67 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. 2
      src/FactSystem/FactControls/FactTextField.qml
  2. 110
      src/QmlControls/ParameterEditorDialog.qml
  3. 7
      src/QmlControls/QGCTextField.qml

2
src/FactSystem/FactControls/FactTextField.qml
Unescape View File

@ -40,7 +40,7 @@ QGCTextField { @@ -40,7 +40,7 @@ QGCTextField {
}
}
onHelpClicked: qgcView.showDialog(helpDialogComponent, qsTr("Value Details"), qgcView.showDialogDefaultWidth, StandardButton.Save)
onHelpClicked: qgcView.showDialog(helpDialogComponent, qsTr("Value Details"), qgcView.showDialogDefaultWidth, StandardButton.Save | StandardButton.Cancel)
Component {

110
src/QmlControls/ParameterEditorDialog.qml
Unescape View File

@ -7,12 +7,9 @@ @@ -7,12 +7,9 @@
*
****************************************************************************/
/// @file
/// @author Don Gagne <don@thegagnes.com>
import QtQuick 2.5
import QtQuick.Controls 1.3
import QtQuick.Layouts 1.2
import QGroundControl.Controls 1.0
import QGroundControl.Palette 1.0
@ -29,7 +26,8 @@ QGCViewDialog { @@ -29,7 +26,8 @@ QGCViewDialog {
property bool validate: false
property string validateValue
property real _editFieldWidth: ScreenTools.defaultFontPixelWidth * 20
property real _editFieldWidth: ScreenTools.defaultFontPixelWidth * 20
property bool _longDescriptionAvailable: fact.longDescription != ""
ParameterEditorController { id: controller; factPanel: parent }
@ -68,7 +66,6 @@ QGCViewDialog { @@ -68,7 +66,6 @@ QGCViewDialog {
validationError.text = fact.validate(validateValue, false /* convertOnly */)
forceSave.visible = true
}
//valueField.forceActiveFocus()
}
QGCFlickable {
@ -83,28 +80,24 @@ QGCViewDialog { @@ -83,28 +80,24 @@ QGCViewDialog {
anchors.right: parent.right
QGCLabel {
id: validationError
width: parent.width
wrapMode: Text.WordWrap
visible: fact.shortDescription
text: fact.shortDescription
}
QGCLabel {
width: parent.width
wrapMode: Text.WordWrap
visible: fact.longDescription
text: fact.longDescription
color: qgcPal.warningText
}
Row {
spacing: defaultTextWidth
RowLayout {
spacing: defaultTextWidth
anchors.left: parent.left
anchors.right: parent.right
QGCTextField {
id: valueField
text: validate ? validateValue : fact.valueString
visible: fact.enumStrings.length == 0 || validate
//focus: true
id: valueField
text: validate ? validateValue : fact.valueString
visible: fact.enumStrings.length == 0 || validate
unitsLabel: fact.units
showUnits: fact.units != ""
Layout.fillWidth: true
inputMethodHints: ScreenTools.isiOS ?
Qt.ImhNone : // iOS numeric keyboard has not done button, we can't use it
Qt.ImhFormattedNumbersOnly // Forces use of virtual numeric keyboard
@ -113,7 +106,6 @@ QGCViewDialog { @@ -113,7 +106,6 @@ QGCViewDialog {
QGCButton {
anchors.baseline: valueField.baseline
visible: fact.defaultValueAvailable
width: _editFieldWidth
text: qsTr("Reset to default")
onClicked: {
@ -159,63 +151,55 @@ QGCViewDialog { @@ -159,63 +151,55 @@ QGCViewDialog {
}
QGCLabel {
text: fact.name
visible: fact.componentId > 0 // > 0 means it's a parameter fact
width: parent.width
wrapMode: Text.WordWrap
visible: !longDescriptionLabel.visible
text: fact.shortDescription
}
Column {
spacing: defaultTextHeight / 2
anchors.left: parent.left
anchors.right: parent.right
Row {
spacing: defaultTextWidth
QGCLabel { text: qsTr("Units:") }
QGCLabel { text: fact.units ? fact.units : qsTr("none") }
}
Row {
spacing: defaultTextWidth
visible: !fact.minIsDefaultForType
QGCLabel { text: qsTr("Minimum value:") }
QGCLabel { text: fact.minString }
}
QGCLabel {
id: longDescriptionLabel
width: parent.width
wrapMode: Text.WordWrap
visible: fact.longDescription != ""
text: fact.longDescription
}
Row {
spacing: defaultTextWidth
visible: !fact.maxIsDefaultForType
Row {
spacing: defaultTextWidth
QGCLabel { text: qsTr("Maximum value:") }
QGCLabel { text: fact.maxString }
QGCLabel {
id: minValueDisplay
text: qsTr("Min: ") + fact.minString
visible: !fact.minIsDefaultForType
}
Row {
spacing: defaultTextWidth
QGCLabel { text: qsTr("Default value:") }
QGCLabel { text: fact.defaultValueAvailable ? fact.defaultValueString : qsTr("none") }
QGCLabel {
text: qsTr("Max: ") + fact.maxString
visible: !fact.maxIsDefaultForType
}
QGCLabel {
visible: fact.rebootRequired
text: "Reboot required after change"
text: qsTr("Default: ") + fact.defaultValueString
visible: fact.defaultValueAvailable
}
} // Column
}
QGCLabel {
width: parent.width
wrapMode: Text.WordWrap
text: qsTr("Warning: Modifying values while vehicle is in flight can lead to vehicle instability and possible vehicle loss. ") +
qsTr("Make sure you know what you are doing and double-check your values before Save!")
text: qsTr("Parameter name: ") + fact.name
visible: fact.componentId > 0 // > 0 means it's a parameter fact
}
QGCLabel {
visible: fact.rebootRequired
text: "Reboot required after change"
}
QGCLabel {
id: validationError
width: parent.width
wrapMode: Text.WordWrap
color: qsTr("yellow")
text: qsTr("Warning: Modifying values while vehicle is in flight can lead to vehicle instability and possible vehicle loss. ") +
qsTr("Make sure you know what you are doing and double-check your values before Save!")
}
QGCCheckBox {

7
src/QmlControls/QGCTextField.qml
Unescape View File

@ -97,9 +97,10 @@ TextField { @@ -97,9 +97,10 @@ TextField {
}
MouseArea {
anchors.fill: unitsHelpLayout
enabled: control.activeFocus
onClicked: root.helpClicked()
anchors.margins: ScreenTools.isMobile ? -(ScreenTools.defaultFontPixelWidth * 0.66) : 0 // Larger touch area for mobile
anchors.fill: unitsHelpLayout
enabled: control.activeFocus
onClicked: root.helpClicked()
}
}

Write Preview
Loading…
Cancel
Save