Merge remote branch 'kliment/master' into experimental
commit
848eee2d68
|
@ -12,7 +12,8 @@ Download the following, and install in this order:
|
||||||
1. http://python.org/ftp/python/2.7.2/python-2.7.2.msi
|
1. http://python.org/ftp/python/2.7.2/python-2.7.2.msi
|
||||||
2. http://pypi.python.org/packages/any/p/pyserial/pyserial-2.5.win32.exe
|
2. http://pypi.python.org/packages/any/p/pyserial/pyserial-2.5.win32.exe
|
||||||
3. http://downloads.sourceforge.net/wxpython/wxPython2.8-win32-unicode-2.8.12.0-py27.exe
|
3. http://downloads.sourceforge.net/wxpython/wxPython2.8-win32-unicode-2.8.12.0-py27.exe
|
||||||
4. http://launchpad.net/pyreadline/1.7/1.7/+download/pyreadline-1.7.zip
|
4. http://launchpad.net/pyreadline/1.7/1.7/+download/pyreadline-1.7.win32.exe
|
||||||
|
|
||||||
## Ubuntu/Debian
|
## Ubuntu/Debian
|
||||||
`sudo apt-get install python-serial python-wxgtk2.8`
|
`sudo apt-get install python-serial python-wxgtk2.8`
|
||||||
|
|
||||||
|
|
|
@ -137,8 +137,8 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
|
||||||
wx.CallAfter(i.Enable)
|
wx.CallAfter(i.Enable)
|
||||||
|
|
||||||
# Enable XYButtons and ZButtons
|
# Enable XYButtons and ZButtons
|
||||||
self.xyb.enable()
|
wx.CallAfter(self.xyb.enable)
|
||||||
self.zb.enable()
|
wx.CallAfter(self.zb.enable)
|
||||||
|
|
||||||
if self.filename:
|
if self.filename:
|
||||||
wx.CallAfter(self.printbtn.Enable)
|
wx.CallAfter(self.printbtn.Enable)
|
||||||
|
@ -411,7 +411,7 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
|
||||||
self.rescanbtn=wx.Button(self.panel,-1,_("Port"),pos=(380,0))
|
self.rescanbtn=wx.Button(self.panel,-1,_("Port"),pos=(380,0))
|
||||||
self.rescanbtn.Bind(wx.EVT_BUTTON,self.rescanports)
|
self.rescanbtn.Bind(wx.EVT_BUTTON,self.rescanports)
|
||||||
|
|
||||||
uts.Add(self.rescanbtn,wx.TOP|wx.LEFT,5)
|
uts.Add(self.rescanbtn,wx.TOP|wx.LEFT,0)
|
||||||
self.serialport = wx.ComboBox(self.panel, -1,
|
self.serialport = wx.ComboBox(self.panel, -1,
|
||||||
choices=self.scanserial(),
|
choices=self.scanserial(),
|
||||||
style=wx.CB_DROPDOWN|wx.CB_READONLY, pos=(50,0))
|
style=wx.CB_DROPDOWN|wx.CB_READONLY, pos=(50,0))
|
||||||
|
@ -1416,8 +1416,8 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
|
||||||
wx.CallAfter(i.Disable)
|
wx.CallAfter(i.Disable)
|
||||||
|
|
||||||
# Disable XYButtons and ZButtons
|
# Disable XYButtons and ZButtons
|
||||||
self.xyb.disable()
|
wx.CallAfter(self.xyb.disable)
|
||||||
self.zb.disable()
|
wx.CallAfter(self.zb.disable)
|
||||||
|
|
||||||
if self.paused:
|
if self.paused:
|
||||||
self.p.paused=0
|
self.p.paused=0
|
||||||
|
|
Loading…
Reference in New Issue