From b425672ad0fb44bb9b1fa79d0d4f9df6a64ca009 Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Thu, 30 Nov 2017 09:31:07 +0100 Subject: [PATCH] CURA-4643 Allow using the ESC/ENTER keys for reject or accept the user agreement --- plugins/UserAgreementPlugin/UserAgreement.qml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/plugins/UserAgreementPlugin/UserAgreement.qml b/plugins/UserAgreementPlugin/UserAgreement.qml index 1d86a33d0f..c7f3f165e3 100644 --- a/plugins/UserAgreementPlugin/UserAgreement.qml +++ b/plugins/UserAgreementPlugin/UserAgreement.qml @@ -15,8 +15,6 @@ UM.Dialog height: minimumHeight title: catalog.i18nc("@title:window", "User Agreement") - disableKeyButtons: true - TextArea { anchors.top: parent.top @@ -45,7 +43,7 @@ UM.Dialog anchors.right: parent.right text: catalog.i18nc("@action:button", "I understand and agree") onClicked: { - manager.didAgree(true) + baseDialog.accepted() } } @@ -54,13 +52,12 @@ UM.Dialog anchors.left: parent.left text: catalog.i18nc("@action:button", "I don't agree") onClicked: { - manager.didAgree(false) + baseDialog.rejected() } } - } - onClosing: { - manager.didAgree(false) - } + onAccepted: manager.didAgree(true) + onRejected: manager.didAgree(false) + onClosing: manager.didAgree(false) }