Re-enable selectMultiple for the open file dialog

Fixes CURA-2198
This commit is contained in:
Arjen Hiemstra 2016-09-15 13:39:41 +02:00
parent 19b6d716c7
commit d0ad654108

View File

@ -641,8 +641,7 @@ UM.MainWindow
//: File open dialog title //: File open dialog title
title: catalog.i18nc("@title:window","Open file") title: catalog.i18nc("@title:window","Open file")
modality: UM.Application.platform == "linux" ? Qt.NonModal : Qt.WindowModal; modality: UM.Application.platform == "linux" ? Qt.NonModal : Qt.WindowModal;
//TODO: Support multiple file selection, workaround bug in KDE file dialog selectMultiple: true
//selectMultiple: true
nameFilters: UM.MeshFileHandler.supportedReadFileTypes; nameFilters: UM.MeshFileHandler.supportedReadFileTypes;
folder: CuraApplication.getDefaultPath("dialog_load_path") folder: CuraApplication.getDefaultPath("dialog_load_path")
onAccepted: onAccepted:
@ -653,7 +652,12 @@ UM.MainWindow
folder = f; folder = f;
CuraApplication.setDefaultPath("dialog_load_path", folder); CuraApplication.setDefaultPath("dialog_load_path", folder);
UM.MeshFileHandler.readLocalFile(fileUrl)
for(var i in fileUrls)
{
UM.MeshFileHandler.readLocalFile(fileUrls[i])
}
var meshName = backgroundItem.getMeshName(fileUrl.toString()) var meshName = backgroundItem.getMeshName(fileUrl.toString())
backgroundItem.hasMesh(decodeURIComponent(meshName)) backgroundItem.hasMesh(decodeURIComponent(meshName))
} }