Move active view panel to previewStage

CURA-5829

plugins/PreviewStage/PreviewMenu.qml

@@ -21,6 +21,8 @@ Item
     Row
     {
         anchors.horizontalCenter: parent.horizontalCenter
+        spacing: UM.Theme.getSize("default_margin").width
+
         ComboBox
         {
             // This item contains the views selector, a combobox that is dynamically created from
@@ -67,6 +69,19 @@ Item
             currentIndex: getActiveIndex()
         }
 
+        Loader
+        {
+            // TODO: Make this panel collapsable and ensure it has a standardised background.
+            id: viewPanel
+
+            property var buttonTarget: Qt.point(viewModeButton.x + Math.round(viewModeButton.width / 2), viewModeButton.y + Math.round(viewModeButton.height / 2))
+
+            height: childrenRect.height
+            width: childrenRect.width
+
+            source: UM.ActiveView.valid ? UM.ActiveView.activeViewPanel : ""
+        }
+
         Cura.PrintSetupSelector
         {
             width: UM.Theme.getSize("print_setup_widget").width

resources/qml/Cura.qml

@@ -230,22 +230,6 @@ UM.MainWindow
                 }
             }
 
-            Loader
-            {
-                id: viewPanel
-
-                anchors.bottom: viewModeButton.top
-                anchors.topMargin: UM.Theme.getSize("default_margin").height
-                anchors.right: viewModeButton.right
-
-                property var buttonTarget: Qt.point(viewModeButton.x + Math.round(viewModeButton.width / 2), viewModeButton.y + Math.round(viewModeButton.height / 2))
-
-                height: childrenRect.height
-                width: childrenRect.width
-
-                source: UM.ActiveView.valid ? UM.ActiveView.activeViewPanel : ""
-            }
-
             Cura.ActionPanelWidget
             {
                 anchors.right: parent.right