# HG changeset patch # User lbessard # Date 1235576379 -3600 # Node ID 9266d1e6e3d47d2323c9e5ed4e6e25c2bfac417a # Parent eab54dae434ddf34b6e68ccc2b9277b9374b00e9 Fix size of ComboBoxes diff -r eab54dae434d -r 9266d1e6e3d4 DataTypeEditor.py --- a/DataTypeEditor.py Wed Feb 25 16:06:19 2009 +0100 +++ b/DataTypeEditor.py Wed Feb 25 16:39:39 2009 +0100 @@ -352,7 +352,7 @@ self.DerivationType = wx.ComboBox(id=ID_DATATYPEEDITORDERIVATIONTYPE, name='DerivationType', parent=self, pos=wx.Point(0, 0), - size=wx.Size(200, 24), style=wx.CB_READONLY) + size=wx.Size(200, 28), style=wx.CB_READONLY) self.Bind(wx.EVT_COMBOBOX, self.OnDerivationTypeChanged, id=ID_DATATYPEEDITORDERIVATIONTYPE) # Panel for Directly derived data types @@ -367,7 +367,7 @@ self.DirectlyBaseType = wx.ComboBox(id=ID_DATATYPEEDITORDIRECTLYBASETYPE, name='DirectlyBaseType', parent=self.DirectlyPanel, pos=wx.Point(0, 0), - size=wx.Size(0, 24), style=wx.CB_READONLY) + size=wx.Size(0, 28), style=wx.CB_READONLY) self.Bind(wx.EVT_COMBOBOX, self.OnInfosChanged, id=ID_DATATYPEEDITORDIRECTLYBASETYPE) self.staticText3 = wx.StaticText(id=ID_DATATYPEEDITORSTATICTEXT3, @@ -391,7 +391,7 @@ self.SubrangeBaseType = wx.ComboBox(id=ID_DATATYPEEDITORSUBRANGEBASETYPE, name='SubrangeBaseType', parent=self.SubrangePanel, pos=wx.Point(0, 0), - size=wx.Size(0, 24), style=wx.CB_READONLY) + size=wx.Size(0, 28), style=wx.CB_READONLY) self.Bind(wx.EVT_COMBOBOX, self.OnSubrangeBaseTypeChanged, id=ID_DATATYPEEDITORSUBRANGEBASETYPE) self.staticText5 = wx.StaticText(id=ID_DATATYPEEDITORSTATICTEXT5, @@ -442,7 +442,7 @@ self.EnumeratedInitialValue = wx.ComboBox(id=ID_DATATYPEEDITORENUMERATEDINITIALVALUE, name='EnumeratedInitialValue', parent=self.EnumeratedPanel, pos=wx.Point(0, 0), - size=wx.Size(0, 24), style=wx.CB_READONLY) + size=wx.Size(0, 28), style=wx.CB_READONLY) self.Bind(wx.EVT_COMBOBOX, self.OnInfosChanged, id=ID_DATATYPEEDITORENUMERATEDINITIALVALUE) # Panel for Array data types @@ -457,7 +457,7 @@ self.ArrayBaseType = wx.ComboBox(id=ID_DATATYPEEDITORARRAYBASETYPE, name='SubrangeBaseType', parent=self.ArrayPanel, pos=wx.Point(0, 0), - size=wx.Size(0, 24), style=wx.CB_READONLY) + size=wx.Size(0, 28), style=wx.CB_READONLY) self.Bind(wx.EVT_COMBOBOX, self.OnInfosChanged, id=ID_DATATYPEEDITORARRAYBASETYPE) self.ArrayDimensions = wx.gizmos.EditableListBox(id=ID_DATATYPEEDITORARRAYDIMENSIONS, diff -r eab54dae434d -r 9266d1e6e3d4 Dialogs.py --- a/Dialogs.py Wed Feb 25 16:06:19 2009 +0100 +++ b/Dialogs.py Wed Feb 25 16:39:39 2009 +0100 @@ -516,7 +516,7 @@ self.Class = wx.ComboBox(id=ID_VARIABLEPROPERTIESDIALOGCLASS, name='Class', parent=self, pos=wx.Point(0, 0), - size=wx.Size(0, 24), style=wx.CB_READONLY) + size=wx.Size(0, 28), style=wx.CB_READONLY) self.Bind(wx.EVT_COMBOBOX, self.OnClassChanged, id=ID_VARIABLEPROPERTIESDIALOGCLASS) self.VariableName = wx.ListBox(id=ID_VARIABLEPROPERTIESDIALOGNAME, @@ -1024,7 +1024,7 @@ self.ElementName = wx.ComboBox(id=ID_LDELEMENTDIALOGNAME, name='Name', parent=self, pos=wx.Point(0, 0), - size=wx.Size(0, 24), style=wx.CB_READONLY) + size=wx.Size(0, 28), style=wx.CB_READONLY) self.Bind(wx.EVT_COMBOBOX, self.OnNameChanged, id=ID_LDELEMENTDIALOGNAME) self.Preview = wx.Panel(id=ID_LDELEMENTDIALOGPREVIEW, @@ -1679,7 +1679,7 @@ self.Reference = wx.ComboBox(id=ID_TRANSITIONCONTENTDIALOGREFERENCE, name='Reference', parent=self, pos=wx.Point(0, 0), - size=wx.Size(0, 24), style=wx.CB_READONLY) + size=wx.Size(0, 28), style=wx.CB_READONLY) self.Bind(wx.EVT_COMBOBOX, self.OnReferenceChanged, id=ID_TRANSITIONCONTENTDIALOGREFERENCE) self.radioButton2 = wx.RadioButton(id=ID_TRANSITIONCONTENTDIALOGRADIOBUTTON2, diff -r eab54dae434d -r 9266d1e6e3d4 GraphicViewer.py --- a/GraphicViewer.py Wed Feb 25 16:06:19 2009 +0100 +++ b/GraphicViewer.py Wed Feb 25 16:39:39 2009 +0100 @@ -107,7 +107,7 @@ self.CanvasRange = wx.ComboBox(id=ID_GRAPHICVIEWERCANVASRANGE, name='CanvasRange', parent=self, pos=wx.Point(0, 0), - size=wx.Size(100, 24), choices=RANGE_VALUES, style=0) + size=wx.Size(100, 28), choices=RANGE_VALUES, style=0) self.CanvasRange.SetStringSelection("25") self.Bind(wx.EVT_COMBOBOX, self.OnRangeChanged, id=ID_GRAPHICVIEWERCANVASRANGE) self.Bind(wx.EVT_TEXT_ENTER, self.OnRangeChanged, id=ID_GRAPHICVIEWERCANVASRANGE) diff -r eab54dae434d -r 9266d1e6e3d4 PLCOpenEditor.py --- a/PLCOpenEditor.py Wed Feb 25 16:06:19 2009 +0100 +++ b/PLCOpenEditor.py Wed Feb 25 16:39:39 2009 +0100 @@ -2828,7 +2828,7 @@ self.Language = wx.ComboBox(id=ID_PROJECTDIALOGLANGUAGE, name='Language', parent=self.MiscellaneousPanel, pos=wx.Point(0, 0), - size=wx.Size(0, 24), style=wx.CB_READONLY) + size=wx.Size(0, 28), style=wx.CB_READONLY) self.staticText11 = wx.StaticText(id=ID_PROJECTDIALOGSTATICTEXT11, label='Content Description (optional):', name='staticText11', parent=self.MiscellaneousPanel, @@ -3056,7 +3056,7 @@ self.PouType = wx.ComboBox(id=ID_POUDIALOGPOUTYPE, name='POUType', parent=self, pos=wx.Point(0, 0), - size=wx.Size(0, 24), style=wx.CB_READONLY) + size=wx.Size(0, 28), style=wx.CB_READONLY) self.Bind(wx.EVT_COMBOBOX, self.OnTypeChanged, id=ID_POUDIALOGPOUTYPE) self.staticText3 = wx.StaticText(id=ID_POUDIALOGSTATICTEXT3, @@ -3065,7 +3065,7 @@ self.Language = wx.ComboBox(id=ID_POUDIALOGLANGUAGE, name='Language', parent=self, pos=wx.Point(0, 0), - size=wx.Size(0, 24), style=wx.CB_READONLY) + size=wx.Size(0, 28), style=wx.CB_READONLY) self.ButtonSizer = self.CreateButtonSizer(wx.OK|wx.CANCEL|wx.CENTRE) self.Bind(wx.EVT_BUTTON, self.OnOK, id=self.ButtonSizer.GetAffirmativeButton().GetId()) @@ -3228,7 +3228,7 @@ self.Language = wx.ComboBox(id=ID_POUTRANSITIONDIALOGLANGUAGE, name='Language', parent=self, pos=wx.Point(0, 0), - size=wx.Size(0, 24), style=wx.CB_READONLY) + size=wx.Size(0, 28), style=wx.CB_READONLY) self.ButtonSizer = self.CreateButtonSizer(wx.OK|wx.CANCEL|wx.CENTRE) self.Bind(wx.EVT_BUTTON, self.OnOK, id=self.ButtonSizer.GetAffirmativeButton().GetId()) @@ -3367,7 +3367,7 @@ self.Language = wx.ComboBox(id=ID_POUACTIONDIALOGLANGUAGE, name='Language', parent=self, pos=wx.Point(0, 0), - size=wx.Size(0, 24), style=wx.CB_READONLY) + size=wx.Size(0, 28), style=wx.CB_READONLY) self.ButtonSizer = self.CreateButtonSizer(wx.OK|wx.CANCEL|wx.CENTRE) self.Bind(wx.EVT_BUTTON, self.OnOK, id=self.ButtonSizer.GetAffirmativeButton().GetId()) @@ -3983,7 +3983,7 @@ self.ReturnType = wx.ComboBox(id=ID_VARIABLEEDITORPANELRETURNTYPE, name='ReturnType', parent=self, pos=wx.Point(0, 0), - size=wx.Size(145, 24), style=wx.CB_READONLY) + size=wx.Size(145, 28), style=wx.CB_READONLY) self.Bind(wx.EVT_COMBOBOX, self.OnReturnTypeChanged, id=ID_VARIABLEEDITORPANELRETURNTYPE) self.staticText2 = wx.StaticText(id=ID_VARIABLEEDITORPANELSTATICTEXT2, @@ -3992,7 +3992,7 @@ self.ClassFilter = wx.ComboBox(id=ID_VARIABLEEDITORPANELCLASSFILTER, name='ClassFilter', parent=self, pos=wx.Point(0, 0), - size=wx.Size(145, 24), style=wx.CB_READONLY) + size=wx.Size(145, 28), style=wx.CB_READONLY) self.Bind(wx.EVT_COMBOBOX, self.OnClassFilter, id=ID_VARIABLEEDITORPANELCLASSFILTER) self.VariablesGrid = wx.grid.Grid(id=ID_VARIABLEEDITORPANELVARIABLESGRID,