diff options
| author | ChrisTerBeke <c.terbeke@ultimaker.com> | 2017-10-10 10:21:31 +0300 |
|---|---|---|
| committer | ChrisTerBeke <c.terbeke@ultimaker.com> | 2017-10-10 10:21:31 +0300 |
| commit | 641b3c21f7901942c33195d650d9e2b8a94998c6 (patch) | |
| tree | 7864aa23f9c626aa0d8203747927e206d8170327 /plugins/3MFReader/WorkspaceDialog.qml | |
| parent | 2e957069a8b4bf102034c578982c62fd44942c5a (diff) | |
| parent | d1bee922abb5ff2faad68f435f055b82ba250e7c (diff) | |
fix merge conflicts
Diffstat (limited to 'plugins/3MFReader/WorkspaceDialog.qml')
| -rw-r--r-- | plugins/3MFReader/WorkspaceDialog.qml | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/plugins/3MFReader/WorkspaceDialog.qml b/plugins/3MFReader/WorkspaceDialog.qml index ad1d21a491..55f8d5eecf 100644 --- a/plugins/3MFReader/WorkspaceDialog.qml +++ b/plugins/3MFReader/WorkspaceDialog.qml @@ -10,10 +10,11 @@ import UM 1.1 as UM UM.Dialog { + id: base title: catalog.i18nc("@title:window", "Open Project") minimumWidth: 500 * screenScaleFactor - minimumHeight: 400 * screenScaleFactor + minimumHeight: 450 * screenScaleFactor width: minimumWidth height: minimumHeight @@ -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(); + } } |