Browse Source

Remove unneeded "primary_action" from managebutton

Jaime van Kessel 3 years ago
parent
commit
274b98f9b1

+ 3 - 3
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()
         }
     }
 

+ 5 - 5
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); }
                 }