Commit 8bdb86f6 authored by jezmy's avatar jezmy

Set top buttons to consistant (70, 25) size

parent d19ee50c
...@@ -39,6 +39,8 @@ StringIO=cStringIO ...@@ -39,6 +39,8 @@ StringIO=cStringIO
thread=threading.Thread thread=threading.Thread
winsize=(800,500) winsize=(800,500)
layerindex=0 layerindex=0
global buttonSize
buttonSize = (70, 25) # Define sizes for the buttons on top rows
if os.name=="nt": if os.name=="nt":
winsize=(800,530) winsize=(800,530)
try: try:
...@@ -517,11 +519,11 @@ class PronterWindow(wx.Frame,pronsole.pronsole): ...@@ -517,11 +519,11 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
except: except:
pass pass
uts.Add(self.baud) uts.Add(self.baud)
self.connectbtn=wx.Button(self.panel,-1,_("Connect"), size=(70, 25)) self.connectbtn=wx.Button(self.panel,-1,_("Connect"), size=buttonSize)
uts.Add(self.connectbtn) uts.Add(self.connectbtn)
self.connectbtn.SetToolTipString(_("Connect to the printer")) self.connectbtn.SetToolTipString(_("Connect to the printer"))
self.connectbtn.Bind(wx.EVT_BUTTON,self.connect) self.connectbtn.Bind(wx.EVT_BUTTON,self.connect)
self.resetbtn=wx.Button(self.panel,-1,_("Reset"), size=(70, 25)) self.resetbtn=wx.Button(self.panel,-1,_("Reset"), size=buttonSize)
self.resetbtn.Bind(wx.EVT_BUTTON,self.reset) self.resetbtn.Bind(wx.EVT_BUTTON,self.reset)
uts.Add(self.resetbtn) uts.Add(self.resetbtn)
#self.minibtn=wx.Button(self.panel,-1,_("Mini mode"),style=wx.BU_EXACTFIT) #self.minibtn=wx.Button(self.panel,-1,_("Mini mode"),style=wx.BU_EXACTFIT)
...@@ -535,23 +537,21 @@ class PronterWindow(wx.Frame,pronsole.pronsole): ...@@ -535,23 +537,21 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
#SECOND ROW #SECOND ROW
ubs=self.upperbottomsizer=uts#wx.BoxSizer(wx.HORIZONTAL) ubs=self.upperbottomsizer=uts#wx.BoxSizer(wx.HORIZONTAL)
self.loadbtn=wx.Button(self.panel,-1,_("Load file"), size=(70, 25)) self.loadbtn=wx.Button(self.panel,-1,_("Load file"), size=buttonSize)
self.loadbtn.Bind(wx.EVT_BUTTON,self.loadfile) self.loadbtn.Bind(wx.EVT_BUTTON,self.loadfile)
ubs.Add(self.loadbtn) ubs.Add(self.loadbtn)
self.platebtn=wx.Button(self.panel,-1,_("Compose"), size=(70, 25)) self.platebtn=wx.Button(self.panel,-1,_("Compose"), size=buttonSize)
self.platebtn.Bind(wx.EVT_BUTTON,self.plate) self.platebtn.Bind(wx.EVT_BUTTON,self.plate)
#self.printerControls.append(self.uploadbtn) #self.printerControls.append(self.uploadbtn)
ubs.Add(self.platebtn) ubs.Add(self.platebtn)
self.sdbtn=wx.Button(self.panel,-1,_("SD"), size=(70, 25)) self.sdbtn=wx.Button(self.panel,-1,_("SD"), size=buttonSize)
self.sdbtn.Bind(wx.EVT_BUTTON,self.sdmenu) self.sdbtn.Bind(wx.EVT_BUTTON,self.sdmenu)
self.printerControls.append(self.sdbtn) self.printerControls.append(self.sdbtn)
ubs.Add(self.sdbtn) ubs.Add(self.sdbtn)
self.printbtn=wx.Button(self.panel,-1,_("Print"), size=(70, 25)) self.printbtn=wx.Button(self.panel,-1,_("Print"), size=buttonSize)
self.printbtn.Bind(wx.EVT_BUTTON,self.printfile)
self.printbtn.Disable() self.printbtn.Disable()
ubs.Add(self.printbtn) ubs.Add(self.printbtn)
self.pausebtn=wx.Button(self.panel,-1,_("Pause"), size=(70, 25)) self.pausebtn=wx.Button(self.panel,-1,_("Pause"), size=buttonSize)
self.pausebtn.Bind(wx.EVT_BUTTON,self.pause)
ubs.Add(self.pausebtn) ubs.Add(self.pausebtn)
#Right full view #Right full view
lrs=self.lowerrsizer=wx.BoxSizer(wx.VERTICAL) lrs=self.lowerrsizer=wx.BoxSizer(wx.VERTICAL)
......
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