From 89322b9db6d69ea7916e95fedcfe70079ba31da9 Mon Sep 17 00:00:00 2001
From: fieldOfView <aldo@fieldofview.com>
Date: Fri, 4 May 2018 10:41:45 +0200
Subject: [PATCH] Move toolbox button style into theme

---
 .../resources/qml/ToolboxDetailTile.qml       | 53 +-----------------
 resources/themes/cura-light/styles.qml        | 55 +++++++++++++++++++
 resources/themes/cura-light/theme.json        |  3 +-
 3 files changed, 59 insertions(+), 52 deletions(-)

diff --git a/plugins/Toolbox/resources/qml/ToolboxDetailTile.qml b/plugins/Toolbox/resources/qml/ToolboxDetailTile.qml
index a5982f8c43..7056cb3777 100644
--- a/plugins/Toolbox/resources/qml/ToolboxDetailTile.qml
+++ b/plugins/Toolbox/resources/qml/ToolboxDetailTile.qml
@@ -76,58 +76,9 @@ Item
             }
             enabled: installed || !(toolbox.isDownloading && toolbox.activePackage != model) //Don't allow installing while another download is running.
             opacity: enabled ? 1.0 : 0.5
-            style: ButtonStyle
-            {
-                background: Rectangle
-                {
-                    implicitWidth: 96 * screenScaleFactor
-                    implicitHeight: 30 * screenScaleFactor
-                    color:
-                    {
-                        if (installed)
-                        {
-                            return UM.Theme.getColor("action_button_disabled")
-                        }
-                        else
-                        {
-                            if ( control.hovered )
-                            {
-                                return UM.Theme.getColor("primary_hover")
-                            }
-                            else
-                            {
-                                return UM.Theme.getColor("primary")
-                            }
-                        }
 
-                    }
-                }
-                label: Label
-                {
-                    text: control.text
-                    color:
-                    {
-                        if (installed)
-                        {
-                            return UM.Theme.getColor("action_button_disabled_text")
-                        }
-                        else
-                        {
-                            if ( control.hovered )
-                            {
-                                return UM.Theme.getColor("button_text_hover")
-                            }
-                            else
-                            {
-                                return UM.Theme.getColor("button_text")
-                            }
-                        }
-                    }
-                    verticalAlignment: Text.AlignVCenter
-                    horizontalAlignment: Text.AlignHCenter
-                    font: UM.Theme.getFont("default_bold")
-                }
-            }
+            property alias installed: tile.installed
+            style: UM.Theme.styles.toolbox_action_button
             onClicked:
             {
                 if (installed)
diff --git a/resources/themes/cura-light/styles.qml b/resources/themes/cura-light/styles.qml
index 6b454b7cf1..14e7d196a7 100755
--- a/resources/themes/cura-light/styles.qml
+++ b/resources/themes/cura-light/styles.qml
@@ -1033,4 +1033,59 @@ QtObject {
             label: Item { }
         }
     }
+
+    property Component toolbox_action_button: Component {
+        ButtonStyle
+        {
+            background: Rectangle
+            {
+                implicitWidth: UM.Theme.getSize("toolbox_action_button").width
+                implicitHeight: UM.Theme.getSize("toolbox_action_button").height
+                color:
+                {
+                    if (control.installed)
+                    {
+                        return UM.Theme.getColor("action_button_disabled")
+                    }
+                    else
+                    {
+                        if (control.hovered)
+                        {
+                            return UM.Theme.getColor("primary_hover")
+                        }
+                        else
+                        {
+                            return UM.Theme.getColor("primary")
+                        }
+                    }
+
+                }
+            }
+            label: Label
+            {
+                text: control.text
+                color:
+                {
+                    if (control.installed)
+                    {
+                        return UM.Theme.getColor("action_button_disabled_text")
+                    }
+                    else
+                    {
+                        if (control.hovered)
+                        {
+                            return UM.Theme.getColor("button_text_hover")
+                        }
+                        else
+                        {
+                            return UM.Theme.getColor("button_text")
+                        }
+                    }
+                }
+                verticalAlignment: Text.AlignVCenter
+                horizontalAlignment: Text.AlignHCenter
+                font: UM.Theme.getFont("default_bold")
+            }
+        }
+    }
 }
diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json
index c78a51a3a9..1be61b523a 100644
--- a/resources/themes/cura-light/theme.json
+++ b/resources/themes/cura-light/theme.json
@@ -460,6 +460,7 @@
         "toolbox_header": [1.0, 4.0],
         "toolbox_action_button": [8.0, 2.5],
         "toolbox_progress_bar": [8.0, 0.5],
-        "toolbox_chart_row": [1.0, 2.0]
+        "toolbox_chart_row": [1.0, 2.0],
+        "toolbox_action_button": [8.0, 2.5]
     }
 }