diff -r b956c924cbbd -r 7e6de17c687a dialogs/ConnectionDialog.py --- a/dialogs/ConnectionDialog.py Wed Jun 12 09:36:59 2013 +0200 +++ b/dialogs/ConnectionDialog.py Wed Jun 12 11:01:27 2013 +0200 @@ -51,25 +51,12 @@ BlockPreviewDialog.__init__(self, parent, controller, tagname, size=wx.Size(350, 220), title=_('Connection Properties')) - # Create dialog main sizer - main_sizer = wx.FlexGridSizer(cols=1, hgap=0, rows=2, vgap=10) - main_sizer.AddGrowableCol(0) - main_sizer.AddGrowableRow(0) - - # Create a sizer for dividing FBD connection parameters in two columns - column_sizer = wx.BoxSizer(wx.HORIZONTAL) - main_sizer.AddSizer(column_sizer, border=20, - flag=wx.GROW|wx.TOP|wx.LEFT|wx.RIGHT) - - # Create a sizer for left column - left_gridsizer = wx.FlexGridSizer(cols=1, hgap=0, rows=5, vgap=5) - left_gridsizer.AddGrowableCol(0) - column_sizer.AddSizer(left_gridsizer, 1, border=5, - flag=wx.GROW|wx.RIGHT) + # Init common sizers + self._init_sizers(2, 0, 5, None, 2, 1) # Create label for connection type type_label = wx.StaticText(self, label=_('Type:')) - left_gridsizer.AddWindow(type_label, flag=wx.GROW) + self.LeftGridSizer.AddWindow(type_label, flag=wx.GROW) # Create radio buttons for selecting connection type self.TypeRadioButtons = {} @@ -80,32 +67,25 @@ style=(wx.RB_GROUP if first else 0)) radio_button.SetValue(first) self.Bind(wx.EVT_RADIOBUTTON, self.OnTypeChanged, radio_button) - left_gridsizer.AddWindow(radio_button, flag=wx.GROW) + self.LeftGridSizer.AddWindow(radio_button, flag=wx.GROW) self.TypeRadioButtons[type] = radio_button first = False # Create label for connection name name_label = wx.StaticText(self, label=_('Name:')) - left_gridsizer.AddWindow(name_label, flag=wx.GROW) + self.LeftGridSizer.AddWindow(name_label, flag=wx.GROW) # Create text control for defining connection name self.ConnectionName = wx.TextCtrl(self) self.Bind(wx.EVT_TEXT, self.OnNameChanged, self.ConnectionName) - left_gridsizer.AddWindow(self.ConnectionName, flag=wx.GROW) - - # Create a sizer for right column - right_gridsizer = wx.FlexGridSizer(cols=1, hgap=0, rows=2, vgap=5) - right_gridsizer.AddGrowableCol(0) - right_gridsizer.AddGrowableRow(1) - column_sizer.AddSizer(right_gridsizer, 1, border=5, - flag=wx.GROW|wx.LEFT) + self.LeftGridSizer.AddWindow(self.ConnectionName, flag=wx.GROW) # Add preview panel and associated label to sizers - right_gridsizer.AddWindow(self.PreviewLabel, flag=wx.GROW) - right_gridsizer.AddWindow(self.Preview, flag=wx.GROW) + self.RightGridSizer.AddWindow(self.PreviewLabel, flag=wx.GROW) + self.RightGridSizer.AddWindow(self.Preview, flag=wx.GROW) # Add buttons sizer to sizers - main_sizer.AddSizer(self.ButtonSizer, border=20, + self.MainSizer.AddSizer(self.ButtonSizer, border=20, flag=wx.ALIGN_RIGHT|wx.BOTTOM|wx.LEFT|wx.RIGHT) # Add button for applying connection name modification to all connection @@ -123,8 +103,6 @@ controller.GenerateNewName( tagname, None, "Connection%d", 0)) - self.SetSizer(main_sizer) - # Connector radio button is default control having keyboard focus self.TypeRadioButtons[CONNECTOR].SetFocus()