mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-08 15:37:27 -06:00
Merge branch 'master' of github.com:Ultimaker/JediWifiPrintingPlugin
This commit is contained in:
commit
9bc50c59e5
2 changed files with 5 additions and 4 deletions
|
@ -20,7 +20,7 @@ Cura.MachineAction
|
||||||
onNextClicked:
|
onNextClicked:
|
||||||
{
|
{
|
||||||
// Connect to the printer if the MachineAction is currently shown
|
// Connect to the printer if the MachineAction is currently shown
|
||||||
if(base.parent == dialog)
|
if(base.parent.wizard == dialog)
|
||||||
{
|
{
|
||||||
connectToPrinter();
|
connectToPrinter();
|
||||||
}
|
}
|
||||||
|
|
|
@ -587,13 +587,14 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
|
||||||
return user
|
return user
|
||||||
return "Unknown User" # Couldn't find out username.
|
return "Unknown User" # Couldn't find out username.
|
||||||
|
|
||||||
def _progressMessageActionTrigger(self, message_id = None, action_id="abort"):
|
def _progressMessageActionTrigger(self, message_id = None, action_id = None):
|
||||||
if action_id == "abort":
|
if action_id == "Abort":
|
||||||
Logger.log("d", "User aborted sending print to remote.")
|
Logger.log("d", "User aborted sending print to remote.")
|
||||||
self._progress_message.hide()
|
self._progress_message.hide()
|
||||||
self._compressing_print = False
|
self._compressing_print = False
|
||||||
if self._post_reply:
|
if self._post_reply:
|
||||||
self._post_reply.abort()
|
self._post_reply.abort()
|
||||||
|
Application.getInstance().showPrintMonitor.emit(False)
|
||||||
|
|
||||||
## Attempt to start a new print.
|
## Attempt to start a new print.
|
||||||
# This function can fail to actually start a print due to not being authenticated or another print already
|
# This function can fail to actually start a print due to not being authenticated or another print already
|
||||||
|
@ -602,7 +603,7 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
|
||||||
try:
|
try:
|
||||||
self._send_gcode_start = time()
|
self._send_gcode_start = time()
|
||||||
self._progress_message = Message(i18n_catalog.i18nc("@info:status", "Sending data to printer"), 0, False, -1)
|
self._progress_message = Message(i18n_catalog.i18nc("@info:status", "Sending data to printer"), 0, False, -1)
|
||||||
self._progress_message.addAction("abort", i18n_catalog.i18nc("@action:button", "Cancel"), None, "")
|
self._progress_message.addAction("Abort", i18n_catalog.i18nc("@action:button", "Cancel"), None, "")
|
||||||
self._progress_message.actionTriggered.connect(self._progressMessageActionTrigger)
|
self._progress_message.actionTriggered.connect(self._progressMessageActionTrigger)
|
||||||
self._progress_message.show()
|
self._progress_message.show()
|
||||||
Logger.log("d", "Started sending g-code to remote printer.")
|
Logger.log("d", "Started sending g-code to remote printer.")
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue