3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-26 12:21:26 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 20

Add dialog for opening a project file

Browse source 
CURA-3495
This commit is contained in:
Lipu Fei 2017-03-20 15:35:22 +01:00
parent 70dbeaf256
commit f3167bb84b
4 changed files with 216 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

24
resources/qml/Cura.qml
View file

@ -773,9 +773,26 @@ UM.MainWindow
}
if (hasProjectFile)
openFilesIncludingProjectsDialog.loadProjectFile(projectFileUrlList[0]);
{
var projectFile = projectFileUrlList[0];
// check preference
var choice = UM.Preferences.getValue("cura/choice_on_open_project");
if (choice == "open_as_project")
openFilesIncludingProjectsDialog.loadProjectFile(projectFile);
else if (choice == "open_as_model")
openFilesIncludingProjectsDialog.loadModelFiles([projectFile]);
else // always ask
{
// ask whether to open as project or as models
askOpenAsProjectOrModelsDialog.fileUrl = projectFile;
askOpenAsProjectOrModelsDialog.show();
}
}
else
{
openFilesIncludingProjectsDialog.loadModelFiles(fileUrls);
}
}
}
@ -790,6 +807,11 @@ UM.MainWindow
id: openFilesIncludingProjectsDialog
}
AskOpenAsProjectOrModelsDialog
{
id: askOpenAsProjectOrModelsDialog
}
EngineLog
{
id: engineLog;