From 274b98f9b17d14785f72fd74d303eca60d23167f Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 13 Dec 2021 13:09:17 +0100 Subject: [PATCH] Remove unneeded "primary_action" from managebutton --- plugins/Marketplace/resources/qml/ManageButton.qml | 6 +++--- .../Marketplace/resources/qml/PackageCardHeader.qml | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/plugins/Marketplace/resources/qml/ManageButton.qml b/plugins/Marketplace/resources/qml/ManageButton.qml index d3b86a6fa9..9bd1fae032 100644 --- a/plugins/Marketplace/resources/qml/ManageButton.qml +++ b/plugins/Marketplace/resources/qml/ManageButton.qml @@ -19,14 +19,14 @@ Item implicitWidth: childrenRect.width implicitHeight: childrenRect.height - signal clicked(bool primary_action) + signal clicked() property Component primaryButton: Component { Cura.PrimaryButton { text: manageButton.text - onClicked: manageButton.clicked(true) + onClicked: manageButton.clicked() } } @@ -35,7 +35,7 @@ Item Cura.SecondaryButton { text: manageButton.text - onClicked: manageButton.clicked(false) + onClicked: manageButton.clicked() } } diff --git a/plugins/Marketplace/resources/qml/PackageCardHeader.qml b/plugins/Marketplace/resources/qml/PackageCardHeader.qml index 627fc27d46..76c7f91624 100644 --- a/plugins/Marketplace/resources/qml/PackageCardHeader.qml +++ b/plugins/Marketplace/resources/qml/PackageCardHeader.qml @@ -15,7 +15,7 @@ Item default property alias contents: contentItem.children; property var packageData - property bool showManageButtons + property bool showManageButtons: false width: parent.width height: UM.Theme.getSize("card").height @@ -194,13 +194,13 @@ Item onClicked: { - if (primary_action) + if(packageData.isActive) { - packageData.enablePackageTriggered(packageData.packageId) + packageData.disablePackageTriggered(packageData.packageId) } else { - packageData.disablePackageTriggered(packageData.packageId) + packageData.enablePackageTriggered(packageData.packageId) } } } @@ -245,7 +245,7 @@ Item onClicked: { busy = true - if (primary_action){ packageData.installPackageTriggered(packageData.packageId, packageData.downloadURL); } + if (packageData.isInstalled){ packageData.installPackageTriggered(packageData.packageId, packageData.downloadURL); } else { packageData.uninstallPackageTriggered(packageData.packageId); } }