Remove most of controls 1 references from networking plugin

plugins/UM3NetworkPrinting/resources/qml/CameraButton.qml

@@ -3,7 +3,6 @@
 
 import QtQuick 2.3
 import QtQuick.Controls 2.4
-import QtQuick.Controls.Styles 1.3
 import UM 1.3 as UM
 import Cura 1.0 as Cura
 

plugins/UM3NetworkPrinting/resources/qml/GenericPopUp.qml

@@ -3,7 +3,6 @@
 
 import QtQuick 2.2
 import QtQuick.Controls 2.0
-import QtQuick.Controls.Styles 1.4
 import QtQuick.Dialogs 1.1
 import QtGraphicalEffects 1.0
 import UM 1.3 as UM

plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml

@@ -2,7 +2,7 @@
 // Cura is released under the terms of the LGPLv3 or higher.
 
 import QtQuick 2.3
-import QtQuick.Controls 1.4
+import QtQuick.Controls 2.4
 import QtQuick.Layouts 1.3
 import QtQuick.Dialogs 1.2
 import UM 1.5 as UM

plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml

@@ -2,8 +2,6 @@
 // Cura is released under the terms of the LGPLv3 or higher.
 
 import QtQuick 2.3
-import QtQuick.Controls.Styles 1.3
-import QtQuick.Controls 1.4
 import UM 1.5 as UM
 
 /**

plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterPill.qml

@@ -2,8 +2,7 @@
 // Cura is released under the terms of the LGPLv3 or higher.
 
 import QtQuick 2.2
-import QtQuick.Controls 1.4
+import UM 1.5 as UM
-import UM 1.2 as UM
 
 /**
  * A MonitorPrinterPill is a blue-colored tag indicating which printers a print
@@ -17,20 +16,19 @@ Item
     implicitHeight: 18 * screenScaleFactor // TODO: Theme!
     implicitWidth: Math.max(printerNameLabel.contentWidth + 12 * screenScaleFactor, 36 * screenScaleFactor) // TODO: Theme!
 
-    Rectangle {
+    Rectangle
+    {
         id: background
         anchors.fill: parent
         color: printerNameLabel.visible ? UM.Theme.getColor("monitor_printer_family_tag") : UM.Theme.getColor("monitor_skeleton_loading")
         radius: 2 * screenScaleFactor // TODO: Theme!
     }
 
-    Label {
+    UM.Label
+    {
         id: printerNameLabel
         anchors.centerIn: parent
-        color: UM.Theme.getColor("text")
         text: monitorPrinterPill.text
-        font.pointSize: 10 // TODO: Theme!
         visible: monitorPrinterPill.text !== ""
-        renderType: Text.NativeRendering
     }
 }

plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml

@@ -4,7 +4,7 @@
 import QtQuick 2.2
 import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4
-import UM 1.3 as UM
+import UM 1.5 as UM
 import Cura 1.0 as Cura
 
 /**
@@ -18,7 +18,7 @@ Item
     // they might not need to though.
     property bool cloudConnection: Cura.MachineManager.activeMachineIsUsingCloudConnection
 
-    Label
+    UM.Label
     {
         id: queuedLabel
         anchors
@@ -26,10 +26,8 @@ Item
             left: queuedPrintJobs.left
             top: parent.top
         }
-        color: UM.Theme.getColor("text")
         font: UM.Theme.getFont("large")
         text: catalog.i18nc("@label", "Queued")
-        renderType: Text.NativeRendering
     }
 
     Item
@@ -52,7 +50,7 @@ Item
             width: 16 * screenScaleFactor // TODO: Theme! (Y U NO USE 18 LIKE ALL OTHER ICONS?!)
             height: 16 * screenScaleFactor // TODO: Theme! (Y U NO USE 18 LIKE ALL OTHER ICONS?!)
         }
-        Label
+        UM.Label
         {
             id: manageQueueText
             anchors
@@ -64,7 +62,6 @@ Item
             color: UM.Theme.getColor("text_link")
             font: UM.Theme.getFont("medium") // 14pt, regular
             text: catalog.i18nc("@label link to connect manager", "Manage in browser")
-            renderType: Text.NativeRendering
         }
     }
 
@@ -72,14 +69,9 @@ Item
     {
         anchors.fill: manageQueueLabel
         onClicked: OutputDevice.openPrintJobControlPanel()
-        onEntered:
+        onEntered: manageQueueText.font.underline = true
-        {
+
-            manageQueueText.font.underline = true
+        onExited: manageQueueText.font.underline = false
-        }
-        onExited:
-        {
-            manageQueueText.font.underline = false
-        }
     }
 
     Row
@@ -94,50 +86,38 @@ Item
         }
         spacing: 18 * screenScaleFactor // TODO: Theme!
 
-        Label
+        UM.Label
         {
             text: catalog.i18nc("@label", "There are no print jobs in the queue. Slice and send a job to add one.")
-            color: UM.Theme.getColor("text")
             font: UM.Theme.getFont("medium")
             anchors.verticalCenter: parent.verticalCenter
-
-            renderType: Text.NativeRendering
             visible: printJobList.count === 0
         }
 
-        Label
+        UM.Label
         {
             text: catalog.i18nc("@label", "Print jobs")
-            color: UM.Theme.getColor("text")
             font: UM.Theme.getFont("medium") // 14pt, regular
             anchors.verticalCenter: parent.verticalCenter
             width: 284 * screenScaleFactor // TODO: Theme! (Should match column size)
-
-            renderType: Text.NativeRendering
             visible: printJobList.count > 0
         }
 
-        Label
+        UM.Label
         {
             text: catalog.i18nc("@label", "Total print time")
-            color: UM.Theme.getColor("text")
             font: UM.Theme.getFont("medium") // 14pt, regular
             anchors.verticalCenter: parent.verticalCenter
             width: UM.Theme.getSize("monitor_column").width
-
-            renderType: Text.NativeRendering
             visible: printJobList.count > 0
         }
 
-        Label
+        UM.Label
         {
             text: catalog.i18nc("@label", "Waiting for")
-            color: UM.Theme.getColor("text")
             font: UM.Theme.getFont("medium") // 14pt, regular
             anchors.verticalCenter: parent.verticalCenter
             width: UM.Theme.getSize("monitor_column").width
-
-            renderType: Text.NativeRendering
             visible: printJobList.count > 0
         }
     }

plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenuItem.qml

@@ -3,7 +3,6 @@
 
 import QtQuick 2.2
 import QtQuick.Controls 2.0
-import QtQuick.Controls.Styles 1.4
 import UM 1.5 as UM
 
 Button

plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml

@@ -2,8 +2,7 @@
 // Cura is released under the terms of the LGPLv3 or higher.
 import QtQuick 2.2
 import QtQuick.Window 2.2
-import QtQuick.Controls 1.1
+import QtQuick.Controls 2.15
-import QtQuick.Controls 2.15 as NewControls
 
 import UM 1.1 as UM
 
@@ -84,7 +83,7 @@ UM.Dialog {
             renderType: Text.NativeRendering;
         }
 
-        NewControls.ComboBox {
+        ComboBox {
             id: printerComboBox;
             currentIndex: 0;
             Behavior on height { NumberAnimation { duration: 100 } }