Merge pull request #4540 from DonLakeFlyer/ParameterEditorDialogMobile

Parameter editor dialog mobile

ios/iOS-Info.plist

@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>NSCameraUsageDescription</key>
+	<string>QGC uses UVC devices for video streaming.</string>
 	<key>CFBundleDisplayName</key>
 	<string>QGroundControl</string>
 	<key>CFBundleExecutable</key>

src/FactSystem/FactControls/FactTextField.qml

@@ -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 {

src/QmlControls/ParameterEditorDialog.qml

@@ -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
@@ -30,6 +27,7 @@ QGCViewDialog {
     property string validateValue
 
     property real   _editFieldWidth:            ScreenTools.defaultFontPixelWidth * 20
+    property bool   _longDescriptionAvailable:  fact.longDescription != ""
 
     ParameterEditorController { id: controller; factPanel: parent }
 
@@ -68,7 +66,6 @@ QGCViewDialog {
             validationError.text = fact.validate(validateValue, false /* convertOnly */)
             forceSave.visible = true
         }
-        //valueField.forceActiveFocus()
     }
 
     QGCFlickable {
@@ -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 {
+            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
-
+                    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 {
                 QGCButton {
                     anchors.baseline:   valueField.baseline
                     visible:            fact.defaultValueAvailable
-                    width:              _editFieldWidth
                     text:               qsTr("Reset to default")
 
                     onClicked: {
@@ -159,50 +151,49 @@ 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") }
+            QGCLabel {
+                id:         longDescriptionLabel
+                width:      parent.width
+                wrapMode:   Text.WordWrap
+                visible:    fact.longDescription != ""
+                text:       fact.longDescription
             }
 
             Row {
                 spacing: defaultTextWidth
-                    visible: !fact.minIsDefaultForType
 
-                    QGCLabel { text: qsTr("Minimum value:") }
-                    QGCLabel { text: fact.minString }
+                QGCLabel {
+                    id:         minValueDisplay
+                    text:       qsTr("Min: ") + fact.minString
+                    visible:    !fact.minIsDefaultForType
                 }
 
-                Row {
-                    spacing: defaultTextWidth
+                QGCLabel {
+                    text:       qsTr("Max: ") + fact.maxString
                     visible:    !fact.maxIsDefaultForType
-
-                    QGCLabel { text: qsTr("Maximum value:") }
-                    QGCLabel { text: fact.maxString }
                 }
 
-                Row {
-                    spacing: defaultTextWidth
+                QGCLabel {
+                    text:       qsTr("Default: ") + fact.defaultValueString
+                    visible:    fact.defaultValueAvailable
+                }
+            }
 
-                    QGCLabel { text: qsTr("Default value:") }
-                    QGCLabel { text: fact.defaultValueAvailable ? fact.defaultValueString : qsTr("none") }
+            QGCLabel {
+                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"
             }
-            } // Column
 
             QGCLabel {
                 width:      parent.width
@@ -211,13 +202,6 @@ QGCViewDialog {
                             qsTr("Make sure you know what you are doing and double-check your values before Save!")
             }
 
-            QGCLabel {
-                id:         validationError
-                width:      parent.width
-                wrapMode:   Text.WordWrap
-                color:      qsTr("yellow")
-            }
-
             QGCCheckBox {
                 id:         forceSave
                 visible:    false

src/QmlControls/QGCFlickable.qml

@@ -6,6 +6,7 @@ import QGroundControl.Palette 1.0
 Flickable {
     id:             root
     boundsBehavior: Flickable.StopAtBounds
+    clip:           true
 
     property color indicatorColor: qgcPal.text
 

src/QmlControls/QGCTextField.qml

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