Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown

Conflicts:
	plugins/PrepareStage/PrepareMenu.qml: Some indentation change caused it to misalign the diffs, thinking it couldn't merge two of the same lines which actually weren't the same lines.
	resources/qml/Menus/ConfigurationMenu/QuickConfigurationSelector.qml: This file was deleted in my branch. I'm holding for the new version.

1 files changed, 44 insertions, 56 deletions

diff --git a/plugins/PrepareStage/PrepareMenu.qml b/plugins/PrepareStage/PrepareMenu.qml
index 6b241e1da2..0f059506dc 100644
--- a/plugins/PrepareStage/PrepareMenu.qml
+++ b/plugins/PrepareStage/PrepareMenu.qml
@@ -24,74 +24,62 @@ Item
     Item
     {
         anchors.horizontalCenter: parent.horizontalCenter
-        width: openFileButtonBackground.width + itemRowBackground.width
+        width: openFileButtonBackground.width + itemRow.width + UM.Theme.getSize("default_margin").width
         height: parent.height
 
-        Rectangle
+        RowLayout
         {
-            id: itemRowBackground
-            radius: UM.Theme.getSize("default_radius").width
+            id: itemRow
 
-            color: UM.Theme.getColor("toolbar_background")
+            anchors.left: openFileButtonBackground.right
+            anchors.leftMargin: UM.Theme.getSize("default_margin").width
 
-            width: itemRow.width + UM.Theme.getSize("default_margin").width
+            width: Math.round(0.9 * prepareMenu.width)
             height: parent.height
+            spacing: 0
 
-            anchors.left: openFileButtonBackground.right
-            anchors.leftMargin: UM.Theme.getSize("default_margin").width
+            Cura.MachineSelector
+            {
+                id: machineSelection
+                z: openFileButtonBackground.z - 1 //Ensure that the tooltip of the open file button stays above the item row.
+                headerCornerSide: Cura.RoundedRectangle.Direction.Left
+                Layout.minimumWidth: UM.Theme.getSize("machine_selector_widget").width
+                Layout.maximumWidth: UM.Theme.getSize("machine_selector_widget").width
+                Layout.fillWidth: true
+                Layout.fillHeight: true
+            }
 
-            RowLayout
+            // Separator line
+            Rectangle
             {
-                id: itemRow
+                height: parent.height
+                width: UM.Theme.getSize("default_lining").width
+                color: UM.Theme.getColor("lining")
+            }
 
-                anchors.centerIn: parent
+            Cura.ConfigurationMenu
+            {
+                Layout.fillHeight: true
+                Layout.fillWidth: true
+                Layout.preferredWidth: itemRow.width - machineSelection.width - printSetupSelectorItem.width - 2 * UM.Theme.getSize("default_lining").width
+            }
 
-                width: 0.9 * prepareMenu.width
+            // Separator line
+            Rectangle
+            {
                 height: parent.height
-                spacing: 0
-
-                Cura.MachineSelector
-                {
-                    id: machineSelection
-                    z: openFileButtonBackground.z - 1 //Ensure that the tooltip of the open file button stays above the item row.
-                    Layout.minimumWidth: UM.Theme.getSize("machine_selector_widget").width
-                    Layout.maximumWidth: UM.Theme.getSize("machine_selector_widget").width
-                    Layout.fillWidth: true
-                    Layout.fillHeight: true
-                }
-
-                // Separator line
-                Rectangle
-                {
-                    height: parent.height
-                    width: UM.Theme.getSize("default_lining").width
-                    color: UM.Theme.getColor("lining")
-                }
-
-                Cura.ConfigurationMenu
-                {
-                    Layout.fillHeight: true
-                    Layout.fillWidth: true
-                    Layout.preferredWidth: itemRow.width - machineSelection.width - printSetupSelectorItem.width - 2 * UM.Theme.getSize("default_lining").width
-                }
-
-                // Separator line
-                Rectangle
-                {
-                    height: parent.height
-                    width: UM.Theme.getSize("default_lining").width
-                    color: UM.Theme.getColor("lining")
-                }
-
-                Item
-                {
-                    id: printSetupSelectorItem
-                    // This is a work around to prevent the printSetupSelector from having to be re-loaded every time
-                    // a stage switch is done.
-                    children: [printSetupSelector]
-                    height: childrenRect.height
-                    width: childrenRect.width
-                }
+                width: UM.Theme.getSize("default_lining").width
+                color: UM.Theme.getColor("lining")
+            }
+
+            Item
+            {
+                id: printSetupSelectorItem
+                // This is a work around to prevent the printSetupSelector from having to be re-loaded every time
+                // a stage switch is done.
+                children: [printSetupSelector]
+                height: childrenRect.height
+                width: childrenRect.width
             }
         }