3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-05 21:13:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

CURA-5035: Clean-up

Browse source
This commit is contained in:
Ian Paschal 2018-04-12 14:03:53 +02:00
parent 6e9f7174b6
commit e13c45daee
19 changed files with 185 additions and 179 deletions
Download patch file Download diff file Expand all files Collapse all files

20
plugins/Toolbox/resources/qml/ToolboxDetailTile.qml
View file

@ -48,7 +48,7 @@ Rectangle
Button {
id: installButton
text: {
if ( manager.isDownloading && manager.activePackage == model )
if ( toolbox.isDownloading && toolbox.activePackage == model )
{
return catalog.i18nc("@action:button", "Cancel")
}
@ -59,9 +59,9 @@ Rectangle
}
enabled:
{
if ( manager.isDownloading )
if ( toolbox.isDownloading )
{
return manager.activePackage == model ? true : false
return toolbox.activePackage == model ? true : false
}
else
{
@ -88,21 +88,21 @@ Rectangle
onClicked:
{
console.log( "MODEL", model.id )
manager.activePackage = model
// if ( manager.isDownloading && manager.activePackage == model )
if ( manager.isDownloading )
toolbox.activePackage = model
// if ( toolbox.isDownloading && toolbox.activePackage == model )
if ( toolbox.isDownloading )
{
manager.cancelDownload();
toolbox.cancelDownload();
}
else
{
// manager.activePackage = model;
// toolbox.activePackage = model;
if ( model.can_upgrade )
{
// manager.downloadAndInstallPlugin( model.update_url );
// toolbox.downloadAndInstallPlugin( model.update_url );
}
else {
manager.startDownload( model.download_url );
toolbox.startDownload( model.download_url );
}
}
}