From 04b72b2835be9ca11da91b9c0cd7ce438ce69063 Mon Sep 17 00:00:00 2001 From: Nathan Zadoks Date: Sun, 4 Dec 2011 01:41:33 +0100 Subject: [PATCH 1/3] Made SD Upload call the right function - not the SD Print function --- pronterface.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pronterface.py b/pronterface.py index 8d9024f..2cc89ee 100755 --- a/pronterface.py +++ b/pronterface.py @@ -678,9 +678,9 @@ class PronterWindow(wx.Frame,pronsole.pronsole): obj = e.GetEventObject() popupmenu=wx.Menu() item = popupmenu.Append(-1,_("SD Upload")) - self.Bind(wx.EVT_MENU,self.upload) + self.Bind(wx.EVT_MENU,self.upload,id=item.GetId()) item = popupmenu.Append(-1,_("SD Print")) - self.Bind(wx.EVT_MENU,self.sdprintfile) + self.Bind(wx.EVT_MENU,self.sdprintfile,id=item.GetId()) self.panel.PopupMenu(popupmenu, obj.GetPosition()) def htemp_change(self,event): From 086620c6cef4ede53d201efb247a8105df61173e Mon Sep 17 00:00:00 2001 From: Nathan Zadoks Date: Sun, 4 Dec 2011 01:58:47 +0100 Subject: [PATCH 2/3] Fixed SD Upload being enabled without a file being loaded. --- pronterface.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pronterface.py b/pronterface.py index 2cc89ee..4b87444 100755 --- a/pronterface.py +++ b/pronterface.py @@ -72,6 +72,7 @@ class PronterWindow(wx.Frame,pronsole.pronsole): self.statuscheck=False self.tempreport="" self.monitor=0 + self.f=None self.skeinp=None self.monitor_interval=3 self.paused=False @@ -678,6 +679,8 @@ class PronterWindow(wx.Frame,pronsole.pronsole): obj = e.GetEventObject() popupmenu=wx.Menu() item = popupmenu.Append(-1,_("SD Upload")) + if not self.f or not len(self.f): + item.Enable(False) self.Bind(wx.EVT_MENU,self.upload,id=item.GetId()) item = popupmenu.Append(-1,_("SD Print")) self.Bind(wx.EVT_MENU,self.sdprintfile,id=item.GetId()) @@ -1407,7 +1410,7 @@ class PronterWindow(wx.Frame,pronsole.pronsole): self.recvlisteners.remove(self.uploadtrigger) def upload(self,event): - if not len(self.f): + if not self.f or not len(self.f): return if not self.p.online: return From 882e68e4a365b0975fb68c4480e3911be1561c7c Mon Sep 17 00:00:00 2001 From: Nathan Zadoks Date: Sun, 4 Dec 2011 02:17:19 +0100 Subject: [PATCH 3/3] Merged connect and disconnect buttons. --- pronterface.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pronterface.py b/pronterface.py index 4b87444..7a2ef14 100755 --- a/pronterface.py +++ b/pronterface.py @@ -139,7 +139,9 @@ class PronterWindow(wx.Frame,pronsole.pronsole): def online(self): print _("Printer is now online.") - wx.CallAfter(self.connectbtn.Disable) + self.connectbtn.SetLabel("Disconnect") + self.connectbtn.Bind(wx.EVT_BUTTON,self.disconnect) + for i in self.printerControls: wx.CallAfter(i.Enable) @@ -442,10 +444,6 @@ class PronterWindow(wx.Frame,pronsole.pronsole): uts.Add(self.connectbtn) self.connectbtn.SetToolTipString(_("Connect to the printer")) self.connectbtn.Bind(wx.EVT_BUTTON,self.connect) - self.disconnectbtn=wx.Button(self.panel,-1,_("Disconnect")) - self.disconnectbtn.Bind(wx.EVT_BUTTON,self.disconnect) - self.printerControls.append(self.disconnectbtn) - uts.Add(self.disconnectbtn) self.resetbtn=wx.Button(self.panel,-1,_("Reset")) self.resetbtn.Bind(wx.EVT_BUTTON,self.reset) uts.Add(self.resetbtn) @@ -1482,8 +1480,10 @@ class PronterWindow(wx.Frame,pronsole.pronsole): print _("Disconnected.") self.p.disconnect() self.statuscheck=False - - wx.CallAfter(self.connectbtn.Enable); + + self.connectbtn.SetLabel("Connect") + self.connectbtn.Bind(wx.EVT_BUTTON,self.connect) + wx.CallAfter(self.printbtn.Disable); wx.CallAfter(self.pausebtn.Disable); for i in self.printerControls: