From 6a466c99b241035a6dc6d9cbbf174f39d51aad3d Mon Sep 17 00:00:00 2001
From: Jaime van Kessel <nallath@gmail.com>
Date: Thu, 6 Dec 2018 09:54:32 +0100
Subject: [PATCH] Make the progressButton use signals instead of functions

Although the naming is still a bit off, it's much cleaner to use signals instead of functions. It's
also more in line with how default QML components handle these kind of situations

CURA-6006
---
 plugins/Toolbox/resources/qml/Toolbox.qml     |  2 +-
 .../qml/ToolboxDetailTileActions.qml          | 23 ++++++++-----------
 .../qml/ToolboxInstalledTileActions.qml       |  8 +++----
 .../resources/qml/ToolboxProgressButton.qml   | 12 +++++-----
 4 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/plugins/Toolbox/resources/qml/Toolbox.qml b/plugins/Toolbox/resources/qml/Toolbox.qml
index d3d980b0b3..b2bab4355a 100644
--- a/plugins/Toolbox/resources/qml/Toolbox.qml
+++ b/plugins/Toolbox/resources/qml/Toolbox.qml
@@ -90,7 +90,7 @@ Window
                 licenseDialog.show();
             }
         }
-        
+
         ToolboxLicenseDialog
         {
             id: licenseDialog
diff --git a/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml b/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml
index cd1e4cdbda..72a9d14dcd 100644
--- a/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml
+++ b/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml
@@ -18,19 +18,15 @@ Column
         id: installButton
         active: toolbox.isDownloading && toolbox.activePackage == model
         complete: installed
-        readyAction: function()
+        onReadyAction:
         {
             toolbox.activePackage = model
             toolbox.startDownload(model.download_url)
         }
-        activeAction: function()
-        {
-            toolbox.cancelDownload()
-        }
-        completeAction: function()
-        {
-            toolbox.viewCategory = "installed"
-        }
+        onActiveAction: toolbox.cancelDownload()
+
+        onCompleteAction: toolbox.viewCategory = "installed"
+
         // Don't allow installing while another download is running
         enabled: installed || !(toolbox.isDownloading && toolbox.activePackage != model)
         opacity: enabled ? 1.0 : 0.5
@@ -44,20 +40,19 @@ Column
         readyLabel: catalog.i18nc("@action:button", "Update")
         activeLabel: catalog.i18nc("@action:button", "Updating")
         completeLabel: catalog.i18nc("@action:button", "Updated")
-        readyAction: function()
+
+        onReadyAction:
         {
             toolbox.activePackage = model
             toolbox.update(model.id)
         }
-        activeAction: function()
-        {
-            toolbox.cancelDownload()
-        }
+        onActiveAction: toolbox.cancelDownload()
         // Don't allow installing while another download is running
         enabled: !(toolbox.isDownloading && toolbox.activePackage != model)
         opacity: enabled ? 1.0 : 0.5
         visible: canUpdate
     }
+
     Connections
     {
         target: toolbox
diff --git a/plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml b/plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml
index 8fd88b1cfd..621ecd96ea 100644
--- a/plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml
+++ b/plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml
@@ -30,15 +30,13 @@ Column
         readyLabel: catalog.i18nc("@action:button", "Update")
         activeLabel: catalog.i18nc("@action:button", "Updating")
         completeLabel: catalog.i18nc("@action:button", "Updated")
-        readyAction: function()
+        onReadyAction:
         {
             toolbox.activePackage = model
             toolbox.update(model.id)
         }
-        activeAction: function()
-        {
-            toolbox.cancelDownload()
-        }
+        onActiveAction: toolbox.cancelDownload()
+
         // Don't allow installing while another download is running
         enabled: !(toolbox.isDownloading && toolbox.activePackage != model)
         opacity: enabled ? 1.0 : 0.5
diff --git a/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml b/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml
index 2744e40ec9..00b0b985f5 100644
--- a/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml
+++ b/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml
@@ -18,9 +18,9 @@ Item
     property var activeLabel: catalog.i18nc("@action:button", "Cancel")
     property var completeLabel: catalog.i18nc("@action:button", "Installed")
 
-    property var readyAction: null          // Action when button is ready and clicked (likely install)
-    property var activeAction: null         // Action when button is active and clicked (likely cancel)
-    property var completeAction: null       // Action when button is complete and clicked (likely go to installed)
+    signal readyAction() // Action when button is ready and clicked (likely install)
+    signal activeAction() // Action when button is active and clicked (likely cancel)
+    signal completeAction() // Action when button is complete and clicked (likely go to installed)
 
     width: UM.Theme.getSize("toolbox_action_button").width
     height: UM.Theme.getSize("toolbox_action_button").height
@@ -47,15 +47,15 @@ Item
         {
             if (complete)
             {
-                return completeAction()
+                completeAction()
             }
             else if (active)
             {
-                return activeAction()
+                activeAction()
             }
             else
             {
-                return readyAction()
+                readyAction()
             }
         }
         style: ButtonStyle