3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-08 07:27:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' of github.com:Ultimaker/JediWifiPrintingPlugin

Browse source
This commit is contained in:
Jaime van Kessel 2016-09-21 15:59:46 +02:00
commit 9bc50c59e5
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
DiscoverUM3Action.qml
View file

@ -20,7 +20,7 @@ Cura.MachineAction
onNextClicked:
{
// Connect to the printer if the MachineAction is currently shown
if(base.parent == dialog)
if(base.parent.wizard == dialog)
{
connectToPrinter();
}

7
NetworkPrinterOutputDevice.py
View file

@ -587,13 +587,14 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
return user
return "Unknown User" # Couldn't find out username.
def _progressMessageActionTrigger(self, message_id = None, action_id="abort"):
if action_id == "abort":
def _progressMessageActionTrigger(self, message_id = None, action_id = None):
if action_id == "Abort":
Logger.log("d", "User aborted sending print to remote.")
self._progress_message.hide()
self._compressing_print = False
if self._post_reply:
self._post_reply.abort()
Application.getInstance().showPrintMonitor.emit(False)
## Attempt to start a new print.
# 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:
self._send_gcode_start = time()
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.show()
Logger.log("d", "Started sending g-code to remote printer.")