From 14b460a626bfbb58b0bc8eff6621f46e8d400ecb Mon Sep 17 00:00:00 2001
From: Diego Prado Gesto <d.pradogesto@ultimaker.com>
Date: Tue, 27 Nov 2018 17:25:10 +0100
Subject: [PATCH] Remove unused styles

---
 resources/qml/Toolbar.qml              |   5 +-
 resources/qml/ToolbarButton.qml        |   3 +-
 resources/themes/cura-light/styles.qml | 117 -------------------------
 3 files changed, 3 insertions(+), 122 deletions(-)

diff --git a/resources/qml/Toolbar.qml b/resources/qml/Toolbar.qml
index 3a4e7704c0..0207c8ec49 100644
--- a/resources/qml/Toolbar.qml
+++ b/resources/qml/Toolbar.qml
@@ -2,9 +2,7 @@
 // Cura is released under the terms of the LGPLv3 or higher.
 
 import QtQuick 2.2
-import QtQuick.Controls 1.1
-import QtQuick.Controls.Styles 1.1
-import QtQuick.Layouts 1.1
+import QtQuick.Controls 2.3
 
 import UM 1.2 as UM
 import Cura 1.0 as Cura
@@ -68,7 +66,6 @@ Item
 
                     toolItem: UM.RecolorImage
                     {
-                        opacity: parent.enabled ? 1.0 : 0.2
                         source: (UM.Theme.getIcon(model.icon) != "") ? UM.Theme.getIcon(model.icon) : "file:///" + model.location + "/" + model.icon
                         color: UM.Theme.getColor("toolbar_button_text")
 
diff --git a/resources/qml/ToolbarButton.qml b/resources/qml/ToolbarButton.qml
index 7241b489b6..b5e5aab475 100644
--- a/resources/qml/ToolbarButton.qml
+++ b/resources/qml/ToolbarButton.qml
@@ -29,7 +29,7 @@ Button
             }
             else if (base.checked)
             {
-                return "red" //UM.Theme.getColor("toolbar_button_active")
+                return UM.Theme.getColor("toolbar_button_active")
             }
             else if(base.hovered)
             {
@@ -81,6 +81,7 @@ Button
 
     contentItem: Item
     {
+        opacity: parent.enabled ? 1.0 : 0.2
         Loader
         {
             id: contentItemLoader
diff --git a/resources/themes/cura-light/styles.qml b/resources/themes/cura-light/styles.qml
index f00aab44c0..e040d91df9 100755
--- a/resources/themes/cura-light/styles.qml
+++ b/resources/themes/cura-light/styles.qml
@@ -171,123 +171,6 @@ QtObject
         }
     }
 
-    property Component toolbar_button: Component
-    {
-        ButtonStyle
-        {
-            background: Rectangle
-            {
-                implicitWidth: Theme.getSize("button").width
-                implicitHeight: Theme.getSize("button").height
-                color:
-                {
-                    if (control.checked && control.hovered)
-                    {
-                        return Theme.getColor("toolbar_button_active_hover")
-                    }
-                    else if (control.checked)
-                    {
-                        return Theme.getColor("toolbar_button_active")
-                    }
-                    else if(control.hovered)
-                    {
-                        return Theme.getColor("toolbar_button_hover")
-                    }
-                    return Theme.getColor("toolbar_background")
-                }
-                radius: UM.Theme.getSize("default_radius").width
-
-                Rectangle
-                {
-                    id: topSquare
-                    anchors
-                    {
-                        left: parent.left
-                        right: parent.right
-                        top: parent.top
-                    }
-                    height: parent.radius
-                    color: control.isFirstElement ? "transparent" : parent.color
-                }
-
-                Rectangle
-                {
-                    id: bottomSquare
-                    anchors
-                    {
-                        left: parent.left
-                        right: parent.right
-                        bottom: parent.bottom
-                    }
-                    height: parent.radius
-                    color: control.isLastElement ? "transparent" : parent.color
-                }
-
-                Rectangle
-                {
-                    id: leftSquare
-                    anchors
-                    {
-                        left: parent.left
-                        top: parent.top
-                        bottom: parent.bottom
-                    }
-                    width: parent.radius
-                    color: parent.color
-                }
-
-                // This is the tooltip
-                UM.PointingRectangle
-                {
-                    id: button_tooltip
-
-                    anchors.left: parent.right
-                    anchors.leftMargin: Theme.getSize("button_tooltip_arrow").width * 2
-                    anchors.verticalCenter: parent.verticalCenter
-
-                    target: Qt.point(parent.x, y + Math.round(height/2))
-                    arrowSize: Theme.getSize("button_tooltip_arrow").width
-                    color: Theme.getColor("button_tooltip")
-                    opacity: control.hovered ? 1.0 : 0.0;
-                    visible: control.text != ""
-
-                    width: control.hovered ? button_tip.width + Theme.getSize("button_tooltip").width : 0
-                    height: Theme.getSize("button_tooltip").height
-
-                    Behavior on width { NumberAnimation { duration: 100; } }
-                    Behavior on opacity { NumberAnimation { duration: 100; } }
-
-                    Label
-                    {
-                        id: button_tip
-
-                        anchors.horizontalCenter: parent.horizontalCenter
-                        anchors.verticalCenter: parent.verticalCenter;
-
-                        text: control.text;
-                        font: Theme.getFont("button_tooltip");
-                        color: Theme.getColor("tooltip_text");
-                    }
-                }
-            }
-
-            label: Item
-            {
-                UM.RecolorImage
-                {
-                    anchors.centerIn: parent;
-                    opacity: !control.enabled ? 0.2 : 1.0
-                    source: control.iconSource;
-                    width: Theme.getSize("button_icon").width;
-                    height: Theme.getSize("button_icon").height;
-                    color: Theme.getColor("toolbar_button_text");
-
-                    sourceSize: Theme.getSize("button_icon")
-                }
-            }
-        }
-    }
-
     property Component tool_button: Component
     {
         ButtonStyle