Merge branch 'master' into fix_simple_mode_disabled_features

# Conflicts:
#	resources/qml/SidebarSimple.qml

resources/qml/MonitorButton.qml

@@ -220,7 +220,7 @@ Item
             property bool userClicked: false
             property string lastJobState: ""
 
-            visible: printerConnected
+            visible: printerConnected && Cura.MachineManager.printerOutputDevices[0].canPause
             enabled: (!userClicked) && printerConnected && Cura.MachineManager.printerOutputDevices[0].acceptsCommands &&
                      (["paused", "printing"].indexOf(Cura.MachineManager.printerOutputDevices[0].jobState) >= 0)
 
@@ -261,7 +261,7 @@ Item
         {
             id: abortButton
 
-            visible: printerConnected
+            visible: printerConnected && Cura.MachineManager.printerOutputDevices[0].canAbort
             enabled: printerConnected && Cura.MachineManager.printerOutputDevices[0].acceptsCommands &&
                      (["paused", "printing", "pre_print"].indexOf(Cura.MachineManager.printerOutputDevices[0].jobState) >= 0)
 

resources/qml/PrintMonitor.qml

@@ -388,7 +388,7 @@ Column
             anchors.bottomMargin: UM.Theme.getSize("default_margin").height
             width: UM.Theme.getSize("setting_control").width
             height: UM.Theme.getSize("setting_control").height
-
+            visible: connectedPrinter != null ? connectedPrinter.canPreHeatBed: true
             Rectangle //Highlight of input field.
             {
                 anchors.fill: parent
@@ -511,6 +511,7 @@ Column
         {
             id: preheatButton
             height: UM.Theme.getSize("setting_control").height
+            visible: connectedPrinter != null ? connectedPrinter.canPreHeatBed: true
             enabled:
             {
                 if (!preheatTemperatureControl.enabled)

resources/qml/SidebarSimple.qml

@@ -425,7 +425,7 @@ Item
                 property alias _hovered: adhesionMouseArea.containsMouse
 
                 anchors.top: enableSupportCheckBox.visible ? supportExtruderCombobox.bottom : infillCellRight.bottom
-                anchors.topMargin: UM.Theme.getSize("sidebar_margin").height * 2
+                anchors.topMargin: UM.Theme.getSize("sidebar_margin").height
                 anchors.left: infillCellRight.left
 
                 //: Setting enable printing build-plate adhesion helper checkbox