GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 04:59:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use new property names for cloud connection detection

Browse Source
This commit is contained in:
Ian Paschal 2019-02-20 14:08:13 +01:00
parent 163a231365
commit a5761cb56b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/MonitorStage/MonitorMain.qml
View File

@ -11,7 +11,7 @@ Rectangle
{ {
id: viewportOverlay id: viewportOverlay
property bool isConnected: Cura.MachineManager.activeMachineHasActiveNetworkConnection || Cura.MachineManager.activeMachineHasActiveCloudConnection property bool isConnected: Cura.MachineManager.activeMachineIsUsingCloudConnection
property bool isNetworkConfigurable: ["Ultimaker 3", "Ultimaker 3 Extended", "Ultimaker S5"].indexOf(Cura.MachineManager.activeMachineDefinitionName) > -1 property bool isNetworkConfigurable: ["Ultimaker 3", "Ultimaker 3 Extended", "Ultimaker S5"].indexOf(Cura.MachineManager.activeMachineDefinitionName) > -1
property bool isNetworkConfigured: property bool isNetworkConfigured:
{ {

4
plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml
View File

@ -171,11 +171,11 @@ Item
// When printing over the cloud we don't recieve print jobs until there is one, so // When printing over the cloud we don't recieve print jobs until there is one, so
// unless there's at least one print job we'll be stuck with skeleton loading // unless there's at least one print job we'll be stuck with skeleton loading
// indefinitely. // indefinitely.
if (Cura.MachineManager.activeMachineHasActiveCloudConnection) if (Cura.MachineManager.activeMachineIsUsingCloudConnection || OutputDevice.receivedPrintJobs)
{ {
return OutputDevice.queuedPrintJobs return OutputDevice.queuedPrintJobs
} }
return OutputDevice.receivedPrintJobs ? OutputDevice.queuedPrintJobs : [null,null] return [null, null]
} }
spacing: 6 // TODO: Theme! spacing: 6 // TODO: Theme!
} }