Esc/Enter key support in QGCView dialogs

Total hack but it seems to work

src/FactSystem/FactControls/FactPanel.qml

@@ -31,14 +31,14 @@ import QGroundControl.FactSystem 1.0
 import QGroundControl.Controls 1.0
 import QGroundControl.Palette 1.0
 
-Rectangle {
-    color: qgcPal.window
-
-    QGCPalette { id: qgcPal; colorGroupEnabled: enabled }
+FocusScope {
+    property alias color: rectangle.color
 
     property string __missingParams:    ""
     property string __errorMsg:         ""
 
+    QGCPalette { id: qgcPal; colorGroupEnabled: enabled }
+
     function showMissingParameterOverlay(missingParamName) {
         if (__missingParams.length != 0) {
             __missingParams = __missingParams.concat(", ")
@@ -52,6 +52,10 @@ Rectangle {
         __missingParamsOverlay.visible = true
     }
 
+    Rectangle {
+        id:     rectangle
+        color: qgcPal.window
+
         Rectangle {
             id:             __missingParamsOverlay
             anchors.fill:   parent
@@ -66,4 +70,5 @@ Rectangle {
                 text:           __errorMsg.length ? __errorMsg : "Parameters(s) missing: " + __missingParams
             }
         }
+    }
 }

src/QmlControls/ParameterEditorDialog.qml

@@ -58,8 +58,7 @@ QGCViewDialog {
             validationError.text = fact.validate(validateValue, false /* convertOnly */)
             forceSave.visible = true
         }
-        // This was causing problems where it would never give up focus even when hidden!
-        //valueField.forceActiveFocus()
+        valueField.forceActiveFocus()
     }
 
     Column {
@@ -87,14 +86,6 @@ QGCViewDialog {
 
             // At this point all Facts are numeric
             inputMethodHints:   Qt.ImhFormattedNumbersOnly
-
-            onAccepted: accept()
-
-            Keys.onReleased: {
-                if (event.key == Qt.Key_Escape) {
-                    reject()
-                }
-            }
         }
 
         QGCLabel { text: fact.name }

src/QmlControls/QGCTextField.qml

@@ -6,9 +6,17 @@ import QGroundControl.Palette 1.0
 import QGroundControl.ScreenTools 1.0
 
 TextField {
+    id: root
+
     property bool showUnits: false
     property string unitsLabel: ""
 
+    Component.onCompleted: {
+        if (typeof qgcTextFieldforwardKeysTo !== 'undefined') {
+            root.Keys.forwardTo = [qgcTextFieldforwardKeysTo]
+        }
+    }
+
     property var __qgcPal: QGCPalette { colorGroupEnabled: enabled }
 
     textColor: __qgcPal.textFieldText

src/QmlControls/QGCView.qml

@@ -146,6 +146,8 @@ FactPanel {
         viewPanel.enabled = false
         __dialogOverlay.visible = true
 
+        __dialogComponentLoader.item.forceActiveFocus()
+
         __animateShowDialog.start()
     }
 
@@ -166,10 +168,13 @@ FactPanel {
         viewPanel.enabled = false
         __dialogOverlay.visible = true
 
+        __dialogComponentLoader.item.forceActiveFocus()
+
         __animateShowDialog.start()
     }
 
     function hideDialog() {
+        __dialogComponentLoader.item.focus = false
         viewPanel.enabled = true
         __animateHideDialog.start()
     }
@@ -336,6 +341,9 @@ FactPanel {
                 anchors.top:        __spacer.bottom
                 anchors.bottom:     parent.bottom
                 sourceComponent:    __dialogComponent
+
+                property bool acceptAllowed: __acceptButton.visible
+                property bool rejectAllowed: __rejectButton.visible
             }
         } // Rectangle - Dialog panel
     } // Item - Dialog overlay

src/QmlControls/QGCViewDialog.qml

@@ -34,19 +34,35 @@ import QGroundControl.FactSystem 1.0
 import QGroundControl.FactControls 1.0
 
 FactPanel {
+    property var qgcTextFieldforwardKeysTo: this    ///< Causes all QGCTextFields to forward keys here if they have focus
+
     QGCPalette { id: __qgcPal; colorGroupEnabled: enabled }
 
     signal hideDialog
 
+    Keys.onReleased: {
+        if (event.key == Qt.Key_Escape) {
+            reject()
+            event.accepted = true
+        } else if (event.key == Qt.Key_Return) {
+            accept()
+            event.accepted = true
+        }
+    }
+
     function accept() {
+        if (acceptAllowed) {
             Qt.inputMethod.hide()
             hideDialog()
         }
+    }
 
     function reject() {
+        if (rejectAllowed) {
             Qt.inputMethod.hide()
             hideDialog()
         }
+    }
 
     color: __qgcPal.windowShadeDark
 }