3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-12 01:07:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Simplify the update logic in the package model / card

Browse source 
CURA-8587
This commit is contained in:
Jaime van Kessel 2021-12-13 14:15:16 +01:00
parent 4b358496d9
commit 62f99a28b3
2 changed files with 36 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

41
plugins/Marketplace/resources/qml/PackageCardHeader.qml
View file

@ -207,18 +207,15 @@ Item
id: installManageButton
visible: (showManageButtons || confirmed) && ((packageData.isBundled && packageData.canDowngrade) || !packageData.isBundled) && !updateManageButton.confirmed
enabled: !updateManageButton.busy
confirmed: packageData.isRecentlyInstalledChanged
button_style: confirmed ? packageData.isInstalled : !packageData.isInstalled
busy: packageData.busy
button_style: !packageData.isInstalled
Layout.alignment: Qt.AlignTop
text:
{
if (button_style)
if (!packageData.isInstalled)
{
if (busy) { return catalog.i18nc("@button", "Installing..."); }
else if (confirmed) { return catalog.i18nc("@button", "Installed"); }
else { return catalog.i18nc("@button", "Install"); }
}
else
@ -226,41 +223,19 @@ Item
if (packageData.canDowngrade)
{
if (busy) { return catalog.i18nc("@button", "Downgrading..."); }
else if (confirmed) { return catalog.i18nc("@button", "Downgraded"); }
else { return catalog.i18nc("@button", "Downgrade"); }
}
else
{
if (busy) { return catalog.i18nc("@button", "Uninstalling..."); }
else if (confirmed) { return catalog.i18nc("@button", "Uninstalled"); }
else { return catalog.i18nc("@button", "Uninstall"); }
return catalog.i18nc("@button", "Uninstall");
}
}
}
onClicked:
{
busy = true
if (packageData.isInstalled){ packageData.installPackageTriggered(packageData.packageId, packageData.downloadURL); }
else { packageData.uninstallPackageTriggered(packageData.packageId); }
}
Connections
{
target: packageData
function onInstalledPackagesChanged(success)
{
installManageButton.busy = false;
installManageButton.confirmed = success;
}
function onUninstalledPackagesChanged(success)
{
installManageButton.busy = false;
installManageButton.confirmed = success;
installManageButton.button_style = !installManageButton.button_style;
}
if (packageData.isInstalled){ packageData.uninstall() }
else { packageData.install()}
}
}
@ -284,7 +259,7 @@ Item
onClicked:
{
busy = true;
busy = true
packageData.updatePackageTriggered(packageData.packageId);
}
@ -292,7 +267,7 @@ Item
{
target: packageData
function onUpdatePackagesChanged(succes)
function updated(succes)
{
updateManageButton.busy = false;
updateManageButton.confirmed = succes;