3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-08 23:46:22 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge branch 'master' into feature-backup-manager

Browse source
This commit is contained in:
ChrisTerBeke 2018-05-16 13:41:57 +02:00
commit 419d521e09
3 changed files with 24 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -59,14 +59,17 @@ Item
id: installButton
active: toolbox.isDownloading && toolbox.activePackage == model
complete: tile.installed
readyAction: function() {
readyAction: function()
{
toolbox.activePackage = model
toolbox.startDownload(model.download_url)
}
activeAction: function() {
activeAction: function()
{
toolbox.cancelDownload()
}
completeAction: function() {
completeAction: function()
{
toolbox.viewCategory = "installed"
}
// Don't allow installing while another download is running

6
plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml
View file

@ -18,11 +18,13 @@ Column
readyLabel: catalog.i18nc("@action:button", "Update")
activeLabel: catalog.i18nc("@action:button", "Updating")
completeLabel: catalog.i18nc("@action:button", "Updated")
readyAction: function() {
readyAction: function()
{
toolbox.activePackage = model
toolbox.update(model.id)
}
activeAction: function() {
activeAction: function()
{
toolbox.cancelDownload()
}
// Don't allow installing while another download is running