Skip to content

P
Printrun
Commit 03f727aa authored by Kliment Yanev's avatar Kliment Yanev
Browse files
Options

Merge branch 'master' into experimental

parents 8a4bdc92 82aa15be
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 447 additions and 536 deletions
locale/fr/LC_MESSAGES/fr.po
View file @ 03f727aa
This diff is collapsed.
locale/pronterface.pot
View file @ 03f727aa
This diff is collapsed.
pronterface.py
View file @ 03f727aa
...@@ -417,13 +417,13 @@ class PronterWindow(wx.Frame,pronsole.pronsole): ...@@ -417,13 +417,13 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
uts.Add(self.rescanbtn,wx.TOP|wx.LEFT,0) 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, pos=(50,0))
self.rescanports() self.rescanports()
uts.Add(self.serialport) uts.Add(self.serialport)
uts.Add(wx.StaticText(self.panel,-1,"@",pos=(250,5)),wx.RIGHT,5) uts.Add(wx.StaticText(self.panel,-1,"@",pos=(250,5)),wx.RIGHT,5)
self.baud = wx.ComboBox(self.panel, -1, self.baud = wx.ComboBox(self.panel, -1,
choices=["2400", "9600", "19200", "38400", "57600", "115200", "250000"], choices=["2400", "9600", "19200", "38400", "57600", "115200", "250000"],
style=wx.CB_DROPDOWN|wx.CB_READONLY, size=(110,30),pos=(275,0)) style=wx.CB_DROPDOWN, size=(110,30),pos=(275,0))
try: try:
self.baud.SetValue("115200") self.baud.SetValue("115200")
self.baud.SetValue(str(self.settings.baudrate)) self.baud.SetValue(str(self.settings.baudrate))
......
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