3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-25 03:41:08 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

CURA-5402 hopefully solved merge conflicts

Browse source
This commit is contained in:
Jack Ha 2018-06-06 14:39:53 +02:00
commit 96f2e6e1ed
96 changed files with 1612 additions and 838 deletions
Download patch file Download diff file Expand all files Collapse all files

15
resources/qml/Cura.qml
View file

@ -323,10 +323,11 @@ UM.MainWindow
{
if (drop.urls.length > 0)
{
// As the drop area also supports plugins, first check if it's a plugin that was dropped.
if (drop.urls.length == 1)
var nonPackages = [];
for (var i = 0; i < drop.urls.length; i++)
{
var filename = drop.urls[0];
var filename = drop.urls[i];
if (filename.endsWith(".curapackage"))
{
// Try to install plugin & close.
@ -334,11 +335,13 @@ UM.MainWindow
packageInstallDialog.text = catalog.i18nc("@label", "This package will be installed after restarting.");
packageInstallDialog.icon = StandardIcon.Information;
packageInstallDialog.open();
return;
}
else
{
nonPackages.push(filename);
}
}
openDialog.handleOpenFileUrls(drop.urls);
openDialog.handleOpenFileUrls(nonPackages);
}
}
}