From f78ee7c167bb6783a9886230ff6cd793e7de19c1 Mon Sep 17 00:00:00 2001 From: Cain Kilgore Date: Tue, 9 Jan 2018 09:44:12 +0000 Subject: [PATCH 1/3] WL 21667 - Window.browseDir() dialog doesn't let user use Esc to cancel --- .../resources/qml/dialogs/FileDialog.qml | 24 +++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/interface/resources/qml/dialogs/FileDialog.qml b/interface/resources/qml/dialogs/FileDialog.qml index b9633104d5..c49fa145cd 100644 --- a/interface/resources/qml/dialogs/FileDialog.qml +++ b/interface/resources/qml/dialogs/FileDialog.qml @@ -70,7 +70,16 @@ ModalWindow { signal selectedFile(var file); signal canceled(); - + signal selected(int button); + + function click(button) { + clickedButton = button; + selected(button); + destroy(); + } + + property int clickedButton: OriginalDialogs.StandardButton.NoButton; + Component.onCompleted: { console.log("Helper " + helper + " drives " + drives); @@ -628,7 +637,10 @@ ModalWindow { case Qt.Key_Backtab: event.accepted = false; break; - + case Qt.Key_Escape: + event.accepted = true; + root.click(OriginalDialogs.StandardButton.Cancel); + break; default: if (addToPrefix(event)) { event.accepted = true @@ -793,7 +805,11 @@ ModalWindow { case Qt.Key_Home: event.accepted = d.navigateHome(); break; - - } + + case Qt.Key_Escape: + event.accepted = true; + root.click(OriginalDialogs.StandardButton.Cancel); + break; + } } } From 057c7086374776bc75e6904e913d490ebbb62384 Mon Sep 17 00:00:00 2001 From: Cain Kilgore Date: Wed, 10 Jan 2018 19:24:52 +0000 Subject: [PATCH 2/3] Spaces instead of Tabs (Damnit VS Re-install!) --- .../resources/qml/dialogs/FileDialog.qml | 27 +++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/interface/resources/qml/dialogs/FileDialog.qml b/interface/resources/qml/dialogs/FileDialog.qml index c49fa145cd..d2115b5e7e 100644 --- a/interface/resources/qml/dialogs/FileDialog.qml +++ b/interface/resources/qml/dialogs/FileDialog.qml @@ -71,14 +71,13 @@ ModalWindow { signal selectedFile(var file); signal canceled(); signal selected(int button); - - function click(button) { - clickedButton = button; - selected(button); - destroy(); + function click(button) { + clickedButton = button; + selected(button); + destroy(); } - property int clickedButton: OriginalDialogs.StandardButton.NoButton; + property int clickedButton: OriginalDialogs.StandardButton.NoButton; Component.onCompleted: { console.log("Helper " + helper + " drives " + drives); @@ -637,10 +636,10 @@ ModalWindow { case Qt.Key_Backtab: event.accepted = false; break; - case Qt.Key_Escape: - event.accepted = true; - root.click(OriginalDialogs.StandardButton.Cancel); - break; + case Qt.Key_Escape: + event.accepted = true; + root.click(OriginalDialogs.StandardButton.Cancel); + break; default: if (addToPrefix(event)) { event.accepted = true @@ -806,10 +805,10 @@ ModalWindow { event.accepted = d.navigateHome(); break; - case Qt.Key_Escape: - event.accepted = true; - root.click(OriginalDialogs.StandardButton.Cancel); - break; + case Qt.Key_Escape: + event.accepted = true; + root.click(OriginalDialogs.StandardButton.Cancel); + break; } } } From 104ac0ffae379d48f70b1e6827f341b83ae9177e Mon Sep 17 00:00:00 2001 From: Cain Kilgore Date: Wed, 10 Jan 2018 20:30:41 +0000 Subject: [PATCH 3/3] Indents, man --- interface/resources/qml/dialogs/FileDialog.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/resources/qml/dialogs/FileDialog.qml b/interface/resources/qml/dialogs/FileDialog.qml index d2115b5e7e..7b1a177c86 100644 --- a/interface/resources/qml/dialogs/FileDialog.qml +++ b/interface/resources/qml/dialogs/FileDialog.qml @@ -636,7 +636,7 @@ ModalWindow { case Qt.Key_Backtab: event.accepted = false; break; - case Qt.Key_Escape: + case Qt.Key_Escape: event.accepted = true; root.click(OriginalDialogs.StandardButton.Cancel); break;