3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-16 11:17:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Add tooltips for firmware update back, fix print job override state

Browse source
This commit is contained in:
ChrisTerBeke 2019-08-15 19:42:25 +02:00
parent 36f6bdca18
commit de3f82610a
No known key found for this signature in database
GPG key ID: A49F1AB9D7E0C263
5 changed files with 18 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

14
plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml
View file

@ -64,6 +64,7 @@ Item
visible: printJob visible: printJob
// FIXED-LINE-HEIGHT: // FIXED-LINE-HEIGHT:
width: parent.width
height: parent.height height: parent.height
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
renderType: Text.NativeRendering renderType: Text.NativeRendering
@ -241,11 +242,10 @@ Item
enabled: !contextMenuButton.enabled enabled: !contextMenuButton.enabled
} }
// TODO: uncomment this tooltip as soon as the required firmware is released MonitorInfoBlurb
// MonitorInfoBlurb {
// { id: contextMenuDisabledInfo
// id: contextMenuDisabledInfo text: catalog.i18nc("@info", "Please update your printer's firmware to manage the queue remotely.")
// text: catalog.i18nc("@info", "Please update your printer's firmware to manage the queue remotely.") target: contextMenuButton
// target: contextMenuButton }
// }
} }

13
plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml
View file

@ -250,13 +250,12 @@ Item
enabled: !contextMenuButton.enabled enabled: !contextMenuButton.enabled
} }
// TODO: uncomment this tooltip as soon as the required firmware is released MonitorInfoBlurb
// MonitorInfoBlurb {
// { id: contextMenuDisabledInfo
// id: contextMenuDisabledInfo text: catalog.i18nc("@info", "Please update your printer's firmware to manage the queue remotely.")
// text: catalog.i18nc("@info", "Please update your printer's firmware to manage the queue remotely.") target: contextMenuButton
// target: contextMenuButton }
// }
CameraButton CameraButton
{ {

1
plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml
View file

@ -102,7 +102,6 @@ Item
elide: Text.ElideRight elide: Text.ElideRight
font: UM.Theme.getFont("medium") // 14pt, regular font: UM.Theme.getFont("medium") // 14pt, regular
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
width: 600 * screenScaleFactor // TODO: Theme! (Should match column size)
// FIXED-LINE-HEIGHT: // FIXED-LINE-HEIGHT:
height: 18 * screenScaleFactor // TODO: Theme! height: 18 * screenScaleFactor // TODO: Theme!

2
plugins/UM3NetworkPrinting/src/Cloud/CloudApiClient.py
View file

@ -56,7 +56,7 @@ class CloudApiClient:
## Retrieves all the clusters for the user that is currently logged in. ## Retrieves all the clusters for the user that is currently logged in.
# \param on_finished: The function to be called after the result is parsed. # \param on_finished: The function to be called after the result is parsed.
def getClusters(self, on_finished: Callable[[List[CloudClusterResponse]], Any]) -> None: def getClusters(self, on_finished: Callable[[List[CloudClusterResponse]], Any]) -> None:
url = "{}/clusters".format(self.CLUSTER_API_ROOT) url = "{}/clusters?status=active".format(self.CLUSTER_API_ROOT)
reply = self._manager.get(self._createEmptyRequest(url)) reply = self._manager.get(self._createEmptyRequest(url))
self._addCallback(reply, on_finished, CloudClusterResponse) self._addCallback(reply, on_finished, CloudClusterResponse)

4
plugins/UM3NetworkPrinting/src/UltimakerNetworkedPrinterOutputDevice.py
View file

@ -299,6 +299,8 @@ class UltimakerNetworkedPrinterOutputDevice(NetworkedPrinterOutputDevice):
print_job_data.updateOutputModel(print_job) print_job_data.updateOutputModel(print_job)
if print_job_data.printer_uuid: if print_job_data.printer_uuid:
self._updateAssignedPrinter(print_job, print_job_data.printer_uuid) self._updateAssignedPrinter(print_job, print_job_data.printer_uuid)
if print_job_data.assigned_to:
self._updateAssignedPrinter(print_job, print_job_data.assigned_to)
new_print_jobs.append(print_job) new_print_jobs.append(print_job)
# Check which print job need to be removed (de-referenced). # Check which print job need to be removed (de-referenced).
@ -317,6 +319,8 @@ class UltimakerNetworkedPrinterOutputDevice(NetworkedPrinterOutputDevice):
model = remote_job.createOutputModel(ClusterOutputController(self)) model = remote_job.createOutputModel(ClusterOutputController(self))
if remote_job.printer_uuid: if remote_job.printer_uuid:
self._updateAssignedPrinter(model, remote_job.printer_uuid) self._updateAssignedPrinter(model, remote_job.printer_uuid)
if remote_job.assigned_to:
self._updateAssignedPrinter(model, remote_job.assigned_to)
return model return model
## Updates the printer assignment for the given print job model. ## Updates the printer assignment for the given print job model.