Commit 52583643 authored by Guillaume Seguin's avatar Guillaume Seguin

Merge branch 'master' of github.com:kliment/Printrun

parents 44649c64 8c3cbe06
...@@ -1221,13 +1221,15 @@ class pronsole(cmd.Cmd): ...@@ -1221,13 +1221,15 @@ class pronsole(cmd.Cmd):
def recvcb_actions(self, l): def recvcb_actions(self, l):
if l.startswith("!!"): if l.startswith("!!"):
self.do_pause(None) self.do_pause(None)
msg = l.split(" ", 1)[1] msg = l.split(" ", 1)
if self.silent is False: self.logError(msg.ljust(15)) if len(msg) > 1 and self.silent is False: self.logError(msg[1].ljust(15))
sys.stdout.write(self.promptf()) sys.stdout.write(self.promptf())
sys.stdout.flush() sys.stdout.flush()
return True return True
elif l.startswith("//"): elif l.startswith("//"):
command = l.split(" ", 1)[1] command = l.split(" ", 1)
if len(command) > 1:
command = command[1]
self.log(_("Received command %s") % command) self.log(_("Received command %s") % command)
command = command.split(":") command = command.split(":")
if len(command) == 2 and command[0] == "action": if len(command) == 2 and command[0] == "action":
......
...@@ -1676,12 +1676,14 @@ Printrun. If not, see <http://www.gnu.org/licenses/>.""" ...@@ -1676,12 +1676,14 @@ Printrun. If not, see <http://www.gnu.org/licenses/>."""
if l.startswith("!!"): if l.startswith("!!"):
if not self.paused: if not self.paused:
wx.CallAfter(self.pause) wx.CallAfter(self.pause)
msg = l.split(" ", 1)[1] msg = l.split(" ", 1)
if not self.p.loud: if len(msg) > 1 and not self.p.loud:
wx.CallAfter(self.addtexttolog, msg + "\n") wx.CallAfter(self.addtexttolog, msg[1] + "\n")
return True return True
elif l.startswith("//"): elif l.startswith("//"):
command = l.split(" ", 1)[1] command = l.split(" ", 1)
if len(command) > 1:
command = command[1]
self.log(_("Received command %s") % command) self.log(_("Received command %s") % command)
command = command.split(":") command = command.split(":")
if len(command) == 2 and command[0] == "action": if len(command) == 2 and command[0] == "action":
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment