mirror of
https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura
synced 2025-09-15 07:33:15 +08:00
Start MachineSelector refactor by allowing list model to be passed in.
CURA-9424
This commit is contained in:
parent
f8ed660d58
commit
2019d8f3af
@ -19,5 +19,7 @@ Item
|
|||||||
width: UM.Theme.getSize("machine_selector_widget").width
|
width: UM.Theme.getSize("machine_selector_widget").width
|
||||||
height: parent.height
|
height: parent.height
|
||||||
anchors.centerIn: parent
|
anchors.centerIn: parent
|
||||||
|
|
||||||
|
machineListModel: Cura.MachineListModel {}
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -55,6 +55,8 @@ Item
|
|||||||
Layout.preferredWidth: parent.machineSelectorWidth
|
Layout.preferredWidth: parent.machineSelectorWidth
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
Layout.fillHeight: true
|
Layout.fillHeight: true
|
||||||
|
|
||||||
|
machineListModel: Cura.MachineListModel {}
|
||||||
}
|
}
|
||||||
|
|
||||||
Cura.ConfigurationMenu
|
Cura.ConfigurationMenu
|
||||||
|
@ -16,6 +16,8 @@ Cura.ExpandablePopup
|
|||||||
property bool isCloudRegistered: Cura.MachineManager.activeMachineHasCloudRegistration
|
property bool isCloudRegistered: Cura.MachineManager.activeMachineHasCloudRegistration
|
||||||
property bool isGroup: Cura.MachineManager.activeMachineIsGroup
|
property bool isGroup: Cura.MachineManager.activeMachineIsGroup
|
||||||
|
|
||||||
|
property alias machineListModel: machineSelectorList.model
|
||||||
|
|
||||||
readonly property string connectionStatus: {
|
readonly property string connectionStatus: {
|
||||||
if (isNetworkPrinter)
|
if (isNetworkPrinter)
|
||||||
{
|
{
|
||||||
@ -156,7 +158,8 @@ Cura.ExpandablePopup
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
MouseArea // Connection status tooltip hover area
|
// Connection status tooltip hover area
|
||||||
|
MouseArea
|
||||||
{
|
{
|
||||||
id: connectionStatusTooltipHoverArea
|
id: connectionStatusTooltipHoverArea
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
|
@ -10,7 +10,6 @@ import Cura 1.0 as Cura
|
|||||||
ListView
|
ListView
|
||||||
{
|
{
|
||||||
id: listView
|
id: listView
|
||||||
model: Cura.MachineListModel {}
|
|
||||||
section.property: "isOnline"
|
section.property: "isOnline"
|
||||||
property real contentHeight: childrenRect.height
|
property real contentHeight: childrenRect.height
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user