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

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

Browse source
This commit is contained in:
Tamara Hogenhout 2015-10-16 11:02:27 +02:00
commit 4ffbfcf69f
2 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
resources/qml/Cura.qml
View file

@ -649,6 +649,11 @@ UM.MainWindow
onAccepted:
{
//Because several implementations of the file dialog only update the folder
//when it is explicitly set.
var f = folder;
folder = f;
UM.MeshFileHandler.readLocalFile(fileUrl)
openDialog.sendMeshName(fileUrl.toString())
}
@ -683,18 +688,22 @@ UM.MainWindow
Component.onCompleted:
{
UM.Theme.load(UM.Resources.getPath(UM.Resources.Themes, "cura"))
visible = true;
addMachineTimer.start();
}
Timer
{
id: addMachineTimer;
id: startupTimer;
interval: 100;
repeat: false;
running: true;
onTriggered:
{
if(UM.MachineManager.activeMachineInstance == "")
if(!base.visible)
{
base.visible = true;
restart();
}
else if(UM.MachineManager.activeMachineInstance == "")
{
addMachineWizard.firstRun = true;
addMachineWizard.open();