Merge branch 'master' into CURA-8979_Materials_Preference_Page

# Conflicts:
#	resources/qml/Preferences/ProfilesPage.qml

plugins/USBPrinting/MonitorItem.qml

@@ -21,7 +21,10 @@ Component
 
             Cura.PrintMonitor
             {
-                anchors.fill: parent
+                anchors.top: parent.top
+                anchors.left: parent.left
+                anchors.right: parent.right
+                anchors.bottom: footerSeparator.top
             }
 
             Rectangle

resources/qml/MonitorButton.qml

@@ -316,7 +316,7 @@ Item
             height: UM.Theme.getSize("save_button_save_to_button").height
 
             text: catalog.i18nc("@label", "Abort Print")
-            onClicked: confirmationDialog.visible = true
+            onClicked: confirmationDialog.open()
         }
 
         Cura.MessageDialog
@@ -325,7 +325,7 @@ Item
 
             title: catalog.i18nc("@window:title", "Abort print")
             text: catalog.i18nc("@label", "Are you sure you want to abort the print?")
-            standardButtons: Dialog.Yes | Dialog.No
+            standardButtons: Cura.MessageDialog.Yes | Cura.MessageDialog.No
             onAccepted: activePrintJob.setState("abort")
         }
     }

resources/qml/PrintMonitor.qml

@@ -3,17 +3,33 @@
 
 import QtQuick 2.7
 import QtQuick.Layouts 1.1
+import QtQuick.Controls 2.15
 
-import UM 1.2 as UM
+import UM 1.5 as UM
 import Cura 1.0 as Cura
 
 import "PrinterOutput"
 
-
-Item
+ScrollView
 {
     id: base
-    UM.I18nCatalog { id: catalog; name: "cura"}
+    width: parent.width
+    height: parent.height
+
+    contentHeight: printMonitor.height
+
+    ScrollBar.vertical: UM.ScrollBar
+    {
+        id: scrollbar
+        parent: base
+        anchors
+        {
+            right: parent.right
+            top: parent.top
+            bottom: parent.bottom
+        }
+    }
+    clip: true
 
     function showTooltip(item, position, text)
     {
@@ -51,7 +67,9 @@ Item
     {
         id: printMonitor
 
-        anchors.fill: parent
+        UM.I18nCatalog { id: catalog; name: "cura" }
+
+        width: parent.width - scrollbar.width
 
         property var extrudersModel: CuraApplication.getExtrudersModel()