Merge remote-tracking branch 'origin/master' into WIP_improve_initialization

This commit is contained in:
Lipu Fei 2018-05-31 13:47:27 +02:00
commit eb949472e8
28 changed files with 272 additions and 153 deletions

View file

@ -148,6 +148,10 @@ class ClusterUM3OutputDevice(NetworkedPrinterOutputDevice):
def selectPrinter(self, target_printer: str = "") -> None:
self._sending_job.send(target_printer)
@pyqtSlot()
def cancelPrintSelection(self) -> None:
self._sending_gcode = False
## Greenlet to send a job to the printer over the network.
#
# This greenlet gets called asynchronously in requestWrite. It is a

View file

@ -90,6 +90,7 @@ UM.Dialog
onClicked: {
base.visible = false;
printerSelectionCombobox.currentIndex = 0
OutputDevice.cancelPrintSelection()
}
}
]