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

Drag-and-drop files behave the same as open file menu

Browse Source 
CURA-3495
This commit is contained in:
Lipu Fei 2017-03-28 12:16:33 +02:00
parent 2810054f8e
commit 5bec46a29c
1 changed files with 43 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
resources/qml/Cura.qml
View File

@ -259,40 +259,7 @@ UM.MainWindow
{ {
if (drop.urls.length > 0) if (drop.urls.length > 0)
{ {
// Import models handleOpenFileUrls(drop.urls);
var imported_model = -1;
for (var i in drop.urls)
{
// 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")) {
// Drop an object
Printer.readLocalFile(drop.urls[i]);
if (imported_model == -1)
{
imported_model = i;
}
}
}
// Import profiles
var import_result = Cura.ContainerManager.importProfiles(drop.urls);
if (import_result.message !== "") {
messageDialog.text = import_result.message
if (import_result.status == "ok")
{
messageDialog.icon = StandardIcon.Information
}
else
{
messageDialog.icon = StandardIcon.Critical
}
messageDialog.open()
}
if (imported_model != -1)
{
var meshName = backgroundItem.getMeshName(drop.urls[imported_model].toString())
backgroundItem.hasMesh(decodeURIComponent(meshName))
}
} }
} }
} }
@ -753,36 +720,45 @@ UM.MainWindow
CuraApplication.setDefaultPath("dialog_load_path", folder); CuraApplication.setDefaultPath("dialog_load_path", folder);
// look for valid project files handleOpenFileUrls(fileUrls);
var projectFileUrlList = []; }
var hasGcode = false; }
for (var i in fileUrls)
{
var endsWithG = /\.g$/;
var endsWithGcode = /\.gcode$/;
if (endsWithG.test(fileUrls[i]) || endsWithGcode.test(fileUrls[i])) {
hasGcode = true;
continue;
}
else if (CuraApplication.checkIsValidProjectFile(fileUrls[i])) {
projectFileUrlList.push(fileUrls[i]);
}
}
// show a warning if selected multiple files together with Gcode function handleOpenFileUrls(fileUrls)
var hasProjectFile = projectFileUrlList.length > 0; {
var selectedMultipleFiles = fileUrls.length > 1; // look for valid project files
if (selectedMultipleFiles && hasGcode) { var projectFileUrlList = [];
infoMultipleFilesWithGcodeDialog.selectedMultipleFiles = selectedMultipleFiles; var hasGcode = false;
infoMultipleFilesWithGcodeDialog.hasProjectFile = hasProjectFile; for (var i in fileUrls)
infoMultipleFilesWithGcodeDialog.fileUrls = fileUrls; {
infoMultipleFilesWithGcodeDialog.projectFileUrlList = projectFileUrlList; var endsWithG = /\.g$/;
infoMultipleFilesWithGcodeDialog.open(); var endsWithGcode = /\.gcode$/;
if (endsWithG.test(fileUrls[i]) || endsWithGcode.test(fileUrls[i]))
{
hasGcode = true;
continue;
} }
else { else if (CuraApplication.checkIsValidProjectFile(fileUrls[i]))
handleOpenFiles(selectedMultipleFiles, hasProjectFile, fileUrls, projectFileUrlList); {
projectFileUrlList.push(fileUrls[i]);
} }
} }
// show a warning if selected multiple files together with Gcode
var hasProjectFile = projectFileUrlList.length > 0;
var selectedMultipleFiles = fileUrls.length > 1;
if (selectedMultipleFiles && hasGcode)
{
infoMultipleFilesWithGcodeDialog.selectedMultipleFiles = selectedMultipleFiles;
infoMultipleFilesWithGcodeDialog.hasProjectFile = hasProjectFile;
infoMultipleFilesWithGcodeDialog.fileUrls = fileUrls.slice();
infoMultipleFilesWithGcodeDialog.projectFileUrlList = projectFileUrlList.slice();
infoMultipleFilesWithGcodeDialog.open();
}
else
{
handleOpenFiles(selectedMultipleFiles, hasProjectFile, fileUrls, projectFileUrlList);
}
} }
function handleOpenFiles(selectedMultipleFiles, hasProjectFile, fileUrls, projectFileUrlList) function handleOpenFiles(selectedMultipleFiles, hasProjectFile, fileUrls, projectFileUrlList)
@ -790,7 +766,7 @@ UM.MainWindow
// we only allow opening one project file // we only allow opening one project file
if (selectedMultipleFiles && hasProjectFile) if (selectedMultipleFiles && hasProjectFile)
{ {
openFilesIncludingProjectsDialog.fileUrls = fileUrls; openFilesIncludingProjectsDialog.fileUrls = fileUrls.slice();
openFilesIncludingProjectsDialog.show(); openFilesIncludingProjectsDialog.show();
return; return;
} }
@ -802,9 +778,13 @@ UM.MainWindow
// check preference // check preference
var choice = UM.Preferences.getValue("cura/choice_on_open_project"); var choice = UM.Preferences.getValue("cura/choice_on_open_project");
if (choice == "open_as_project") if (choice == "open_as_project")
{
openFilesIncludingProjectsDialog.loadProjectFile(projectFile); openFilesIncludingProjectsDialog.loadProjectFile(projectFile);
}
else if (choice == "open_as_model") else if (choice == "open_as_model")
openFilesIncludingProjectsDialog.loadModelFiles([projectFile]); {
openFilesIncludingProjectsDialog.loadModelFiles([projectFile].slice());
}
else // always ask else // always ask
{ {
// ask whether to open as project or as models // ask whether to open as project or as models
@ -814,7 +794,7 @@ UM.MainWindow
} }
else else
{ {
openFilesIncludingProjectsDialog.loadModelFiles(fileUrls); openFilesIncludingProjectsDialog.loadModelFiles(fileUrls.slice());
} }
} }