Mercurial > hg-public > lasercut-scripts / file diff

--- a/printrun-src/printrun/gui/toolbar.py	Tue Jan 19 20:45:09 2021 +0100
+++ b/printrun-src/printrun/gui/toolbar.py	Wed Jan 20 10:15:13 2021 +0100
@@ -27,7 +27,7 @@
         parentpanel = root.newPanel(parentpanel)
         glob.Add(parentpanel, 1, flag = wx.EXPAND)
         glob.Add(root.locker, 0, flag = wx.ALIGN_CENTER)
-    ToolbarSizer = wx.WrapSizer if use_wrapsizer and wx.VERSION > (2, 9) else wx.BoxSizer
+    ToolbarSizer = wx.WrapSizer if use_wrapsizer else wx.BoxSizer
     self = ToolbarSizer(wx.HORIZONTAL)
     root.rescanbtn = make_autosize_button(parentpanel, _("Port"), root.rescanports, _("Communication Settings\nClick to rescan ports"))
     self.Add(root.rescanbtn, 0, wx.TOP | wx.LEFT, 0)
@@ -42,7 +42,7 @@
     root.baud = wx.ComboBox(parentpanel, -1,
                             choices = ["2400", "9600", "19200", "38400",
                                        "57600", "115200", "250000"],
-                            style = wx.CB_DROPDOWN, size = (100, -1))
+                            style = wx.CB_DROPDOWN, size = (110, -1))
     root.baud.SetToolTip(wx.ToolTip(_("Select Baud rate for printer communication")))
     try:
         root.baud.SetValue("115200")
@@ -52,7 +52,8 @@
     self.Add(root.baud)
 
     if not hasattr(root, "connectbtn"):
-        root.connectbtn = make_autosize_button(parentpanel, _("Connect"), root.connect, _("Connect to the printer"))
+        root.connectbtn_cb_var = root.connect
+        root.connectbtn = make_autosize_button(parentpanel, _("&Connect"), root.connectbtn_cb, _("Connect to the printer"))
         root.statefulControls.append(root.connectbtn)
     else:
         root.connectbtn.Reparent(parentpanel)