From 5b3e9079edfe7ef6722e7c3a17d9eb0fbf410958 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Tue, 7 Dec 2021 12:46:45 +0100 Subject: [PATCH] Don't show en-/disable button when un-/installed Contributes to: CURA-8587 --- plugins/Marketplace/resources/qml/ManageButton.qml | 3 ++- plugins/Marketplace/resources/qml/PackageCard.qml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/Marketplace/resources/qml/ManageButton.qml b/plugins/Marketplace/resources/qml/ManageButton.qml index 67532bc9aa..29b8ff22a5 100644 --- a/plugins/Marketplace/resources/qml/ManageButton.qml +++ b/plugins/Marketplace/resources/qml/ManageButton.qml @@ -19,6 +19,7 @@ RowLayout property string confirmedSecondaryText: confirmedMessageText.text property bool enabled: true property bool busy: state == "busy" + property bool confirmed: state == "confirmed" signal clicked(bool primary_action) @@ -107,7 +108,7 @@ RowLayout Label { id: confirmedMessageText - visible: parent.visble + visible: parent.visible anchors.verticalCenter: parent.verticalCenter font: UM.Theme.getFont("medium_bold") diff --git a/plugins/Marketplace/resources/qml/PackageCard.qml b/plugins/Marketplace/resources/qml/PackageCard.qml index 46e9214284..d782d43cbb 100644 --- a/plugins/Marketplace/resources/qml/PackageCard.qml +++ b/plugins/Marketplace/resources/qml/PackageCard.qml @@ -332,7 +332,7 @@ Rectangle busySecondaryText: catalog.i18nc("@button", "Disabling...") confirmedSecondaryText: catalog.i18nc("@button", "Disabled") enabled: !(installManageButton.busy || updateManageButton.busy) - visible: root.manageableInListView || root.expanded + visible: (root.manageableInListView || root.expanded) && !installManageButton.confirmed onClicked: { if (primary_action)