Skip to content

P
Printrun
Commit ed20b692 authored by Kliment's avatar Kliment
Browse files
Options

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

Conflicts:
	pronterface.py
parents 013c9f0b df81a73d
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 2 deletions
pronterface.py
View file @ ed20b692
...@@ -135,7 +135,6 @@ class PronterWindow(wx.Frame,pronsole.pronsole): ...@@ -135,7 +135,6 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
wx.CallAfter(self.pausebtn.Disable) wx.CallAfter(self.pausebtn.Disable)
wx.CallAfter(self.printbtn.SetLabel,"Print") wx.CallAfter(self.printbtn.SetLabel,"Print")
def online(self): def online(self):
print "Printer is now online" print "Printer is now online"
...@@ -1019,7 +1018,7 @@ class PronterWindow(wx.Frame,pronsole.pronsole): ...@@ -1019,7 +1018,7 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
def on_startprint(self): def on_startprint(self):
wx.CallAfter(self.pausebtn.SetLabel, "Pause") wx.CallAfter(self.pausebtn.SetLabel, "Pause")
wx.CallAfter(self.pausebtn.Show) wx.CallAfter(self.pausebtn.Enable)
wx.CallAfter(self.printbtn.SetLabel, "Restart") wx.CallAfter(self.printbtn.SetLabel, "Restart")
def endupload(self): def endupload(self):
......
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