diff options
| author | Jelle Spijker <spijker.jelle@gmail.com> | 2021-12-09 09:58:14 +0300 |
|---|---|---|
| committer | Jelle Spijker <spijker.jelle@gmail.com> | 2021-12-09 09:58:14 +0300 |
| commit | 7734bf5169fc70852c4035bc482ec54ee51bb8f5 (patch) | |
| tree | c09067562040471049c5ce6c035617519b8cb3d5 /plugins/Marketplace/resources | |
| parent | 8708fd0f3a7c79e570defc59d137614048a4678d (diff) | |
Show Install and Update buttons in the correct scenario's
Contributes to: CURA-8587
Diffstat (limited to 'plugins/Marketplace/resources')
| -rw-r--r-- | plugins/Marketplace/resources/qml/PackageCardHeader.qml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/plugins/Marketplace/resources/qml/PackageCardHeader.qml b/plugins/Marketplace/resources/qml/PackageCardHeader.qml index ca74d9f77d..5859fbcd8e 100644 --- a/plugins/Marketplace/resources/qml/PackageCardHeader.qml +++ b/plugins/Marketplace/resources/qml/PackageCardHeader.qml @@ -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"); } } |