Fix merge conflicts with master

1 files changed, 35 insertions, 36 deletions

diff --git a/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml b/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml
index d817450f41..b8c6b78004 100644
--- a/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml
+++ b/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml
@@ -3,6 +3,7 @@
 
 import QtQuick 2.10
 import QtQuick.Controls 2.3
+import QtQuick.Layouts 1.3
 
 import UM 1.3 as UM
 import Cura 1.1 as Cura
@@ -16,10 +17,6 @@ Item
     id: base
     UM.I18nCatalog { id: catalog; name: "cura" }
 
-    anchors.left: parent.left
-    anchors.right: parent.right
-    anchors.top: parent.top
-
     property int columnWidth: ((parent.width - 2 * UM.Theme.getSize("default_margin").width) / 2) | 0
     property int columnSpacing: 3 * screenScaleFactor
     property int propertyStoreIndex: manager ? manager.storeContainerIndex : 1  // definition_changes
@@ -32,24 +29,25 @@ Item
 
     property var forceUpdateFunction: manager.forceUpdate
 
-    Item
+    RowLayout
     {
         id: upperBlock
-        anchors.top: parent.top
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.margins: UM.Theme.getSize("default_margin").width
-
-        height: childrenRect.height
-
+        anchors
+        {
+            top: parent.top
+            left: parent.left
+            right: parent.right
+            margins: UM.Theme.getSize("default_margin").width
+        }
+        spacing: UM.Theme.getSize("default_margin").width
+        
         // =======================================
         // Left-side column for "Printer Settings"
         // =======================================
         Column
         {
-            anchors.top: parent.top
-            anchors.left: parent.left
-            width: base.columnWidth
+            Layout.fillWidth: true
+            Layout.alignment: Qt.AlignTop
 
             spacing: base.columnSpacing
 
@@ -177,9 +175,8 @@ Item
         // =======================================
         Column
         {
-            anchors.top: parent.top
-            anchors.right: parent.right
-            width: base.columnWidth
+            Layout.fillWidth: true
+            Layout.alignment: Qt.AlignTop
 
             spacing: base.columnSpacing
 
@@ -208,6 +205,7 @@ Item
                 axisName: "x"
                 axisMinOrMax: "min"
                 allowNegativeValue: true
+                allowPositiveValue: false
 
                 forceUpdateOnChangeFunction: forceUpdateFunction
             }
@@ -227,6 +225,7 @@ Item
                 axisName: "y"
                 axisMinOrMax: "min"
                 allowNegativeValue: true
+                allowPositiveValue: false
 
                 forceUpdateOnChangeFunction: forceUpdateFunction
             }
@@ -245,7 +244,8 @@ Item
 
                 axisName: "x"
                 axisMinOrMax: "max"
-                allowNegativeValue: true
+                allowNegativeValue: false
+                allowPositiveValue: true
 
                 forceUpdateOnChangeFunction: forceUpdateFunction
             }
@@ -266,7 +266,8 @@ Item
 
                 axisName: "y"
                 axisMinOrMax: "max"
-                allowNegativeValue: true
+                allowNegativeValue: false
+                allowPositiveValue: true
 
                 forceUpdateOnChangeFunction: forceUpdateFunction
             }
@@ -333,22 +334,23 @@ Item
         }
     }
 
-    Item  // Start and End G-code
+    RowLayout  // Start and End G-code
     {
         id: lowerBlock
-        anchors.top: upperBlock.bottom
-        anchors.bottom: parent.bottom
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.margins: UM.Theme.getSize("default_margin").width
+        spacing: UM.Theme.getSize("default_margin").width
+        anchors
+        {
+            top: upperBlock.bottom
+            bottom: parent.bottom
+            left: parent.left
+            right: parent.right
+            margins: UM.Theme.getSize("default_margin").width
+        }
 
         Cura.GcodeTextArea   // "Start G-code"
         {
-            anchors.top: parent.top
-            anchors.bottom: parent.bottom
-            anchors.bottomMargin: UM.Theme.getSize("default_margin").height
-            anchors.left: parent.left
-            width: base.columnWidth - UM.Theme.getSize("default_margin").width
+            Layout.fillWidth: true
+            Layout.fillHeight: true
 
             labelText: catalog.i18nc("@title:label", "Start G-code")
             containerStackId: machineStackId
@@ -358,11 +360,8 @@ Item
 
         Cura.GcodeTextArea   // "End G-code"
         {
-            anchors.top: parent.top
-            anchors.bottom: parent.bottom
-            anchors.bottomMargin: UM.Theme.getSize("default_margin").height
-            anchors.right: parent.right
-            width: base.columnWidth - UM.Theme.getSize("default_margin").width
+            Layout.fillWidth: true
+            Layout.fillHeight: true
 
             labelText: catalog.i18nc("@title:label", "End G-code")
             containerStackId: machineStackId