3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-20 21:27:50 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Remove unneeded "primary_action" from managebutton

Browse source
This commit is contained in:
Jaime van Kessel 2021-12-13 13:09:17 +01:00
parent 08685af9de
commit 274b98f9b1
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
plugins/Marketplace/resources/qml/ManageButton.qml
View file

@ -19,14 +19,14 @@ Item
implicitWidth: childrenRect.width implicitWidth: childrenRect.width
implicitHeight: childrenRect.height implicitHeight: childrenRect.height
signal clicked(bool primary_action) signal clicked()
property Component primaryButton: Component property Component primaryButton: Component
{ {
Cura.PrimaryButton Cura.PrimaryButton
{ {
text: manageButton.text text: manageButton.text
onClicked: manageButton.clicked(true) onClicked: manageButton.clicked()
} }
} }
@ -35,7 +35,7 @@ Item
Cura.SecondaryButton Cura.SecondaryButton
{ {
text: manageButton.text text: manageButton.text
onClicked: manageButton.clicked(false) onClicked: manageButton.clicked()
} }
} }

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

@ -15,7 +15,7 @@ Item
default property alias contents: contentItem.children; default property alias contents: contentItem.children;
property var packageData property var packageData
property bool showManageButtons property bool showManageButtons: false
width: parent.width width: parent.width
height: UM.Theme.getSize("card").height height: UM.Theme.getSize("card").height
@ -194,13 +194,13 @@ Item
onClicked: onClicked:
{ {
if (primary_action) if(packageData.isActive)
{ {
packageData.enablePackageTriggered(packageData.packageId) packageData.disablePackageTriggered(packageData.packageId)
} }
else else
{ {
packageData.disablePackageTriggered(packageData.packageId) packageData.enablePackageTriggered(packageData.packageId)
} }
} }
} }
@ -245,7 +245,7 @@ Item
onClicked: onClicked:
{ {
busy = true 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); } else { packageData.uninstallPackageTriggered(packageData.packageId); }
} }