GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-22 05:39:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '15.10' of https://github.com/Ultimaker/Cura into 15.10

Browse Source
This commit is contained in:
Jaime van Kessel 2015-09-18 15:24:32 +02:00
commit bc81363a33
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cura/CuraApplication.py
View File

@ -61,7 +61,7 @@ class CuraApplication(QtApplication):
if not hasattr(sys, "frozen"): if not hasattr(sys, "frozen"):
Resources.addSearchPath(os.path.join(os.path.abspath(os.path.dirname(__file__)), "..")) Resources.addSearchPath(os.path.join(os.path.abspath(os.path.dirname(__file__)), ".."))
super().__init__(name = "cura", version = "15.09.81") super().__init__(name = "cura", version = "15.09.82")
self.setWindowIcon(QIcon(Resources.getPath(Resources.Images, "cura-icon.png"))) self.setWindowIcon(QIcon(Resources.getPath(Resources.Images, "cura-icon.png")))

4
resources/qml/Cura.qml
View File

@ -292,6 +292,10 @@ UM.MainWindow
for(var i in drop.urls) for(var i in drop.urls)
{ {
UM.MeshFileHandler.readLocalFile(drop.urls[i]); UM.MeshFileHandler.readLocalFile(drop.urls[i]);
if (i == drop.urls.length - 1)
{
openDialog.sendMeshName(drop.urls[i].toString())
}
} }
} }
} }