Revert "Add theme colors"

This reverts commit 2e5eb611442b992ca0da60dc22a9e16538c48fa9.

plugins/UM3NetworkPrinting/resources/qml/CameraButton.qml

@@ -9,35 +9,30 @@ import Cura 1.0 as Cura
 
 Rectangle {
     id: base
+    property var iconSource: null;
+    color: "#0a0850" // TODO: Theme!
+    height: width;
+    radius: Math.round(0.5 * width);
+    width: 24 * screenScaleFactor;
     property var enabled: true
-    property var iconSource: null
 
-    color: UM.Theme.getColor("small_button_active")
-    height: UM.Theme.getSize("small_button").height
-    radius: Math.round(0.5 * width)
-    width: UM.Theme.getSize("small_button").width
-
-    UM.RecolorImage
-    {
-        id: icon
-        anchors
-        {
-            horizontalCenter: parent.horizontalCenter
-            verticalCenter: parent.verticalCenter
+    UM.RecolorImage {
+        id: icon;
+        anchors {
+            horizontalCenter: parent.horizontalCenter;
+            verticalCenter: parent.verticalCenter;
         }
-        color: UM.Theme.getColor("small_button_text_active")
-        height: Math.round(parent.height / 2)
-        source: iconSource
-        width: Math.round(parent.width / 2)
+        color: UM.Theme.getColor("primary_text");
+        height: width;
+        source: iconSource;
+        width: Math.round(parent.width / 2);
     }
 
-    MouseArea
-    {
-        id: clickArea
-        anchors.fill: parent
+    MouseArea {
+        id: clickArea;
+        anchors.fill: parent;
         hoverEnabled: base.enabled
-        onClicked:
-        {
+        onClicked: {
             if (base.enabled)
             {
                 if (OutputDevice.activeCameraUrl != "")

plugins/UM3NetworkPrinting/resources/qml/ExpandableCard.qml

@@ -6,22 +6,21 @@ import QtQuick.Controls 2.0
 import UM 1.3 as UM
 import Cura 1.0 as Cura
 
-/**
- * The expandable component has 3 major sub components:
- *  - The headerItem Always visible and should hold some info about what happens if the component is expanded
- *  - The popupItem The content that needs to be shown if the component is expanded.
- */
+// TODO: Theme & documentation!
+// The expandable component has 3 major sub components:
+//      * The headerItem Always visible and should hold some info about what happens if the component is expanded
+//      * The popupItem The content that needs to be shown if the component is expanded.
 Item
 {
     id: base
 
     property bool expanded: false
     property bool enabled: true
-    property var borderWidth: UM.Theme.getSize("default_lining")
-    property color borderColor: UM.Theme.getColor("wide_lining")
-    property color headerBackgroundColor: UM.Theme.getColor("main_background")
-    property color headerHoverColor: UM.Theme.getColor("action_button_hovered")
-    property color drawerBackgroundColor: UM.Theme.getColor("main_background")
+    property var borderWidth: 1
+    property color borderColor: "#CCCCCC"
+    property color headerBackgroundColor: "white"
+    property color headerHoverColor: "#e8f2fc"
+    property color drawerBackgroundColor: "white"
     property alias headerItem: header.children
     property alias drawerItem: drawer.children
 
@@ -66,7 +65,7 @@ Item
         anchors
         {
             top: header.bottom
-            topMargin: UM.Theme.getSize("default_lining") * -1
+            topMargin: -1
         }
         border
         {

plugins/UM3NetworkPrinting/resources/qml/MonitorBuildplateConfiguration.qml

@@ -49,7 +49,7 @@ Item
             {
                 id: buildplateIcon
                 anchors.centerIn: parent
-                color: UM.Theme.getColor("small_button_active")
+                color: "#0a0850" // TODO: Theme! (Standard purple)
                 height: parent.height
                 source: "../svg/icons/buildplate.svg"
                 width: height
@@ -60,7 +60,7 @@ Item
         Label
         {
             id: buildplateLabel
-            color: UM.Theme.getColor("text")
+            color: "#191919" // TODO: Theme!
             elide: Text.ElideRight
             font: UM.Theme.getFont("default") // 12pt, regular
             text: buildplate ? buildplate : ""

plugins/UM3NetworkPrinting/resources/qml/MonitorCarousel.qml

@@ -82,9 +82,9 @@ Item
         onClicked: navigateTo(currentIndex - 1)
         background: Rectangle
         {
-            color: leftButton.hovered ? UM.Theme.getColor("action_button_hovered") : UM.Theme.getColor("action_button")
+            color: leftButton.hovered ? "#e8f2fc" : "#ffffff" // TODO: Theme!
             border.width: 1 * screenScaleFactor // TODO: Theme!
-            border.color: UM.Theme.getColor("wide_lining")
+            border.color: "#cccccc" // TODO: Theme!
             radius: 2 * screenScaleFactor // TODO: Theme!
         }
         contentItem: Item
@@ -94,10 +94,10 @@ Item
             {
                 anchors.centerIn: parent
                 width: 18 // TODO: Theme!
-                height: width
-                sourceSize.width: width
-                sourceSize.height: width
-                color: UM.Theme.getColor("text")
+                height: width // TODO: Theme!
+                sourceSize.width: width // TODO: Theme!
+                sourceSize.height: width // TODO: Theme!
+                color: "#152950" // TODO: Theme!
                 source: UM.Theme.getIcon("arrow_left")
             }
         }

plugins/UM3NetworkPrinting/resources/qml/MonitorExtruderConfiguration.qml

@@ -36,7 +36,7 @@ Item
     MonitorIconExtruder
     {
         id: extruderIcon
-        color: UM.Theme.getColor("secondary")
+        color: "#eeeeee" // TODO: Theme!
         position: 0
     }
 
@@ -48,8 +48,8 @@ Item
             left: extruderIcon.right
             leftMargin: 12 * screenScaleFactor // TODO: Theme!
         }
+        color: materialLabel.visible > 0 ? "transparent" : "#eeeeee" // TODO: Theme!
         height: 18 * screenScaleFactor // TODO: Theme!
-        color: materialLabel.visible > 0 ? "transparent" : UM.Theme.getColor("secondary")
         width: Math.max(materialLabel.contentWidth, 60 * screenScaleFactor) // TODO: Theme!
         radius: 2 * screenScaleFactor // TODO: Theme!
 
@@ -57,7 +57,7 @@ Item
         {
             id: materialLabel
             
-            color: UM.Theme.getColor("text")
+            color: "#191919" // TODO: Theme!
             elide: Text.ElideRight
             font: UM.Theme.getFont("default") // 12pt, regular
             text: ""
@@ -77,8 +77,8 @@ Item
             left: materialLabelWrapper.left
             bottom: parent.bottom
         }
+        color: printCoreLabel.visible > 0 ? "transparent" : "#eeeeee" // TODO: Theme!
         height: 18 * screenScaleFactor // TODO: Theme!
-        color: printCoreLabel.visible > 0 ? "transparent" : UM.Theme.getColor("secondary")
         width: Math.max(printCoreLabel.contentWidth, 36 * screenScaleFactor) // TODO: Theme!
         radius: 2 * screenScaleFactor // TODO: Theme!
 
@@ -86,7 +86,7 @@ Item
         {
             id: printCoreLabel
             
-            color: UM.Theme.getColor("text")
+            color: "#191919" // TODO: Theme!
             elide: Text.ElideRight
             font: UM.Theme.getFont("default_bold") // 12pt, bold
             text: ""

plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml

@@ -49,7 +49,7 @@ Item
                 width: 216 * screenScaleFactor // TODO: Theme! (Should match column size)
                 Rectangle
                 {
-                    color: UM.Theme.getColor("secondary")
+                    color: "#eeeeee"
                     width: Math.round(parent.width / 2)
                     height: parent.height
                     visible: !printJob
@@ -57,7 +57,7 @@ Item
                 Label
                 {
                     text: printJob && printJob.name ? printJob.name : ""
-                    color: UM.Theme.getColor("text")
+                    color: "#374355"
                     elide: Text.ElideRight
                     font: UM.Theme.getFont("medium") // 14pt, regular
                     visible: printJob
@@ -75,7 +75,7 @@ Item
                 width: 216 * screenScaleFactor // TODO: Theme! (Should match column size)
                 Rectangle
                 {
-                    color: UM.Theme.getColor("secondary")
+                    color: "#eeeeee"
                     width: Math.round(parent.width / 3)
                     height: parent.height
                     visible: !printJob
@@ -83,7 +83,7 @@ Item
                 Label
                 {
                     text: printJob ? OutputDevice.formatDuration(printJob.timeTotal) : ""
-                    color: UM.Theme.getColor("text")
+                    color: "#374355"
                     elide: Text.ElideRight
                     font: UM.Theme.getFont("medium") // 14pt, regular
                     visible: printJob
@@ -102,7 +102,7 @@ Item
 
                 Rectangle
                 {
-                    color: UM.Theme.getColor("secondary")
+                    color: "#eeeeee"
                     width: 72 * screenScaleFactor // TODO: Theme!
                     height: parent.height
                     visible: !printJob
@@ -112,7 +112,7 @@ Item
                 {
                     id: printerAssignmentLabel
                     anchors.verticalCenter: parent.verticalCenter
-                    color: UM.Theme.getColor("text")
+                    color: "#374355"
                     elide: Text.ElideRight
                     font: UM.Theme.getFont("medium") // 14pt, regular
                     text: {
@@ -186,7 +186,7 @@ Item
             }
             Label {
                 text: printJob && printJob.owner ? printJob.owner : ""
-                color: UM.Theme.getColor("text")
+                color: "#374355" // TODO: Theme!
                 elide: Text.ElideRight
                 font: UM.Theme.getFont("medium") // 14pt, regular
                 anchors.top: printerConfiguration.top

plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobPreview.qml

@@ -19,7 +19,7 @@ Item
     Rectangle
     {
         anchors.fill: parent
-        color: printJob ? "transparent" : UM.Theme.getColor("secondary")
+        color: printJob ? "transparent" : "#eeeeee" // TODO: Theme!
         radius: 8 // TODO: Theme!
         Image
         {

plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml

@@ -34,16 +34,16 @@ Item
         {
             background: Rectangle
             {
+                color: "#f5f5f5" // TODO: Theme!
                 implicitHeight: visible ? 8 * screenScaleFactor : 0 // TODO: Theme!
-                color: UM.Theme.getColor("progressbar_background")
                 implicitWidth: 180 * screenScaleFactor // TODO: Theme!
                 radius: 2 * screenScaleFactor // TODO: Theme!
             }
             progress: Rectangle
             {
                 id: progressItem;
+                color: printJob && printJob.isActive ? "#3282ff" : "#CCCCCC" // TODO: Theme!
                 radius: 2 * screenScaleFactor // TODO: Theme!
-                color: printJob && printJob.isActive ? UM.Theme.getColor("progressbar_control") : UM.Theme.getColor("progressbar_disabled")
             }
         }
     }
@@ -56,7 +56,7 @@ Item
             leftMargin: 18 * screenScaleFactor // TODO: Theme!
         }
         text: printJob ? Math.round(printJob.progress * 100) + "%" : "0%"
-        color: printJob && printJob.isActive ? UM.Theme.getColor("text") : UM.Theme.getColor("text_inactive")
+        color: printJob && printJob.isActive ? "#374355" : "#babac1" // TODO: Theme!
         width: contentWidth
         font: UM.Theme.getFont("medium") // 14pt, regular
 
@@ -72,7 +72,7 @@ Item
             left: percentLabel.right
             leftMargin: 18 * screenScaleFactor // TODO: Theme!
         }
-        color: UM.Theme.getColor("text")
+        color: "#374355" // TODO: Theme!
         font: UM.Theme.getFont("medium") // 14pt, regular
         text:
         {

plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml

@@ -69,7 +69,7 @@ Item
                 id: printerImage
                 width: 108 * screenScaleFactor // TODO: Theme!
                 height: 108 * screenScaleFactor // TODO: Theme!
-                color: printer ? "transparent" : UM.Theme.getColor("secondary")
+                color: printer ? "transparent" : "#eeeeee" // TODO: Theme!
                 radius: 8 // TODO: Theme!
                 Image
                 {
@@ -94,8 +94,8 @@ Item
                 {
                     id: printerNameLabel
                     // color: "#414054" // TODO: Theme!
+                    color: printer ? "transparent" : "#eeeeee" // TODO: Theme!
                     height: 18 * screenScaleFactor // TODO: Theme!
-                    color: printer ? "transparent" : UM.Theme.getColor("secondary")
                     width: parent.width
                     radius: 2 * screenScaleFactor // TODO: Theme!
                     
@@ -116,8 +116,8 @@ Item
 
                 Rectangle
                 {
+                    color: "#eeeeee" // TODO: Theme!
                     height: 18 * screenScaleFactor // TODO: Theme!
-                    color: UM.Theme.getColor("secondary")
                     radius: 2 * screenScaleFactor // TODO: Theme!
                     visible: !printer
                     width: 48 * screenScaleFactor // TODO: Theme!

plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterConfiguration.qml

@@ -37,7 +37,7 @@ Item
 
             MonitorExtruderConfiguration
             {
-                color: modelData && modelData.activeMaterial ? modelData.activeMaterial.color : UM.Theme.getColor("secondary")
+                color: modelData && modelData.activeMaterial ? modelData.activeMaterial.color : "#eeeeee" // TODO: Theme!
                 material: modelData && modelData.activeMaterial ? modelData.activeMaterial.name : ""
                 position: modelData && typeof(modelData.position) === "number" ? modelData.position : -1 // Use negative one to create empty extruder number
                 printCore: modelData ? modelData.hotendID : ""