GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-17 15:25:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1505 from LipuFei/bugfix_CURA-3471-crash-on-drag-stl

Browse Source 
CURA-3471 Crash on drag and drop STL
This commit is contained in:
jack 2017-03-08 09:23:33 +01:00 committed by GitHub
commit 3c8a6a6691
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cura/Settings/ContainerManager.py
View File

@ -823,7 +823,7 @@ class ContainerManager(QObject):
# #
# \param QVariant<QUrl>, essentially a list with QUrl objects. # \param QVariant<QUrl>, essentially a list with QUrl objects.
# \return Dict with keys status, text # \return Dict with keys status, text
@pyqtSlot(QVariant, result="QVariantMap") @pyqtSlot("QVariantList", result="QVariantMap")
def importProfiles(self, file_urls): def importProfiles(self, file_urls):
status = "ok" status = "ok"
results = {"ok": [], "error": []} results = {"ok": [], "error": []}

6
resources/qml/Cura.qml
View File

@ -266,11 +266,11 @@ UM.MainWindow
anchors.fill: parent; anchors.fill: parent;
onDropped: onDropped:
{ {
if(drop.urls.length > 0) if (drop.urls.length > 0)
{ {
// Import models // Import models
var imported_model = -1; var imported_model = -1;
for(var i in drop.urls) for (var i in drop.urls)
{ {
// There is no endsWith in this version of JS... // There is no endsWith in this version of JS...
if ((drop.urls[i].length <= 12) || (drop.urls[i].substring(drop.urls[i].length-12) !== ".curaprofile")) { if ((drop.urls[i].length <= 12) || (drop.urls[i].substring(drop.urls[i].length-12) !== ".curaprofile")) {
@ -287,7 +287,7 @@ UM.MainWindow
var import_result = Cura.ContainerManager.importProfiles(drop.urls); var import_result = Cura.ContainerManager.importProfiles(drop.urls);
if (import_result.message !== "") { if (import_result.message !== "") {
messageDialog.text = import_result.message messageDialog.text = import_result.message
if(import_result.status == "ok") if (import_result.status == "ok")
{ {
messageDialog.icon = StandardIcon.Information messageDialog.icon = StandardIcon.Information
} }