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

Show Install and Update buttons in the correct scenario's

Browse source 
Contributes to: CURA-8587
This commit is contained in:
Jelle Spijker 2021-12-09 07:58:14 +01:00
parent 8708fd0f3a
commit 7734bf5169
No known key found for this signature in database
GPG key ID: 6662DC033BE6B99A
2 changed files with 14 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -181,7 +181,7 @@ Item
ManageButton
{
id: enableManageButton
visible: showManageButtons && !(installManageButton.confirmed || updateManageButton.confirmed)
visible: showManageButtons && packageData.isInstalled && !(installManageButton.confirmed || updateManageButton.confirmed)
enabled: !(installManageButton.busy || updateManageButton.busy)
busy: false
@ -208,12 +208,12 @@ Item
ManageButton
{
id: installManageButton
visible: (showManageButtons || confirmed) && ((packageData.isBundled && packageData.canDowngrade) || !packageData.isBundled || !updateManageButton.confirmed)
visible: (showManageButtons || confirmed) && ((packageData.isBundled && packageData.canDowngrade) || !packageData.isBundled) && !updateManageButton.confirmed
enabled: !packageData.isUpdating
busy: packageData.isInstalling
confirmed: packageData.isInstalled || packageData.isUninstalled
confirmed: packageData.isRecentlyInstalled
button_style: packageData.stateManageInstallButton
Layout.alignment: Qt.AlignTop
@ -223,7 +223,7 @@ Item
if (packageData.stateManageInstallButton)
{
if (packageData.isInstalling) { return catalog.i18nc("@button", "Installing..."); }
else if (packageData.isInstalled) { return catalog.i18nc("@button", "Installed"); }
else if (packageData.isRecentlyInstalled) { return catalog.i18nc("@button", "Installed"); }
else { return catalog.i18nc("@button", "Install"); }
}
else
@ -254,7 +254,7 @@ Item
enabled: !installManageButton.busy
busy: packageData.isUpdating
confirmed: packageData.isUpdated
confirmed: packageData.isRecentlyUpdated
button_style: true
Layout.alignment: Qt.AlignTop
@ -262,7 +262,7 @@ Item
text:
{
if (packageData.isUpdating) { return catalog.i18nc("@button", "Updating..."); }
else if (packageData.isUpdated) { return catalog.i18nc("@button", "Updated"); }
else if (packageData.isRecentlyUpdated) { return catalog.i18nc("@button", "Updated"); }
else { return catalog.i18nc("@button", "Update"); }
}