3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-05 16:51:12 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/master' into CURA-6435_new_style_add_machine

Browse source
This commit is contained in:
Lipu Fei 2019-04-08 09:09:07 +02:00
commit 7d096e5734
10 changed files with 37 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml
View file

@ -26,7 +26,7 @@ UM.Dialog
minimumHeight: maximumHeight
minimumWidth: maximumWidth
modality: UM.Application.platform == "linux" ? Qt.NonModal : Qt.WindowModal
modality: Qt.WindowModal
property var fileUrl

2
resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml
View file

@ -25,7 +25,7 @@ UM.Dialog
minimumHeight: height
minimumWidth: width
modality: UM.Application.platform == "linux" ? Qt.NonModal : Qt.WindowModal;
modality: Qt.WindowModal
property var fileUrls: []
property int spacerHeight: 10 * screenScaleFactor