From 2019d8f3af63ff28a566c2953aca6ca4553f7252 Mon Sep 17 00:00:00 2001
From: Joey de l'Arago <joeydelarago@gmail.com>
Date: Fri, 4 Nov 2022 15:11:04 +0100
Subject: [PATCH] Start MachineSelector refactor by allowing list model to be
 passed in.

CURA-9424
---
 plugins/MonitorStage/MonitorMenu.qml                  | 2 ++
 plugins/PrepareStage/PrepareMenu.qml                  | 2 ++
 resources/qml/PrinterSelector/MachineSelector.qml     | 5 ++++-
 resources/qml/PrinterSelector/MachineSelectorList.qml | 1 -
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/plugins/MonitorStage/MonitorMenu.qml b/plugins/MonitorStage/MonitorMenu.qml
index bc95c276e8..ba99c3119e 100644
--- a/plugins/MonitorStage/MonitorMenu.qml
+++ b/plugins/MonitorStage/MonitorMenu.qml
@@ -19,5 +19,7 @@ Item
         width: UM.Theme.getSize("machine_selector_widget").width
         height: parent.height
         anchors.centerIn: parent
+
+        machineListModel: Cura.MachineListModel {}
     }
 }
\ No newline at end of file
diff --git a/plugins/PrepareStage/PrepareMenu.qml b/plugins/PrepareStage/PrepareMenu.qml
index 42c3c8dde6..01e378c2d4 100644
--- a/plugins/PrepareStage/PrepareMenu.qml
+++ b/plugins/PrepareStage/PrepareMenu.qml
@@ -55,6 +55,8 @@ Item
                 Layout.preferredWidth: parent.machineSelectorWidth
                 Layout.fillWidth: true
                 Layout.fillHeight: true
+
+                machineListModel: Cura.MachineListModel {}
             }
 
             Cura.ConfigurationMenu
diff --git a/resources/qml/PrinterSelector/MachineSelector.qml b/resources/qml/PrinterSelector/MachineSelector.qml
index 0008529408..ef9112eead 100644
--- a/resources/qml/PrinterSelector/MachineSelector.qml
+++ b/resources/qml/PrinterSelector/MachineSelector.qml
@@ -16,6 +16,8 @@ Cura.ExpandablePopup
     property bool isCloudRegistered: Cura.MachineManager.activeMachineHasCloudRegistration
     property bool isGroup: Cura.MachineManager.activeMachineIsGroup
 
+    property alias machineListModel: machineSelectorList.model
+
     readonly property string connectionStatus: {
         if (isNetworkPrinter)
         {
@@ -156,7 +158,8 @@ Cura.ExpandablePopup
 
         }
 
-        MouseArea // Connection status tooltip hover area
+        // Connection status tooltip hover area
+        MouseArea
         {
             id: connectionStatusTooltipHoverArea
             anchors.fill: parent
diff --git a/resources/qml/PrinterSelector/MachineSelectorList.qml b/resources/qml/PrinterSelector/MachineSelectorList.qml
index a328ae69d9..0fa19a51ff 100644
--- a/resources/qml/PrinterSelector/MachineSelectorList.qml
+++ b/resources/qml/PrinterSelector/MachineSelectorList.qml
@@ -10,7 +10,6 @@ import Cura 1.0 as Cura
 ListView
 {
     id: listView
-    model: Cura.MachineListModel {}
     section.property: "isOnline"
     property real contentHeight: childrenRect.height