From a476b66fd06ea40e77b3572f6245bde45e28a760 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Tue, 14 Jul 2015 15:46:17 -0700 Subject: [PATCH 1/2] Escape - Cancel, Enter - Save support --- src/QmlControls/ParameterEditorDialog.qml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/QmlControls/ParameterEditorDialog.qml b/src/QmlControls/ParameterEditorDialog.qml index 54b1ac8..8834f0a 100644 --- a/src/QmlControls/ParameterEditorDialog.qml +++ b/src/QmlControls/ParameterEditorDialog.qml @@ -59,6 +59,7 @@ QGCViewDialog { validationError.text = fact.validate(validateValue, false /* convertOnly */) forceSave.visible = true } + valueField.forceActiveFocus(); } Column { @@ -82,6 +83,14 @@ QGCViewDialog { QGCTextField { id: valueField text: validate ? validateValue : fact.valueString + + onAccepted: accept() + + Keys.onReleased: { + if (event.key == Qt.Key_Escape) { + reject() + } + } } QGCLabel { text: fact.name } From c7dd080e39ad97e5c7e0b5bc9074a026bc859ee2 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Tue, 14 Jul 2015 15:46:28 -0700 Subject: [PATCH 2/2] Select all when focused --- src/QmlControls/QGCTextField.qml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/QmlControls/QGCTextField.qml b/src/QmlControls/QGCTextField.qml index ba3f678..3facce0 100644 --- a/src/QmlControls/QGCTextField.qml +++ b/src/QmlControls/QGCTextField.qml @@ -60,4 +60,10 @@ TextField { padding.right: control.showUnits ? unitsLabelWidthGenerator.width : control.__contentHeight/3 } + + onActiveFocusChanged: { + if (activeFocus) { + selectAll() + } + } }