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

Merge branch 'master' into feature-backup-manager

Browse source
This commit is contained in:
ChrisTerBeke 2018-05-15 16:50:25 +02:00
commit d27ac3cf31
7 changed files with 47 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

12
plugins/Toolbox/resources/qml/ToolboxProgressButton.qml
View file

@ -14,9 +14,9 @@ Item
property var active: false
property var complete: false
property var readyLabel: "Install"
property var activeLabel: "Installing"
property var completeLabel: "Installed"
property var readyLabel: catalog.i18nc("@action:button", "Install")
property var activeLabel: catalog.i18nc("@action:button", "Cancel")
property var completeLabel: catalog.i18nc("@action:button", "Installed")
property var readyAction: null // Action when button is ready and clicked (likely install)
property var activeAction: null // Action when button is active and clicked (likely cancel)
@ -32,15 +32,15 @@ Item
{
if (complete)
{
return catalog.i18nc("@action:button", "Installed")
return completeLabel
}
else if (active)
{
return catalog.i18nc("@action:button", "Cancel")
return activeLabel
}
else
{
return catalog.i18nc("@action:button", "Install")
return readyLabel
}
}
onClicked:

3
plugins/Toolbox/src/Toolbox.py
View file

@ -250,7 +250,8 @@ class Toolbox(QObject, Extension):
if remote_package:
download_url = remote_package["download_url"]
Logger.log("d", "Updating package [%s]..." % plugin_id)
self.uninstall(plugin_id)
if self._package_manager.isUserInstalledPackage(plugin_id):
self.uninstall(plugin_id)
self.startDownload(download_url)
else:
Logger.log("e", "Could not update package [%s] because there is no remote package info available.", plugin_id)