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

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

View file

@ -563,7 +563,7 @@ UM.MainWindow
//: File open dialog title
title: catalog.i18nc("@title:window","Open file(s)")
modality: UM.Application.platform == "linux" ? Qt.NonModal : Qt.WindowModal;
modality: Qt.WindowModal
selectMultiple: true
nameFilters: UM.MeshFileHandler.supportedReadFileTypes;
folder: CuraApplication.getDefaultPath("dialog_load_path")