diff options
| author | Lipu Fei <lipu.fei815@gmail.com> | 2017-10-09 16:04:27 +0300 |
|---|---|---|
| committer | Lipu Fei <lipu.fei815@gmail.com> | 2017-10-09 16:17:56 +0300 |
| commit | 8a25605413cd5b2d07d23a67d1ceadfbc7818050 (patch) | |
| tree | d1913e978b04671e9ca1e40c78f8115344abc3b7 /plugins/3MFReader/WorkspaceDialog.qml | |
| parent | f8122320d424a64c979cddb38c38777ae79f7953 (diff) | |
Fix lock issue with workspace dialog
CURA-4405
- Add try-except around lock release
- Fix closing the dialog with ESC
Diffstat (limited to 'plugins/3MFReader/WorkspaceDialog.qml')
| -rw-r--r-- | plugins/3MFReader/WorkspaceDialog.qml | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/plugins/3MFReader/WorkspaceDialog.qml b/plugins/3MFReader/WorkspaceDialog.qml index e9ef14dfa5..a633491248 100644 --- a/plugins/3MFReader/WorkspaceDialog.qml +++ b/plugins/3MFReader/WorkspaceDialog.qml @@ -10,6 +10,7 @@ import UM 1.1 as UM UM.Dialog { + id: base title: catalog.i18nc("@title:window", "Open Project") minimumWidth: 500 * screenScaleFactor @@ -30,6 +31,7 @@ UM.Dialog materialResolveComboBox.currentIndex = 0 } } + Item { anchors.fill: parent @@ -377,7 +379,7 @@ UM.Dialog anchors.right: ok_button.left anchors.rightMargin: 2 * screenScaleFactor } - Button + Button { id: ok_button text: catalog.i18nc("@action:button","Open"); @@ -386,4 +388,10 @@ UM.Dialog anchors.right: parent.right } } + + function reject() { + manager.onCancelButtonClicked(); + base.visible = false; + base.rejected(); + } } |