]> rtime.felk.cvut.cz Git - CanFestival-3.git/blobdiff - objdictgen/commondialogs.py
fixed : deprecation warning with the module "sets" when using python 2.6
[CanFestival-3.git] / objdictgen / commondialogs.py
index 6b26a37efff3172460446ea073aa22be0dd63316..b45a83f78797b5a111305fa989b38b5b2d4049c2 100644 (file)
 #License along with this library; if not, write to the Free Software
 #Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-from wxPython.wx import *
-from wxPython.grid import *
 import wx
+import wx.grid
 
 import os
 
+from node import BE_to_LE, LE_to_BE
+
+ScriptDirectory = os.path.split(__file__)[0]
+
 #-------------------------------------------------------------------------------
 #                          Editing Communication Dialog
 #-------------------------------------------------------------------------------
 
 
-[wxID_COMMUNICATIONDIALOG, wxID_COMMUNICATIONDIALOGMAINPANEL,
- wxID_COMMUNICATIONDIALOGPOSSIBLEINDEXES, wxID_COMMUNICATIONDIALOGCURRENTINDEXES,
wxID_COMMUNICATIONDIALOGSELECT, wxID_COMMUNICATIONDIALOGUNSELECT
wxID_COMMUNICATIONDIALOGSTATICTEXT1, wxID_COMMUNICATIONDIALOGSTATICTEXT2
-] = [wx.NewId() for _init_ctrls in range(8)]
+[ID_COMMUNICATIONDIALOG, ID_COMMUNICATIONDIALOGPOSSIBLEINDEXES, 
+ ID_COMMUNICATIONDIALOGCURRENTINDEXES, ID_COMMUNICATIONDIALOGSELECT, 
ID_COMMUNICATIONDIALOGUNSELECT, ID_COMMUNICATIONDIALOGSTATICTEXT1
+ ID_COMMUNICATIONDIALOGSTATICTEXT2
+] = [wx.NewId() for _init_ctrls in range(7)]
 
 class CommunicationDialog(wx.Dialog):
     def _init_coll_flexGridSizer1_Items(self, parent):
-        # generated method, don't edit
+        parent.AddSizer(self.MainSizer, 0, border=20, flag=wx.GROW|wx.TOP|wx.LEFT|wx.RIGHT)
+        parent.AddSizer(self.ButtonSizer, 0, border=20, flag=wx.ALIGN_RIGHT|wx.BOTTOM|wx.LEFT|wx.RIGHT)
 
-        parent.AddWindow(self.MainPanel, 0, border=0, flag=0)
+    def _init_coll_flexGridSizer1_Growables(self, parent):
+        parent.AddGrowableCol(0)
+        parent.AddGrowableRow(0)
 
-    def _init_sizers(self):
-        # generated method, don't edit
-        self.flexGridSizer1 = wx.FlexGridSizer(cols=1, hgap=0, rows=2, vgap=0)
+    def _init_coll_MainSizer_Items(self, parent):
+        parent.AddSizer(self.LeftGridSizer, 0, border=0, flag=wx.GROW)
+        parent.AddSizer(self.MiddleGridSizer, 0, border=0, flag=wx.GROW)
+        parent.AddSizer(self.RightGridSizer, 0, border=0, flag=wx.GROW)
 
-        self._init_coll_flexGridSizer1_Items(self.flexGridSizer1)
+    def _init_coll_MainSizer_Growables(self, parent):
+        parent.AddGrowableCol(0)
+        parent.AddGrowableCol(2)
+        parent.AddGrowableRow(0)
+
+    def _init_coll_LeftGridSizer_Items(self, parent):
+        parent.AddWindow(self.staticText1, 0, border=0, flag=wx.GROW)
+        parent.AddWindow(self.PossibleIndexes, 0, border=0, flag=wx.GROW)
+
+    def _init_coll_LeftGridSizer_Growables(self, parent):
+        parent.AddGrowableCol(0)
+        parent.AddGrowableRow(1)
+
+    def _init_coll_MiddleGridSizer_Items(self, parent):
+        parent.AddWindow(self.Select, 0, border=0, flag=wx.ALIGN_BOTTOM)
+        parent.AddWindow(self.Unselect, 0, border=0, flag=wx.ALIGN_TOP)
+
+    def _init_coll_MiddleGridSizer_Growables(self, parent):
+        parent.AddGrowableCol(0)
+        parent.AddGrowableRow(0)
+        parent.AddGrowableRow(1)
+
+    def _init_coll_RightGridSizer_Items(self, parent):
+        parent.AddWindow(self.staticText2, 0, border=0, flag=wx.GROW)
+        parent.AddWindow(self.CurrentIndexes, 0, border=0, flag=wx.GROW)
+
+    def _init_coll_RightGridSizer_Growables(self, parent):
+        parent.AddGrowableCol(0)
+        parent.AddGrowableRow(1)
 
+    def _init_sizers(self):
+        self.flexGridSizer1 = wx.FlexGridSizer(cols=1, hgap=0, rows=2, vgap=10)
+        self.MainSizer = wx.FlexGridSizer(cols=3, hgap=15, rows=1, vgap=0)
+        self.LeftGridSizer = wx.FlexGridSizer(cols=1, hgap=0, rows=2, vgap=5)
+        self.MiddleGridSizer = wx.FlexGridSizer(cols=1, hgap=0, rows=2, vgap=40)
+        self.RightGridSizer = wx.FlexGridSizer(cols=1, hgap=0, rows=2, vgap=5)
+        
+        self._init_coll_flexGridSizer1_Items(self.flexGridSizer1)
+        self._init_coll_flexGridSizer1_Growables(self.flexGridSizer1)
+        self._init_coll_MainSizer_Items(self.MainSizer)
+        self._init_coll_MainSizer_Growables(self.MainSizer)
+        self._init_coll_LeftGridSizer_Items(self.LeftGridSizer)
+        self._init_coll_LeftGridSizer_Growables(self.LeftGridSizer)
+        self._init_coll_MiddleGridSizer_Items(self.MiddleGridSizer)
+        self._init_coll_MiddleGridSizer_Growables(self.MiddleGridSizer)
+        self._init_coll_RightGridSizer_Items(self.RightGridSizer)
+        self._init_coll_RightGridSizer_Growables(self.RightGridSizer)
+        
         self.SetSizer(self.flexGridSizer1)
 
     def _init_ctrls(self, prnt):
-        # generated method, don't edit
-        wx.Dialog.__init__(self, id=wxID_COMMUNICATIONDIALOG,
+        wx.Dialog.__init__(self, id=ID_COMMUNICATIONDIALOG,
               name='CommunicationDialog', parent=prnt, pos=wx.Point(234, 216),
-              size=wx.Size(726, 437), style=wx.DEFAULT_DIALOG_STYLE,
+              size=wx.Size(726, 437), style=wx.DEFAULT_DIALOG_STYLE|wx.RESIZE_BORDER,
               title='Edit Communication Profile')
         self.SetClientSize(wx.Size(726, 437))
 
-        self.MainPanel = wx.Panel(id=wxID_COMMUNICATIONDIALOGMAINPANEL,
-              name='MainPanel', parent=self, pos=wx.Point(0, 0),
-              size=wx.Size(688, 382), style=wx.TAB_TRAVERSAL)
-        self.MainPanel.SetAutoLayout(True)
+        self.staticText1 = wx.StaticText(id=ID_COMMUNICATIONDIALOGSTATICTEXT1,
+              label='Possible Profile Indexes:', name='staticText1',
+              parent=self, pos=wx.Point(0, 0), size=wx.Size(0,
+              17), style=0)
 
         self.PossibleIndexes = wx.ListBox(choices=[],
-              id=wxID_COMMUNICATIONDIALOGPOSSIBLEINDEXES,
-              name='PossibleIndexes', parent=self.MainPanel, pos=wx.Point(40,
-              48), size=wx.Size(280, 320), style=wxLB_EXTENDED)
-        self.PossibleIndexes.Bind(wx.EVT_LEFT_DCLICK, self.OnPossibleIndexesDClick,
-              id=wxID_COMMUNICATIONDIALOGPOSSIBLEINDEXES)
-
-        self.CurrentIndexes = wx.ListBox(choices=[],
-              id=wxID_COMMUNICATIONDIALOGCURRENTINDEXES, name='CurrentIndexes',
-              parent=self.MainPanel, pos=wx.Point(400, 48), size=wx.Size(280,
-              320), style=wxLB_EXTENDED)
-        self.CurrentIndexes.Bind(wx.EVT_LEFT_DCLICK, self.OnCurrentIndexesDClick,
-              id=wxID_COMMUNICATIONDIALOGCURRENTINDEXES)
-
-        self.Select = wx.Button(id=wxID_COMMUNICATIONDIALOGSELECT, label='>>',
-              name='Select', parent=self.MainPanel, pos=wx.Point(345, 136),
+              id=ID_COMMUNICATIONDIALOGPOSSIBLEINDEXES,
+              name='PossibleIndexes', parent=self, pos=wx.Point(0, 0), 
+              size=wx.Size(0, 0), style=wx.LB_EXTENDED)
+        self.Bind(wx.EVT_LISTBOX_DCLICK, self.OnPossibleIndexesDClick,
+              id=ID_COMMUNICATIONDIALOGPOSSIBLEINDEXES)
+
+        self.Select = wx.Button(id=ID_COMMUNICATIONDIALOGSELECT, label='>>',
+              name='Select', parent=self, pos=wx.Point(0, 0),
               size=wx.Size(32, 32), style=0)
         self.Select.Bind(wx.EVT_BUTTON, self.OnSelectButton,
-              id=wxID_COMMUNICATIONDIALOGSELECT)
+              id=ID_COMMUNICATIONDIALOGSELECT)
 
-        self.Unselect = wx.Button(id=wxID_COMMUNICATIONDIALOGUNSELECT,
-              label='<<', name='Unselect', parent=self.MainPanel,
-              pos=wx.Point(345, 216), size=wx.Size(32, 30), style=0)
+        self.Unselect = wx.Button(id=ID_COMMUNICATIONDIALOGUNSELECT,
+              label='<<', name='Unselect', parent=self,
+              pos=wx.Point(0, 0), size=wx.Size(32, 32), style=0)
         self.Unselect.Bind(wx.EVT_BUTTON, self.OnUnselectButton,
-              id=wxID_COMMUNICATIONDIALOGUNSELECT)
-
-        self.staticText1 = wx.StaticText(id=wxID_COMMUNICATIONDIALOGSTATICTEXT1,
-              label='Possible Profile Indexes:', name='staticText1',
-              parent=self.MainPanel, pos=wx.Point(40, 24), size=wx.Size(156,
-              17), style=0)
+              id=ID_COMMUNICATIONDIALOGUNSELECT)
 
-        self.staticText2 = wx.StaticText(id=wxID_COMMUNICATIONDIALOGSTATICTEXT2,
+        self.staticText2 = wx.StaticText(id=ID_COMMUNICATIONDIALOGSTATICTEXT2,
               label='Current Profile Indexes:', name='staticText2',
-              parent=self.MainPanel, pos=wx.Point(400, 24), size=wx.Size(152,
+              parent=self, pos=wx.Point(0, 0), size=wx.Size(0,
               17), style=0)
 
+        self.CurrentIndexes = wx.ListBox(choices=[],
+              id=ID_COMMUNICATIONDIALOGCURRENTINDEXES, name='CurrentIndexes',
+              parent=self, pos=wx.Point(0, 0), size=wx.Size(0, 0), 
+              style=wx.LB_EXTENDED)
+        self.Bind(wx.EVT_LISTBOX_DCLICK, self.OnCurrentIndexesDClick,
+              id=ID_COMMUNICATIONDIALOGCURRENTINDEXES)
+
+        self.ButtonSizer = self.CreateButtonSizer(wx.OK|wx.CANCEL)
+        
         self._init_sizers()
 
     def __init__(self, parent):
         self._init_ctrls(parent)
-        self.ButtonSizer = self.CreateButtonSizer(wxOK|wxCANCEL)
-        self.flexGridSizer1.Add(self.ButtonSizer, 1, wxALIGN_CENTER)
         self.AllList = []
         self.CurrentList = []
         self.IndexDictionary = {}
@@ -174,101 +221,127 @@ class CommunicationDialog(wx.Dialog):
 #-------------------------------------------------------------------------------
 
 
-[wxID_MAPVARIABLEDIALOG, wxID_MAPVARIABLEDIALOGINDEX, 
- wxID_MAPVARIABLEDIALOGINDEXNAME, wxID_MAPVARIABLEDIALOGMAINPANEL, 
- wxID_MAPVARIABLEDIALOGNUMBER, wxID_MAPVARIABLEDIALOGRADIOBUTTON1, 
- wxID_MAPVARIABLEDIALOGRADIOBUTTON2, wxID_MAPVARIABLEDIALOGRADIOBUTTON3, 
- wxID_MAPVARIABLEDIALOGSTATICTEXT1, wxID_MAPVARIABLEDIALOGSTATICTEXT2, 
- wxID_MAPVARIABLEDIALOGSTATICTEXT3, wxID_MAPVARIABLEDIALOGSTATICTEXT4, 
-] = [wx.NewId() for _init_ctrls in range(12)]
+[ID_MAPVARIABLEDIALOG, ID_MAPVARIABLEDIALOGINDEX, 
+ ID_MAPVARIABLEDIALOGINDEXNAME, ID_MAPVARIABLEDIALOGSPACER, 
+ ID_MAPVARIABLEDIALOGSPACER2, ID_MAPVARIABLEDIALOGNUMBER, 
+ ID_MAPVARIABLEDIALOGRADIOBUTTON1, ID_MAPVARIABLEDIALOGRADIOBUTTON2, 
+ ID_MAPVARIABLEDIALOGRADIOBUTTON3, ID_MAPVARIABLEDIALOGSTATICTEXT1, 
+ ID_MAPVARIABLEDIALOGSTATICTEXT2, ID_MAPVARIABLEDIALOGSTATICTEXT3, 
+ ID_MAPVARIABLEDIALOGSTATICTEXT4, 
+] = [wx.NewId() for _init_ctrls in range(13)]
 
 class MapVariableDialog(wx.Dialog):
     def _init_coll_flexGridSizer1_Items(self, parent):
-        # generated method, don't edit
-
-        parent.AddWindow(self.MainPanel, 0, border=0, flag=0)
+        parent.AddSizer(self.MainSizer, 0, border=20, flag=wx.GROW|wx.TOP|wx.LEFT|wx.RIGHT)
+        parent.AddSizer(self.ButtonSizer, 0, border=20, flag=wx.ALIGN_RIGHT|wx.BOTTOM|wx.LEFT|wx.RIGHT)
+
+    def _init_coll_flexGridSizer1_Growables(self, parent):
+        parent.AddGrowableCol(0)
+        parent.AddGrowableRow(0)
+
+    def _init_coll_MainSizer_Items(self, parent):
+        parent.AddWindow(self.staticText1, 0, border=0, flag=wx.GROW)
+        parent.AddWindow(self.staticText2, 0, border=0, flag=wx.GROW)
+        parent.AddWindow(self.Spacer, 0, border=0, flag=wx.GROW)
+        parent.AddWindow(self.Index, 0, border=0, flag=wx.GROW)
+        parent.AddWindow(self.radioButton1, 0, border=0, flag=wx.GROW)
+        parent.AddWindow(self.Spacer2, 0, border=0, flag=wx.GROW)
+        parent.AddWindow(self.staticText3, 0, border=0, flag=wx.GROW)
+        parent.AddWindow(self.radioButton2, 0, border=0, flag=wx.GROW)
+        parent.AddWindow(self.staticText4, 0, border=0, flag=wx.GROW)
+        parent.AddWindow(self.IndexName, 0, border=0, flag=wx.GROW)
+        parent.AddWindow(self.radioButton3, 0, border=0, flag=wx.GROW)
+        parent.AddWindow(self.Number, 0, border=0, flag=wx.GROW)
+        
+    def _init_coll_MainSizer_Growables(self, parent):
+        parent.AddGrowableCol(0)
+        parent.AddGrowableCol(2)
 
     def _init_sizers(self):
-        # generated method, don't edit
-        self.flexGridSizer1 = wx.FlexGridSizer(cols=1, hgap=0, rows=2, vgap=0)
-
+        self.flexGridSizer1 = wx.FlexGridSizer(cols=1, hgap=0, rows=2, vgap=10)
+        self.MainSizer = wx.FlexGridSizer(cols=3, hgap=30, rows=4, vgap=5)
+        
         self._init_coll_flexGridSizer1_Items(self.flexGridSizer1)
-
+        self._init_coll_flexGridSizer1_Growables(self.flexGridSizer1)
+        self._init_coll_MainSizer_Items(self.MainSizer)
+        self._init_coll_MainSizer_Growables(self.MainSizer)
+        
         self.SetSizer(self.flexGridSizer1)
 
     def _init_ctrls(self, prnt):
-        # generated method, don't edit
-        wx.Dialog.__init__(self, id=wxID_MAPVARIABLEDIALOG,
+        wx.Dialog.__init__(self, id=ID_MAPVARIABLEDIALOG,
               name='CommunicationDialog', parent=prnt, pos=wx.Point(376, 223),
               size=wx.Size(444, 186), style=wx.DEFAULT_DIALOG_STYLE,
               title='Add Map Variable')
         self.SetClientSize(wx.Size(444, 186))
 
-        self.MainPanel = wx.Panel(id=wxID_MAPVARIABLEDIALOGMAINPANEL,
-              name='MainPanel', parent=self, pos=wx.Point(0, 0),
-              size=wx.Size(431, 142), style=wx.TAB_TRAVERSAL)
-        self.MainPanel.SetAutoLayout(True)
-
-        self.staticText1 = wx.StaticText(id=wxID_MAPVARIABLEDIALOGSTATICTEXT1,
-              label='Index:', name='staticText1', parent=self.MainPanel,
-              pos=wx.Point(24, 24), size=wx.Size(156, 17), style=0)
-
-        self.Index = wx.TextCtrl(id=wxID_MAPVARIABLEDIALOGINDEX, name='Index',
-              parent=self.MainPanel, pos=wx.Point(24, 48), size=wx.Size(152,
-              25), style=0, value='0x2000')
+        self.staticText1 = wx.StaticText(id=ID_MAPVARIABLEDIALOGSTATICTEXT1,
+              label='Index:', name='staticText1', parent=self,
+              pos=wx.Point(0, 0), size=wx.Size(0, 17), style=0)
 
-        self.staticText3 = wx.StaticText(id=wxID_MAPVARIABLEDIALOGSTATICTEXT3,
-              label='Name:', name='staticText3', parent=self.MainPanel,
-              pos=wx.Point(24, 80), size=wx.Size(47, 17), style=0)
+        self.staticText2 = wx.StaticText(id=ID_MAPVARIABLEDIALOGSTATICTEXT2,
+              label='Type:', name='staticText2', parent=self,
+              pos=wx.Point(0, 0), size=wx.Size(0, 17), style=0)
 
-        self.IndexName = wx.TextCtrl(id=wxID_MAPVARIABLEDIALOGINDEXNAME,
-              name='IndexName', parent=self.MainPanel, pos=wx.Point(24, 104),
-              size=wx.Size(152, 24), style=0, value='Undefined')
+        self.staticText3 = wx.StaticText(id=ID_MAPVARIABLEDIALOGSTATICTEXT3,
+              label='Name:', name='staticText3', parent=self,
+              pos=wx.Point(0, 0), size=wx.Size(0, 17), style=0)
 
-        self.staticText2 = wx.StaticText(id=wxID_MAPVARIABLEDIALOGSTATICTEXT2,
-              label='Type:', name='staticText2', parent=self.MainPanel,
-              pos=wx.Point(208, 24), size=wx.Size(38, 17), style=0)
+        self.staticText4 = wx.StaticText(id=ID_MAPVARIABLEDIALOGSTATICTEXT4,
+              label='Number:', name='staticText4', parent=self,
+              pos=wx.Point(0, 0), size=wx.Size(0, 16), style=0)
 
-        self.radioButton1 = wx.RadioButton(id=wxID_MAPVARIABLEDIALOGRADIOBUTTON1,
-              label='VAR', name='radioButton1', parent=self.MainPanel,
-              pos=wx.Point(208, 48), size=wx.Size(72, 24), style=wxRB_GROUP)
+        self.radioButton1 = wx.RadioButton(id=ID_MAPVARIABLEDIALOGRADIOBUTTON1,
+              label='VAR', name='radioButton1', parent=self,
+              pos=wx.Point(0, 0), size=wx.Size(80, 24), style=wx.RB_GROUP)
         self.radioButton1.SetValue(True)
         self.radioButton1.Bind(wx.EVT_RADIOBUTTON, self.OnRadioButton1Click,
-              id=wxID_MAPVARIABLEDIALOGRADIOBUTTON1)
+              id=ID_MAPVARIABLEDIALOGRADIOBUTTON1)
 
-        self.radioButton2 = wx.RadioButton(id=wxID_MAPVARIABLEDIALOGRADIOBUTTON2,
-              label='ARRAY', name='radioButton2', parent=self.MainPanel,
-              pos=wx.Point(208, 72), size=wx.Size(80, 24), style=wxRB_SINGLE)
+        self.radioButton2 = wx.RadioButton(id=ID_MAPVARIABLEDIALOGRADIOBUTTON2,
+              label='ARRAY', name='radioButton2', parent=self,
+              pos=wx.Point(0, 0), size=wx.Size(80, 24), style=0)
         self.radioButton2.SetValue(False)
         self.radioButton2.Bind(wx.EVT_RADIOBUTTON, self.OnRadioButton2Click,
-              id=wxID_MAPVARIABLEDIALOGRADIOBUTTON2)
+              id=ID_MAPVARIABLEDIALOGRADIOBUTTON2)
 
-        self.radioButton3 = wx.RadioButton(id=wxID_MAPVARIABLEDIALOGRADIOBUTTON3,
-              label='REC', name='radioButton3', parent=self.MainPanel,
-              pos=wx.Point(208, 96), size=wx.Size(96, 24), style=wxRB_SINGLE)
+        self.radioButton3 = wx.RadioButton(id=ID_MAPVARIABLEDIALOGRADIOBUTTON3,
+              label='REC', name='radioButton3', parent=self,
+              pos=wx.Point(0, 0), size=wx.Size(80, 24), style=0)
         self.radioButton3.SetValue(False)
         self.radioButton3.Bind(wx.EVT_RADIOBUTTON, self.OnRadioButton3Click,
-              id=wxID_MAPVARIABLEDIALOGRADIOBUTTON3)
-
-        self.staticText4 = wx.StaticText(id=wxID_MAPVARIABLEDIALOGSTATICTEXT4,
-              label='Number:', name='staticText4', parent=self.MainPanel,
-              pos=wx.Point(312, 80), size=wx.Size(88, 16), style=0)
-
-        self.Number = wx.TextCtrl(id=wxID_MAPVARIABLEDIALOGNUMBER,
-              name='Number', parent=self.MainPanel, pos=wx.Point(312, 104),
-              size=wx.Size(112, 24), style=wx.TE_RIGHT, value='0')
+              id=ID_MAPVARIABLEDIALOGRADIOBUTTON3)
 
+        self.Index = wx.TextCtrl(id=ID_MAPVARIABLEDIALOGINDEX, name='Index',
+              parent=self, pos=wx.Point(0, 0), size=wx.Size(0, 25), 
+              style=0, value='0x2000')
+        
+        self.IndexName = wx.TextCtrl(id=ID_MAPVARIABLEDIALOGINDEXNAME,
+              name='IndexName', parent=self, pos=wx.Point(0, 0),
+              size=wx.Size(0, 24), style=0, value='Undefined')
+        
+        self.Number = wx.TextCtrl(id=ID_MAPVARIABLEDIALOGNUMBER,
+              name='Number', parent=self, pos=wx.Point(0, 0),
+              size=wx.Size(0, 24), style=wx.TE_RIGHT, value='0')
+        
+        self.Spacer = wx.Panel(id=ID_MAPVARIABLEDIALOGSPACER,
+              name='Spacer', parent=self, pos=wx.Point(0, 0),
+              size=wx.Size(0, 0), style=wx.TAB_TRAVERSAL)
+        
+        self.Spacer2 = wx.Panel(id=ID_MAPVARIABLEDIALOGSPACER2,
+              name='Spacer2', parent=self, pos=wx.Point(0, 0),
+              size=wx.Size(0, 0), style=wx.TAB_TRAVERSAL)
+        
+        self.ButtonSizer = self.CreateButtonSizer(wx.OK|wx.CANCEL)
+        self.Bind(wx.EVT_BUTTON, self.OnOK, id=self.ButtonSizer.GetAffirmativeButton().GetId())
+        
         self._init_sizers()
 
     def __init__(self, parent):
         self._init_ctrls(parent)
-        self.ButtonSizer = self.CreateButtonSizer(wxOK|wxCANCEL)
-        self.flexGridSizer1.Add(self.ButtonSizer, 1, wxALIGN_CENTER)
         self.staticText4.Enable(False)
         self.Number.Enable(False)
         
-        EVT_BUTTON(self, self.ButtonSizer.GetAffirmativeButton().GetId(), self.OnOK)
-
     def SetIndex(self, index):
         self.Index.SetValue("0x%04X"%index)
 
@@ -296,11 +369,11 @@ class MapVariableDialog(wx.Dialog):
                     text += " and %s"%item
                 else:
                     text += ", %s"%item
-            message = wxMessageDialog(self, "Form isn't valid. %s must be integer%s!"%(text,suffix), "Error", wxOK|wxICON_ERROR)
+            message = wx.MessageDialog(self, "Form isn't valid. %s must be integer%s!"%(text,suffix), "Error", wx.OK|wx.ICON_ERROR)
             message.ShowModal()
             message.Destroy()
         else:
-            self.EndModal(wxID_OK)
+            self.EndModal(wx.ID_OK)
 
     def GetValues(self):
         name = self.IndexName.GetValue()
@@ -309,10 +382,10 @@ class MapVariableDialog(wx.Dialog):
             struct = 1
             number = None
         elif self.radioButton2.GetValue():
-            struct = 3
+            struct = 7
             number = int(self.Number.GetValue())
         elif self.radioButton3.GetValue():
-            struct = 7
+            struct = 3
             number = int(self.Number.GetValue())
         return index, name, struct, number
 
@@ -338,87 +411,126 @@ class MapVariableDialog(wx.Dialog):
 #-------------------------------------------------------------------------------
 
 
-[wxID_USERTYPEDIALOG, wxID_USERTYPEDIALOGLENGTH, wxID_USERTYPEDIALOGMAINPANEL, 
- wxID_USERTYPEDIALOGMAX, wxID_USERTYPEDIALOGMIN, 
- wxID_USERTYPEDIALOGSTATICBOX1, wxID_USERTYPEDIALOGSTATICTEXT1, 
- wxID_USERTYPEDIALOGSTATICTEXT2, wxID_USERTYPEDIALOGSTATICTEXT3, 
- wxID_USERTYPEDIALOGSTATICTEXT4, wxID_USERTYPEDIALOGTYPE, 
+[ID_USERTYPEDIALOG, ID_USERTYPEDIALOGSPACER, 
+ ID_USERTYPEDIALOGTYPE, ID_USERTYPEDIALOGMAX, 
+ ID_USERTYPEDIALOGMIN, ID_USERTYPEDIALOGLENGTH, 
+ ID_USERTYPEDIALOGSTATICBOX1, ID_USERTYPEDIALOGSTATICTEXT1, 
+ ID_USERTYPEDIALOGSTATICTEXT2, ID_USERTYPEDIALOGSTATICTEXT3, 
+ ID_USERTYPEDIALOGSTATICTEXT4,  
 ] = [wx.NewId() for _init_ctrls in range(11)]
 
 class UserTypeDialog(wx.Dialog):
     def _init_coll_flexGridSizer1_Items(self, parent):
-        # generated method, don't edit
-
-        parent.AddWindow(self.MainPanel, 0, border=0, flag=0)
-
+        parent.AddSizer(self.MainSizer, 0, border=20, flag=wx.GROW|wx.TOP|wx.LEFT|wx.RIGHT)
+        parent.AddSizer(self.ButtonSizer, 0, border=20, flag=wx.ALIGN_RIGHT|wx.BOTTOM|wx.LEFT|wx.RIGHT)
+
+    def _init_coll_flexGridSizer1_Growables(self, parent):
+        parent.AddGrowableCol(0)
+        parent.AddGrowableRow(0)
+
+    def _init_coll_MainSizer_Items(self, parent):
+        parent.AddSizer(self.LeftGridSizer, 2, border=5, flag=wx.GROW|wx.RIGHT)
+        parent.AddSizer(self.RightBoxSizer, 3, border=5, flag=wx.GROW|wx.LEFT)
+
+    def _init_coll_LeftGridSizer_Items(self, parent):
+        parent.AddWindow(self.staticText1, 0, border=0, flag=wx.GROW)
+        parent.AddWindow(self.Type, 0, border=0, flag=wx.GROW)
+        parent.AddWindow(self.Spacer, 0, border=0, flag=wx.GROW)
+
+    def _init_coll_LeftGridSizer_Growables(self, parent):
+        parent.AddGrowableCol(0)
+        parent.AddGrowableRow(2)
+
+    def _init_coll_RightBoxSizer_Items(self, parent):
+        parent.AddSizer(self.RightBoxGridSizer, 0, border=10, flag=wx.GROW|wx.ALL)
+
+    def _init_coll_RightBoxGridSizer_Items(self, parent):
+        parent.AddWindow(self.staticText2, 0, border=0, flag=wx.GROW)
+        parent.AddWindow(self.Min, 0, border=0, flag=wx.GROW)
+        parent.AddWindow(self.staticText3, 0, border=0, flag=wx.GROW)
+        parent.AddWindow(self.Max, 0, border=0, flag=wx.GROW)
+        parent.AddWindow(self.staticText4, 0, border=0, flag=wx.GROW)
+        parent.AddWindow(self.Length, 0, border=0, flag=wx.GROW)
+        
+    def _init_coll_RightBoxGridSizer_Growables(self, parent):
+        parent.AddGrowableCol(1)
+        
     def _init_sizers(self):
-        # generated method, don't edit
-        self.flexGridSizer1 = wx.FlexGridSizer(cols=1, hgap=0, rows=2, vgap=0)
-
+        self.flexGridSizer1 = wx.FlexGridSizer(cols=1, hgap=0, rows=2, vgap=10)
+        self.MainSizer = wx.BoxSizer(wx.HORIZONTAL)
+        self.LeftGridSizer = wx.FlexGridSizer(cols=1, hgap=0, rows=3, vgap=5)
+        self.RightBoxSizer = wx.StaticBoxSizer(self.staticBox1, wx.VERTICAL)
+        self.RightBoxGridSizer = wx.FlexGridSizer(cols=2, hgap=5, rows=3, vgap=10)
+        
         self._init_coll_flexGridSizer1_Items(self.flexGridSizer1)
-
+        self._init_coll_flexGridSizer1_Growables(self.flexGridSizer1)
+        self._init_coll_MainSizer_Items(self.MainSizer)
+        self._init_coll_LeftGridSizer_Items(self.LeftGridSizer)
+        self._init_coll_LeftGridSizer_Growables(self.LeftGridSizer)
+        self._init_coll_RightBoxSizer_Items(self.RightBoxSizer)
+        self._init_coll_RightBoxGridSizer_Items(self.RightBoxGridSizer)
+        self._init_coll_RightBoxGridSizer_Growables(self.RightBoxGridSizer)
+        
         self.SetSizer(self.flexGridSizer1)
 
     def _init_ctrls(self, prnt):
-        # generated method, don't edit
-        wx.Dialog.__init__(self, id=wxID_USERTYPEDIALOG, name='UserTypeDialog',
-              parent=prnt, pos=wx.Point(376, 223), size=wx.Size(444, 228),
+        wx.Dialog.__init__(self, id=ID_USERTYPEDIALOG, name='UserTypeDialog',
+              parent=prnt, pos=wx.Point(376, 223), size=wx.Size(444, 210),
               style=wx.DEFAULT_DIALOG_STYLE, title='Add User Type')
-        self.SetClientSize(wx.Size(444, 228))
+        self.SetClientSize(wx.Size(444, 210))
 
-        self.MainPanel = wx.Panel(id=wxID_USERTYPEDIALOGMAINPANEL,
-              name='MainPanel', parent=self, pos=wx.Point(0, 0),
-              size=wx.Size(431, 182), style=wx.TAB_TRAVERSAL)
-        self.MainPanel.SetAutoLayout(True)
+        self.staticText1 = wx.StaticText(id=ID_USERTYPEDIALOGSTATICTEXT1,
+              label='Type:', name='staticText1', parent=self,
+              pos=wx.Point(0, 0), size=wx.Size(0, 17), style=0)
 
-        self.staticText1 = wx.StaticText(id=wxID_USERTYPEDIALOGSTATICTEXT1,
-              label='Type:', name='staticText1', parent=self.MainPanel,
-              pos=wx.Point(24, 24), size=wx.Size(156, 17), style=0)
-
-        self.Type = wx.Choice(choices=[], id=wxID_USERTYPEDIALOGTYPE,
-              name='Type', parent=self.MainPanel, pos=wx.Point(24, 48),
-              size=wx.Size(160, 24), style=0)
+        self.Type = wx.Choice(choices=[], id=ID_USERTYPEDIALOGTYPE,
+              name='Type', parent=self, pos=wx.Point(0, 0),
+              size=wx.Size(0, 24), style=0)
         self.Type.Bind(wx.EVT_CHOICE, self.OnTypeChoice,
-              id=wxID_USERTYPEDIALOGTYPE)
+              id=ID_USERTYPEDIALOGTYPE)
+
+        self.Spacer = wx.Panel(id=ID_MAPVARIABLEDIALOGSPACER,
+              name='Spacer', parent=self, pos=wx.Point(0, 0),
+              size=wx.Size(0, 0), style=wx.TAB_TRAVERSAL)
 
-        self.staticBox1 = wx.StaticBox(id=wxID_USERTYPEDIALOGSTATICBOX1,
-              label='Values', name='staticBox1', parent=self.MainPanel,
-              pos=wx.Point(200, 24), size=wx.Size(224, 144), style=0)
+        self.staticBox1 = wx.StaticBox(id=ID_USERTYPEDIALOGSTATICBOX1,
+              label='Values', name='staticBox1', parent=self,
+              pos=wx.Point(0, 0), size=wx.Size(0, 0), style=0)
 
-        self.staticText2 = wx.StaticText(id=wxID_USERTYPEDIALOGSTATICTEXT2,
-              label='Minimum:', name='staticText2', parent=self.MainPanel,
-              pos=wx.Point(216, 48), size=wx.Size(67, 17), style=0)
+        self.staticText2 = wx.StaticText(id=ID_USERTYPEDIALOGSTATICTEXT2,
+              label='Minimum:', name='staticText2', parent=self,
+              pos=wx.Point(0, 0), size=wx.Size(80, 17), style=0)
 
-        self.Min = wx.TextCtrl(id=wxID_USERTYPEDIALOGMIN, name='Min',
-              parent=self.MainPanel, pos=wx.Point(296, 48), size=wx.Size(112,
-              24), style=wx.TE_RIGHT, value='0')
+        self.Min = wx.TextCtrl(id=ID_USERTYPEDIALOGMIN, name='Min',
+              parent=self, pos=wx.Point(0, 0), size=wx.Size(0, 24), 
+              style=wx.TE_RIGHT, value='0')
 
-        self.staticText3 = wx.StaticText(id=wxID_USERTYPEDIALOGSTATICTEXT3,
-              label='Maximum:', name='staticText3', parent=self.MainPanel,
-              pos=wx.Point(216, 88), size=wx.Size(71, 17), style=0)
+        self.staticText3 = wx.StaticText(id=ID_USERTYPEDIALOGSTATICTEXT3,
+              label='Maximum:', name='staticText3', parent=self,
+              pos=wx.Point(0, 0), size=wx.Size(80, 17), style=0)
 
-        self.Max = wx.TextCtrl(id=wxID_USERTYPEDIALOGMAX, name='Max',
-              parent=self.MainPanel, pos=wx.Point(296, 88), size=wx.Size(112,
-              25), style=wx.TE_RIGHT, value='0')
+        self.Max = wx.TextCtrl(id=ID_USERTYPEDIALOGMAX, name='Max',
+              parent=self, pos=wx.Point(0, 0), size=wx.Size(0, 24), 
+              style=wx.TE_RIGHT, value='0')
 
-        self.staticText4 = wx.StaticText(id=wxID_USERTYPEDIALOGSTATICTEXT4,
-              label='Length:', name='staticText4', parent=self.MainPanel,
-              pos=wx.Point(216, 128), size=wx.Size(52, 17), style=0)
+        self.staticText4 = wx.StaticText(id=ID_USERTYPEDIALOGSTATICTEXT4,
+              label='Length:', name='staticText4', parent=self,
+              pos=wx.Point(0, 0), size=wx.Size(80, 17), style=0)
 
-        self.Length = wx.TextCtrl(id=wxID_USERTYPEDIALOGLENGTH, name='Length',
-              parent=self.MainPanel, pos=wx.Point(296, 128), size=wx.Size(112,
-              25), style=wx.TE_RIGHT, value='0')
+        self.Length = wx.TextCtrl(id=ID_USERTYPEDIALOGLENGTH, name='Length',
+              parent=self, pos=wx.Point(0, 0), size=wx.Size(0, 24), 
+              style=wx.TE_RIGHT, value='0')
 
+        self.ButtonSizer = self.CreateButtonSizer(wx.OK|wx.CANCEL)
+        self.Bind(wx.EVT_BUTTON, self.OnOK, id=self.ButtonSizer.GetAffirmativeButton().GetId())
+        
         self._init_sizers()
 
     def __init__(self, parent):
         self._init_ctrls(parent)
-        self.ButtonSizer = self.CreateButtonSizer(wxOK|wxCANCEL)
-        self.flexGridSizer1.Add(self.ButtonSizer, 1, wxALIGN_CENTER)
+        
         self.TypeDictionary = {}
 
-        EVT_BUTTON(self, self.ButtonSizer.GetAffirmativeButton().GetId(), self.OnOK)
-
     def OnOK(self, event):
         error = []
         good = True
@@ -460,12 +572,11 @@ class UserTypeDialog(wx.Dialog):
             firstmessage = ". A type must be selected"
             good = False
         if not good:
-            message = wxMessageDialog(self, "Form isn't valid%s%s%s!"%(firstmessage,secondmessage), "Error", wxOK|wxICON_ERROR)
+            message = wx.MessageDialog(self, "Form isn't valid%s%s%s!"%(firstmessage,secondmessage), "Error", wx.OK|wx.ICON_ERROR)
             message.ShowModal()
             message.Destroy()
-            self.Name.SetFocus()
         else:
-            self.EndModal(wxID_OK)
+            self.EndModal(wx.ID_OK)
 
     def SetValues(self, min = None, max = None, length = None):
         if min != None:
@@ -533,86 +644,112 @@ class UserTypeDialog(wx.Dialog):
 #-------------------------------------------------------------------------------
 
 
-[wxID_NODEINFOSDIALOG, wxID_NODEINFOSDIALOGMAINPANEL, 
- wxID_NODEINFOSDIALOGNAME, wxID_NODEINFOSDIALOGNODEID, 
- wxID_NODEINFOSDIALOGDESCRIPTION, wxID_NODEINFOSDIALOGSTATICTEXT1, 
- wxID_NODEINFOSDIALOGSTATICTEXT2, wxID_NODEINFOSDIALOGSTATICTEXT3, 
- wxID_NODEINFOSDIALOGSTATICTEXT4, wxID_NODEINFOSDIALOGTYPE, 
-] = [wx.NewId() for _init_ctrls in range(10)]
+[ID_NODEINFOSDIALOG, ID_NODEINFOSDIALOGNAME, 
+ ID_NODEINFOSDIALOGNODEID, ID_NODEINFOSDIALOGTYPE, 
+ ID_NODEINFOSDIALOGDEFAULTSTRINGSIZE, ID_NODEINFOSDIALOGDESCRIPTION, 
+ ID_NODEINFOSDIALOGSTATICTEXT1, ID_NODEINFOSDIALOGSTATICTEXT2, 
+ ID_NODEINFOSDIALOGSTATICTEXT3, ID_NODEINFOSDIALOGSTATICTEXT4, 
+ ID_NODEINFOSDIALOGSTATICTEXT5, 
+] = [wx.NewId() for _init_ctrls in range(11)]
 
 class NodeInfosDialog(wx.Dialog):
     def _init_coll_flexGridSizer1_Items(self, parent):
-        # generated method, don't edit
-
-        parent.AddWindow(self.MainPanel, 0, border=0, flag=0)
+        parent.AddSizer(self.MainSizer, 0, border=20, flag=wx.GROW|wx.TOP|wx.LEFT|wx.RIGHT)
+        parent.AddSizer(self.ButtonSizer, 0, border=20, flag=wx.ALIGN_RIGHT|wx.BOTTOM|wx.LEFT|wx.RIGHT)
+
+    def _init_coll_flexGridSizer1_Growables(self, parent):
+        parent.AddGrowableCol(0)
+        parent.AddGrowableRow(0)
+
+    def _init_coll_MainSizer_Items(self, parent):
+        parent.AddWindow(self.staticText1, 0, border=0, flag=wx.GROW)
+        parent.AddWindow(self.NodeName, 0, border=0, flag=wx.GROW)
+        parent.AddWindow(self.staticText2, 0, border=0, flag=wx.GROW)
+        parent.AddWindow(self.NodeID, 0, border=0, flag=wx.GROW)
+        parent.AddWindow(self.staticText3, 0, border=0, flag=wx.GROW)
+        parent.AddWindow(self.Type, 0, border=0, flag=wx.GROW)
+        parent.AddWindow(self.staticText4, 0, border=0, flag=wx.GROW)
+        parent.AddWindow(self.DefaultStringSize, 0, border=0, flag=wx.GROW)
+        parent.AddWindow(self.staticText5, 0, border=0, flag=wx.GROW)
+        parent.AddWindow(self.Description, 0, border=0, flag=wx.GROW)
+
+    def _init_coll_MainSizer_Growables(self, parent):
+        parent.AddGrowableCol(0)
 
     def _init_sizers(self):
-        # generated method, don't edit
-        self.flexGridSizer1 = wx.FlexGridSizer(cols=1, hgap=0, rows=2, vgap=0)
-
+        self.flexGridSizer1 = wx.FlexGridSizer(cols=1, hgap=0, rows=2, vgap=10)
+        self.MainSizer = wx.FlexGridSizer(cols=1, hgap=0, rows=8, vgap=5)
+        
         self._init_coll_flexGridSizer1_Items(self.flexGridSizer1)
-
+        self._init_coll_flexGridSizer1_Growables(self.flexGridSizer1)
+        self._init_coll_MainSizer_Items(self.MainSizer)
+        self._init_coll_MainSizer_Growables(self.MainSizer)
+        
         self.SetSizer(self.flexGridSizer1)
-
+        
     def _init_ctrls(self, prnt):
-        # generated method, don't edit
-        wx.Dialog.__init__(self, id=wxID_NODEINFOSDIALOG,
+        wx.Dialog.__init__(self, id=ID_NODEINFOSDIALOG,
               name='NodeInfosDialog', parent=prnt, pos=wx.Point(376, 223),
-              size=wx.Size(300, 300), style=wx.DEFAULT_DIALOG_STYLE,
+              size=wx.Size(300, 280), style=wx.DEFAULT_DIALOG_STYLE,
               title='Node Infos')
-        self.SetClientSize(wx.Size(300, 300))
+        self.SetClientSize(wx.Size(300, 280))
 
-        self.MainPanel = wx.Panel(id=wxID_NODEINFOSDIALOGMAINPANEL,
-              name='MainPanel', parent=self, pos=wx.Point(0, 0),
-              size=wx.Size(280, 264), style=wx.TAB_TRAVERSAL)
-        self.MainPanel.SetAutoLayout(True)
+        self.staticText1 = wx.StaticText(id=ID_NODEINFOSDIALOGSTATICTEXT1,
+              label='Name:', name='staticText1', parent=self,
+              pos=wx.Point(0, 0), size=wx.Size(0, 17), style=0)
 
-        self.staticText1 = wx.StaticText(id=wxID_NODEINFOSDIALOGSTATICTEXT1,
-              label='Name:', 
-              name='staticText1', parent=self.MainPanel,
-              pos=wx.Point(24, 24), size=wx.Size(156, 17), style=0)
+        self.NodeName = wx.TextCtrl(id=ID_NODEINFOSDIALOGNAME, name='NodeName',
+              parent=self, pos=wx.Point(0, 0), size=wx.Size(0, 24), 
+              style=0, value='')
 
-        self.Name = wx.TextCtrl(id=wxID_NODEINFOSDIALOGNAME, name='Name',
-              parent=self.MainPanel, pos=wx.Point(24, 48), size=wx.Size(250,
-              25), style=0, value='')
+        self.staticText2 = wx.StaticText(id=ID_NODEINFOSDIALOGSTATICTEXT2,
+              label='Node ID:', name='staticText2', parent=self,
+              pos=wx.Point(0, 0), size=wx.Size(0, 17), style=0)
 
-        self.staticText2 = wx.StaticText(id=wxID_NODEINFOSDIALOGSTATICTEXT2,
-              label='Node ID:', name='staticText2', parent=self.MainPanel,
-              pos=wx.Point(24, 80), size=wx.Size(67, 17), style=0)
+        self.NodeID = wx.TextCtrl(id=ID_NODEINFOSDIALOGNODEID, name='NodeID',
+              parent=self, pos=wx.Point(0, 0), size=wx.Size(0, 25), 
+              style=wx.TE_RIGHT, value='')
 
-        self.NodeID = wx.TextCtrl(id=wxID_NODEINFOSDIALOGNODEID, name='NodeID',
-              parent=self.MainPanel, pos=wx.Point(24, 104), size=wx.Size(250,
-              25), style=wx.TE_RIGHT, value='')
+        self.staticText3 = wx.StaticText(id=ID_NODEINFOSDIALOGSTATICTEXT3,
+              label='Type:', name='staticText3', parent=self,
+              pos=wx.Point(0, 0), size=wx.Size(0, 17), style=0)
 
-        self.staticText3 = wx.StaticText(id=wxID_NODEINFOSDIALOGSTATICTEXT3,
-              label='Type:', name='staticText3', parent=self.MainPanel,
-              pos=wx.Point(24, 136), size=wx.Size(71, 17), style=0)
+        self.Type = wx.Choice(choices=[], id=ID_NODEINFOSDIALOGTYPE,
+              name='Type', parent=self, pos=wx.Point(0, 0),
+              size=wx.Size(0, 25), style=0)
 
-        self.Type = wx.Choice(choices=[], id=wxID_NODEINFOSDIALOGTYPE,
-              name='Type', parent=self.MainPanel, pos=wx.Point(24, 160),
-              size=wx.Size(250, 25), style=0)
+        self.staticText4 = wx.StaticText(id=ID_NODEINFOSDIALOGSTATICTEXT4,
+              label='Default String Size:', name='staticText4', parent=self,
+              pos=wx.Point(0, 0), size=wx.Size(0, 17), style=0)
 
-        self.staticText4 = wx.StaticText(id=wxID_NODEINFOSDIALOGSTATICTEXT4,
-              label='Description:', name='staticText4', parent=self.MainPanel,
-              pos=wx.Point(24, 192), size=wx.Size(71, 17), style=0)
+        self.DefaultStringSize = wx.SpinCtrl(id=ID_NODEINFOSDIALOGDEFAULTSTRINGSIZE, 
+              name='DefaultStringSize', parent=self, pos=wx.Point(0, 0), 
+              size=wx.Size(0, 25), style=wx.TE_RIGHT)
+        
+        self.staticText5 = wx.StaticText(id=ID_NODEINFOSDIALOGSTATICTEXT5,
+              label='Description:', name='staticText5', parent=self,
+              pos=wx.Point(0, 0), size=wx.Size(0, 17), style=0)
 
-        self.Description = wx.TextCtrl(id=wxID_NODEINFOSDIALOGDESCRIPTION, 
-              name='Description', parent=self.MainPanel, pos=wx.Point(24, 216), 
-              size=wx.Size(250, 25), style=0, value='')
+        self.Description = wx.TextCtrl(id=ID_NODEINFOSDIALOGDESCRIPTION, 
+              name='Description', parent=self, pos=wx.Point(0, 0), 
+              size=wx.Size(0, 24), style=0, value='')
 
+        self.ButtonSizer = self.CreateButtonSizer(wx.OK|wx.CANCEL)
+        self.Bind(wx.EVT_BUTTON, self.OnOK, id=self.ButtonSizer.GetAffirmativeButton().GetId())
+        
         self._init_sizers()
 
     def __init__(self, parent):
         self._init_ctrls(parent)
-        self.ButtonSizer = self.CreateButtonSizer(wxOK|wxCANCEL)
-        self.flexGridSizer1.Add(self.ButtonSizer, 1, wxALIGN_CENTER)
+        
+        self.staticText2.Hide()
+        self.NodeID.Hide()
+        
         self.Type.Append("master")
         self.Type.Append("slave")
 
-        EVT_BUTTON(self, self.ButtonSizer.GetAffirmativeButton().GetId(), self.OnOK)
-
     def OnOK(self, event):
-        name = self.Name.GetValue()
+        name = self.NodeName.GetValue()
         message = ""
         if name != "":
             good = not name[0].isdigit()
@@ -626,25 +763,27 @@ class NodeInfosDialog(wx.Dialog):
             except:
                 message = "Node ID must be integer!"
         if message != "":
-            message = wxMessageDialog(self, message, "ERROR", wxOK|wxICON_ERROR)
+            message = wx.MessageDialog(self, message, "ERROR", wx.OK|wx.ICON_ERROR)
             message.ShowModal()
             message.Destroy()
-            self.Name.SetFocus()
+            self.NodeName.SetFocus()
         else:
-            self.EndModal(wxID_OK)
+            self.EndModal(wx.ID_OK)
     
-    def SetValues(self, name, id, type, description):
-        self.Name.SetValue(name)
+    def SetValues(self, name, id, type, description, defaultstringsize):
+        self.NodeName.SetValue(name)
         self.NodeID.SetValue("0x%02X"%id)
         self.Type.SetStringSelection(type)
         self.Description.SetValue(description)
+        self.DefaultStringSize.SetValue(defaultstringsize)
 
     def GetValues(self):
-        name = self.Name.GetValue()
+        name = self.NodeName.GetValue()
         nodeid = int(self.NodeID.GetValue(), 16)
         type = self.Type.GetStringSelection()
         description = self.Description.GetValue()
-        return name, nodeid, type, description
+        defaultstringsize = self.DefaultStringSize.GetValue()
+        return name, nodeid, type, description, defaultstringsize
 
 
 
@@ -653,149 +792,219 @@ class NodeInfosDialog(wx.Dialog):
 #-------------------------------------------------------------------------------
 
 
-[wxID_CREATENODEDIALOG, wxID_CREATENODEDIALOGEMERGENCY, 
wxID_CREATENODEDIALOGGENSYNC, wxID_CREATENODEDIALOGMAINPANEL
wxID_CREATENODEDIALOGNAME, wxID_CREATENODEDIALOGNMT_HEARTBEAT, 
wxID_CREATENODEDIALOGNMT_NODEGUARDING, wxID_CREATENODEDIALOGNMT_NONE, 
wxID_CREATENODEDIALOGNODEID, wxID_CREATENODEDIALOGPROFILE, 
wxID_CREATENODEDIALOGSAVECONFIG, wxID_CREATENODEDIALOGSTATICTEXT1, 
wxID_CREATENODEDIALOGSTATICTEXT2, wxID_CREATENODEDIALOGSTATICTEXT3, 
wxID_CREATENODEDIALOGSTATICTEXT4, wxID_CREATENODEDIALOGSTATICTEXT5, 
wxID_CREATENODEDIALOGSTATICTEXT6, wxID_CREATENODEDIALOGSTATICTEXT7,
wxID_CREATENODEDIALOGSTOREEDS, wxID_CREATENODEDIALOGDESCRIPTION,
wxID_CREATENODEDIALOGTYPE, 
+[ID_CREATENODEDIALOG, ID_CREATENODEDIALOGEMERGENCY, 
ID_CREATENODEDIALOGGENSYNC, ID_CREATENODEDIALOGSPACER
ID_CREATENODEDIALOGNAME, ID_CREATENODEDIALOGNMT_HEARTBEAT, 
ID_CREATENODEDIALOGNMT_NODEGUARDING, ID_CREATENODEDIALOGNMT_NONE, 
ID_CREATENODEDIALOGNODEID, ID_CREATENODEDIALOGPROFILE, 
ID_CREATENODEDIALOGSAVECONFIG, ID_CREATENODEDIALOGSTATICTEXT1, 
ID_CREATENODEDIALOGSTATICTEXT2, ID_CREATENODEDIALOGSTATICTEXT3, 
ID_CREATENODEDIALOGSTATICTEXT4, ID_CREATENODEDIALOGSTATICTEXT5, 
ID_CREATENODEDIALOGSTATICTEXT6, ID_CREATENODEDIALOGSTATICTEXT7,
ID_CREATENODEDIALOGSTOREEDS, ID_CREATENODEDIALOGDESCRIPTION,
+ ID_CREATENODEDIALOGTYPE, 
 ] = [wx.NewId() for _init_ctrls in range(21)]
 
 class CreateNodeDialog(wx.Dialog):
     def _init_coll_flexGridSizer1_Items(self, parent):
-        # generated method, don't edit
+        parent.AddSizer(self.MainSizer, 0, border=20, flag=wx.GROW|wx.TOP|wx.LEFT|wx.RIGHT)
+        parent.AddSizer(self.ButtonSizer, 0, border=20, flag=wx.ALIGN_RIGHT|wx.BOTTOM|wx.LEFT|wx.RIGHT)
 
-        parent.AddWindow(self.MainPanel, 0, border=0, flag=0)
+    def _init_coll_flexGridSizer1_Growables(self, parent):
+        parent.AddGrowableCol(0)
+        parent.AddGrowableRow(0)
 
-    def _init_sizers(self):
-        # generated method, don't edit
-        self.flexGridSizer1 = wx.FlexGridSizer(cols=1, hgap=0, rows=2, vgap=0)
+    def _init_coll_MainSizer_Items(self, parent):
+        parent.AddSizer(self.TopBoxSizer, 0, border=0, flag=wx.GROW)
+        parent.AddWindow(self.staticText7, 0, border=0, flag=wx.GROW)
+        parent.AddWindow(self.Description, 0, border=0, flag=wx.GROW)
 
-        self._init_coll_flexGridSizer1_Items(self.flexGridSizer1)
+    def _init_coll_MainSizer_Growables(self, parent):
+        parent.AddGrowableCol(0)
+        parent.AddGrowableCol(0)
+    
+    def _init_coll_TopBoxSizer_Items(self, parent):
+        parent.AddSizer(self.LeftBoxSizer, 1, border=10, flag=wx.GROW|wx.RIGHT)
+        parent.AddSizer(self.RightGridSizer, 1, border=10, flag=wx.GROW|wx.LEFT)
+    
+    def _init_coll_LeftBoxSizer_Items(self, parent):
+        parent.AddWindow(self.staticText1, 0, border=5, flag=wx.GROW|wx.BOTTOM)
+        parent.AddWindow(self.Type, 0, border=10, flag=wx.GROW|wx.BOTTOM)
+        parent.AddWindow(self.staticText2, 0, border=5, flag=wx.GROW|wx.BOTTOM)
+        parent.AddWindow(self.NodeName, 0, border=10, flag=wx.GROW|wx.BOTTOM)
+        parent.AddWindow(self.staticText3, 0, border=5, flag=wx.GROW|wx.BOTTOM)
+        parent.AddWindow(self.NodeID, 0, border=10, flag=wx.GROW|wx.BOTTOM)
+        parent.AddWindow(self.staticText4, 0, border=5, flag=wx.GROW|wx.BOTTOM)
+        parent.AddWindow(self.Profile, 0, border=20, flag=wx.GROW|wx.BOTTOM)
+
+    def _init_coll_RightGridSizer_Items(self, parent):
+        parent.AddSizer(self.RightTopGridSizer, 0, border=0, flag=wx.GROW)
+        parent.AddWindow(self.Spacer, 0, border=0, flag=wx.GROW)
+        parent.AddSizer(self.RightBottomGridSizer, 0, border=0, flag=wx.GROW)
+
+    def _init_coll_RightGridSizer_Growables(self, parent):
+        parent.AddGrowableCol(0)
+        parent.AddGrowableRow(1)
+
+    def _init_coll_RightTopGridSizer_Items(self, parent):
+        parent.AddWindow(self.staticText5, 0, border=0, flag=wx.GROW)
+        parent.AddWindow(self.NMT_None, 0, border=0, flag=wx.GROW)
+        parent.AddWindow(self.NMT_NodeGuarding, 0, border=0, flag=wx.GROW)
+        parent.AddWindow(self.NMT_Heartbeat, 0, border=0, flag=wx.GROW)
+        
+    def _init_coll_RightTopGridSizer_Growables(self, parent):
+        parent.AddGrowableCol(0)
+        
+    def _init_coll_RightBottomGridSizer_Items(self, parent):
+        parent.AddWindow(self.staticText6, 0, border=0, flag=wx.GROW)
+        parent.AddWindow(self.DS302, 0, border=0, flag=wx.GROW)
+        parent.AddWindow(self.GenSYNC, 0, border=0, flag=wx.GROW)
+        parent.AddWindow(self.Emergency, 0, border=0, flag=wx.GROW)
+        parent.AddWindow(self.SaveConfig, 0, border=0, flag=wx.GROW)
+        parent.AddWindow(self.StoreEDS, 0, border=0, flag=wx.GROW)
+        
+    def _init_coll_RightBottomGridSizer_Growables(self, parent):
+        parent.AddGrowableCol(0)
 
+    def _init_sizers(self):
+        self.flexGridSizer1 = wx.FlexGridSizer(cols=1, hgap=0, rows=2, vgap=10)
+        self.MainSizer = wx.FlexGridSizer(cols=1, hgap=5, rows=3, vgap=0)
+        self.TopBoxSizer = wx.BoxSizer(wx.HORIZONTAL)
+        self.LeftBoxSizer = wx.BoxSizer(wx.VERTICAL)
+        self.RightGridSizer = wx.FlexGridSizer(cols=1, hgap=0, rows=3, vgap=5)
+        self.RightTopGridSizer = wx.FlexGridSizer(cols=1, hgap=0, rows=4, vgap=0)
+        self.RightBottomGridSizer = wx.FlexGridSizer(cols=1, hgap=0, rows=6, vgap=0)
+        
+        self._init_coll_flexGridSizer1_Items(self.flexGridSizer1)
+        self._init_coll_flexGridSizer1_Growables(self.flexGridSizer1)
+        self._init_coll_MainSizer_Items(self.MainSizer)
+        self._init_coll_MainSizer_Growables(self.MainSizer)
+        self._init_coll_TopBoxSizer_Items(self.TopBoxSizer)
+        self._init_coll_LeftBoxSizer_Items(self.LeftBoxSizer)
+        self._init_coll_RightGridSizer_Items(self.RightGridSizer)
+        self._init_coll_RightGridSizer_Growables(self.RightGridSizer)
+        self._init_coll_RightTopGridSizer_Items(self.RightTopGridSizer)
+        self._init_coll_RightTopGridSizer_Growables(self.RightTopGridSizer)
+        self._init_coll_RightBottomGridSizer_Items(self.RightBottomGridSizer)
+        self._init_coll_RightBottomGridSizer_Growables(self.RightBottomGridSizer)
+        
         self.SetSizer(self.flexGridSizer1)
 
-    def _init_ctrls(self, prnt):
-        # generated method, don't edit
-        wx.Dialog.__init__(self, id=wxID_CREATENODEDIALOG,
+    def _init_ctrls(self, prnt, buttons):
+        wx.Dialog.__init__(self, id=ID_CREATENODEDIALOG,
               name='CreateNodeDialog', parent=prnt, pos=wx.Point(376, 223),
-              size=wx.Size(451, 376), style=wx.DEFAULT_DIALOG_STYLE,
+              size=wx.Size(450, 350), style=wx.DEFAULT_DIALOG_STYLE,
               title='Create a new Node')
-        self.SetClientSize(wx.Size(451, 376))
-
-        self.MainPanel = wx.Panel(id=wxID_CREATENODEDIALOGMAINPANEL,
-              name='MainPanel', parent=self, pos=wx.Point(0, 0),
-              size=wx.Size(440, 278), style=wx.TAB_TRAVERSAL)
-        self.MainPanel.SetAutoLayout(True)
+        self.SetClientSize(wx.Size(450, 350))
 
-        self.staticText1 = wx.StaticText(id=wxID_CREATENODEDIALOGSTATICTEXT1,
-              label='Name:', name='staticText1', parent=self.MainPanel,
-              pos=wx.Point(24, 24), size=wx.Size(156, 17), style=0)
+        self.staticText1 = wx.StaticText(id=ID_CREATENODEDIALOGSTATICTEXT1,
+              label='Type:', name='staticText1', parent=self,
+              pos=wx.Point(0, 0), size=wx.Size(0, 17), style=0)
 
-        self.staticText2 = wx.StaticText(id=wxID_CREATENODEDIALOGSTATICTEXT2,
-              label='Node ID:', name='staticText2', parent=self.MainPanel,
-              pos=wx.Point(24, 80), size=wx.Size(67, 17), style=0)
+        self.staticText2 = wx.StaticText(id=ID_CREATENODEDIALOGSTATICTEXT2,
+              label='Name:', name='staticText2', parent=self,
+              pos=wx.Point(0, 0), size=wx.Size(0, 17), style=0)
 
-        self.staticText3 = wx.StaticText(id=wxID_CREATENODEDIALOGSTATICTEXT3,
-              label='Type:', name='staticText3', parent=self.MainPanel,
-              pos=wx.Point(24, 136), size=wx.Size(71, 17), style=0)
+        self.staticText3 = wx.StaticText(id=ID_CREATENODEDIALOGSTATICTEXT3,
+              label='Node ID:', name='staticText3', parent=self,
+              pos=wx.Point(0, 0), size=wx.Size(0, 17), style=0)
 
-        self.Type = wx.Choice(choices=[], id=wxID_CREATENODEDIALOGTYPE,
-              name='Type', parent=self.MainPanel, pos=wx.Point(24, 160),
-              size=wx.Size(200, 24), style=0)
+        self.staticText4 = wx.StaticText(id=ID_CREATENODEDIALOGSTATICTEXT4,
+              label='Profile:', name='staticText4', parent=self,
+              pos=wx.Point(0, 0), size=wx.Size(0, 17), style=0)
 
-        self.Name = wx.TextCtrl(id=wxID_CREATENODEDIALOGNAME, name='Name',
-              parent=self.MainPanel, pos=wx.Point(24, 48), size=wx.Size(200,
-              25), style=0, value='')
+        self.Type = wx.Choice(choices=[], id=ID_CREATENODEDIALOGTYPE,
+              name='Type', parent=self, pos=wx.Point(0, 0),
+              size=wx.Size(0, 25), style=0)
 
-        self.NodeID = wx.TextCtrl(id=wxID_CREATENODEDIALOGNODEID, name='NodeID',
-              parent=self.MainPanel, pos=wx.Point(24, 104), size=wx.Size(200,
-              25), style=wx.TE_RIGHT, value='')
+        self.NodeName = wx.TextCtrl(id=ID_CREATENODEDIALOGNAME, name='NodeName',
+              parent=self, pos=wx.Point(0, 0), size=wx.Size(0, 24), 
+              style=0, value='')
 
-        self.staticText4 = wx.StaticText(id=wxID_CREATENODEDIALOGSTATICTEXT4,
-              label='Profile:', name='staticText4', parent=self.MainPanel,
-              pos=wx.Point(24, 192), size=wx.Size(47, 17), style=0)
+        self.NodeID = wx.TextCtrl(id=ID_CREATENODEDIALOGNODEID, name='NodeID',
+              parent=self, pos=wx.Point(0, 0), size=wx.Size(0, 24), 
+              style=wx.TE_RIGHT, value='')
 
-        self.Profile = wx.Choice(choices=[], id=wxID_CREATENODEDIALOGPROFILE,
-              name='Profile', parent=self.MainPanel, pos=wx.Point(24, 216),
-              size=wx.Size(200, 24), style=0)
+        self.Profile = wx.Choice(choices=[], id=ID_CREATENODEDIALOGPROFILE,
+              name='Profile', parent=self, pos=wx.Point(0, 0),
+              size=wx.Size(0, 24), style=0)
         self.Profile.Bind(wx.EVT_CHOICE, self.OnProfileChoice,
-              id=wxID_CREATENODEDIALOGPROFILE)
+              id=ID_CREATENODEDIALOGPROFILE)
 
-        self.staticText5 = wx.StaticText(id=wxID_CREATENODEDIALOGSTATICTEXT5,
+        self.staticText5 = wx.StaticText(id=ID_CREATENODEDIALOGSTATICTEXT5,
               label='Network Management:', name='staticText5',
-              parent=self.MainPanel, pos=wx.Point(256, 24), size=wx.Size(152,
-              16), style=0)
+              parent=self, pos=wx.Point(0, 0), size=wx.Size(0, 17), style=0)
 
-        self.NMT_None = wx.RadioButton(id=wxID_CREATENODEDIALOGNMT_NONE,
-              label='None', name='NMT_None', parent=self.MainPanel,
-              pos=wx.Point(256, 40), size=wx.Size(114, 24), style=0)
+        self.NMT_None = wx.RadioButton(id=ID_CREATENODEDIALOGNMT_NONE,
+              label='None', name='NMT_None', parent=self,
+              pos=wx.Point(0, 0), size=wx.Size(0, 24), style=wx.RB_GROUP)
         self.NMT_None.SetValue(True)
 
-        self.NMT_NodeGuarding = wx.RadioButton(id=wxID_CREATENODEDIALOGNMT_NODEGUARDING,
-              label='Node Guarding', name='NMT_NodeGuarding',
-              parent=self.MainPanel, pos=wx.Point(256, 64), size=wx.Size(128,
-              24), style=0)
+        self.NMT_NodeGuarding = wx.RadioButton(id=ID_CREATENODEDIALOGNMT_NODEGUARDING,
+              label='Node Guarding', name='NMT_NodeGuarding', parent=self, 
+              pos=wx.Point(0, 0), size=wx.Size(0, 24), style=0)
         self.NMT_NodeGuarding.SetValue(False)
 
-        self.NMT_Heartbeat = wx.RadioButton(id=wxID_CREATENODEDIALOGNMT_HEARTBEAT,
-              label='Heartbeat', name='NMT_Heartbeat', parent=self.MainPanel,
-              pos=wx.Point(256, 88), size=wx.Size(114, 24), style=0)
+        self.NMT_Heartbeat = wx.RadioButton(id=ID_CREATENODEDIALOGNMT_HEARTBEAT,
+              label='Heartbeat', name='NMT_Heartbeat', parent=self,
+              pos=wx.Point(0, 0), size=wx.Size(0, 24), style=0)
         self.NMT_Heartbeat.SetValue(False)
 
-        self.staticText6 = wx.StaticText(id=wxID_CREATENODEDIALOGSTATICTEXT6,
-              label='Options:', name='staticText6', parent=self.MainPanel,
-              pos=wx.Point(256, 128), size=wx.Size(72, 17), style=0)
+        self.staticText6 = wx.StaticText(id=ID_CREATENODEDIALOGSTATICTEXT6,
+              label='Options:', name='staticText6', parent=self,
+              pos=wx.Point(0, 0), size=wx.Size(0, 17), style=0)
 
-        self.DS302 = wx.CheckBox(id=wxID_CREATENODEDIALOGGENSYNC,
-              label='DS-302 Profile', name='DS302', parent=self.MainPanel,
-              pos=wx.Point(256, 144), size=wx.Size(128, 24), style=0)
+        self.DS302 = wx.CheckBox(id=ID_CREATENODEDIALOGGENSYNC,
+              label='DS-302 Profile', name='DS302', parent=self,
+              pos=wx.Point(0, 0), size=wx.Size(0, 24), style=0)
         self.DS302.SetValue(False)
         #self.DS302.Enable(False)
 
-        self.GenSYNC = wx.CheckBox(id=wxID_CREATENODEDIALOGGENSYNC,
-              label='Generate SYNC', name='GenSYNC', parent=self.MainPanel,
-              pos=wx.Point(256, 168), size=wx.Size(128, 24), style=0)
+        self.GenSYNC = wx.CheckBox(id=ID_CREATENODEDIALOGGENSYNC,
+              label='Generate SYNC', name='GenSYNC', parent=self,
+              pos=wx.Point(0, 0), size=wx.Size(0, 24), style=0)
         self.GenSYNC.SetValue(False)
 
-        self.Emergency = wx.CheckBox(id=wxID_CREATENODEDIALOGEMERGENCY,
+        self.Emergency = wx.CheckBox(id=ID_CREATENODEDIALOGEMERGENCY,
               label='Emergency support', name='Emergency',
-              parent=self.MainPanel, pos=wx.Point(256, 192), size=wx.Size(152,
-              24), style=0)
+              parent=self, pos=wx.Point(0, 0), size=wx.Size(0, 24), style=0)
         self.Emergency.SetValue(False)
-        self.Emergency.Enable(False)
 
-        self.SaveConfig = wx.CheckBox(id=wxID_CREATENODEDIALOGSAVECONFIG,
-              label='Save Configuration', name='SaveConfig',
-              parent=self.MainPanel, pos=wx.Point(256, 216), size=wx.Size(152,
-              24), style=0)
+        self.SaveConfig = wx.CheckBox(id=ID_CREATENODEDIALOGSAVECONFIG,
+              label='Save Configuration', name='SaveConfig', parent=self, 
+              pos=wx.Point(0, 0), size=wx.Size(0, 24), style=0)
         self.SaveConfig.SetValue(False)
         self.SaveConfig.Enable(False)
 
-#        self.StoreEDS = wx.CheckBox(id=wxID_CREATENODEDIALOGSTOREEDS,
-#              label='Store EDS', name='StoreEDS', parent=self.MainPanel,
-#              pos=wx.Point(256, 240), size=wx.Size(144, 24), style=0)
-#        self.StoreEDS.SetValue(False)
+        self.StoreEDS = wx.CheckBox(id=ID_CREATENODEDIALOGSTOREEDS,
+              label='Store EDS', name='StoreEDS', parent=self,
+              pos=wx.Point(0, 0), size=wx.Size(0, 24), style=0)
+        self.StoreEDS.SetValue(False)
+        self.StoreEDS.Hide()
 
-        self.staticText7 = wx.StaticText(id=wxID_CREATENODEDIALOGSTATICTEXT7,
-              label='Description:', name='staticText7', parent=self.MainPanel,
-              pos=wx.Point(24, 248), size=wx.Size(71, 17), style=0)
+        self.staticText7 = wx.StaticText(id=ID_CREATENODEDIALOGSTATICTEXT7,
+              label='Description:', name='staticText7', parent=self,
+              pos=wx.Point(0, 0), size=wx.Size(0, 17), style=0)
 
-        self.Description = wx.TextCtrl(id=wxID_CREATENODEDIALOGDESCRIPTION, 
-              name='Description', parent=self.MainPanel, pos=wx.Point(24, 272), 
-              size=wx.Size(400, 25), style=0, value='')
+        self.Description = wx.TextCtrl(id=ID_CREATENODEDIALOGDESCRIPTION, 
+              name='Description', parent=self, pos=wx.Point(0, 0), 
+              size=wx.Size(0, 24), style=0, value='')
 
+        self.Spacer = wx.Panel(id=ID_CREATENODEDIALOGSPACER,
+              name='Spacer', parent=self, pos=wx.Point(0, 0),
+              size=wx.Size(0, 0), style=wx.TAB_TRAVERSAL)
+
+        self.ButtonSizer = self.CreateButtonSizer(buttons)
+        self.Bind(wx.EVT_BUTTON, self.OnOK, id=self.ButtonSizer.GetAffirmativeButton().GetId())
+        
         self._init_sizers()
 
-    def __init__(self, parent):
-        self._init_ctrls(parent)
-        self.ButtonSizer = self.CreateButtonSizer(wxOK|wxCANCEL)
-        self.flexGridSizer1.Add(self.ButtonSizer, 1, wxALIGN_CENTER)
+    def __init__(self, parent,buttons=wx.OK|wx.CANCEL):
+        self._init_ctrls(parent,buttons)
+        
+        self.staticText3.Hide()
+        self.NodeID.Hide()
+        
         self.NodeID.SetValue("0x00")
         self.Type.Append("master")
         self.Type.Append("slave")
@@ -813,12 +1022,10 @@ class CreateNodeDialog(wx.Dialog):
                 self.Profile.Append(name)
         self.Profile.Append("Other")
         self.Profile.SetStringSelection("None")
-        self.Name.SetFocus()
+        self.NodeName.SetFocus()
         
-        EVT_BUTTON(self, self.ButtonSizer.GetAffirmativeButton().GetId(), self.OnOK)
-
     def OnOK(self, event):
-        name = self.Name.GetValue()
+        name = self.NodeName.GetValue()
         message = ""
         if name != "":
             good = not name[0].isdigit()
@@ -832,15 +1039,15 @@ class CreateNodeDialog(wx.Dialog):
             except:
                 message = "Node ID must be an integer!"
         if message != "":
-            message = wxMessageDialog(self, message, "ERROR", wxOK|wxICON_ERROR)
+            message = wx.MessageDialog(self, message, "ERROR", wx.OK|wx.ICON_ERROR)
             message.ShowModal()
             message.Destroy()
-            self.Name.SetFocus()
+            self.NodeName.SetFocus()
         else:
-            self.EndModal(wxID_OK)
+            self.EndModal(wx.ID_OK)
 
     def GetValues(self):
-        name = self.Name.GetValue()
+        name = self.NodeName.GetValue()
         nodeid = 0
         if self.NodeID.GetValue() != "":
             nodeid = int(self.NodeID.GetValue(), 16)
@@ -871,13 +1078,13 @@ class CreateNodeDialog(wx.Dialog):
             options.append("Emergency")
         if self.SaveConfig.GetValue():
             options.append("SaveConfig")
-#        if self.StoreEDS.GetValue():
-#            options.append("StoreEDS")
+        if self.StoreEDS.GetValue():
+            options.append("StoreEDS")
         return options
 
     def OnProfileChoice(self, event):
         if self.Profile.GetStringSelection() == "Other":
-            dialog = wxFileDialog(self, "Choose a file", self.Directory, "",  "OD Profile files (*.prf)|*.prf|All files|*.*", wxOPEN|wxCHANGE_DIR)
+            dialog = wx.FileDialog(self, "Choose a file", self.Directory, "",  "OD Profile files (*.prf)|*.prf|All files|*.*", wx.OPEN|wx.CHANGE_DIR)
             dialog.ShowModal()
             filepath = dialog.GetPath()
             dialog.Destroy()
@@ -896,80 +1103,97 @@ class CreateNodeDialog(wx.Dialog):
 #                            ADD Slave to NodeList Dialog
 #-------------------------------------------------------------------------------
 
-[wxID_ADDSLAVEDIALOG, wxID_ADDSLAVEDIALOGMAINPANEL, wxID_ADDSLAVEDIALOGSLAVENAME, 
wxID_ADDSLAVEDIALOGSLAVENODEID, wxID_ADDSLAVEDIALOGEDSFILE, 
wxID_ADDSLAVEDIALOGIMPORTEDS, wxID_ADDSLAVEDIALOGSTATICTEXT1, 
wxID_ADDSLAVEDIALOGSTATICTEXT2, wxID_ADDSLAVEDIALOGSTATICTEXT3, 
-] = [wx.NewId() for _init_ctrls in range(9)]
+[ID_ADDSLAVEDIALOG, ID_ADDSLAVEDIALOGSLAVENAME, 
ID_ADDSLAVEDIALOGSLAVENODEID, ID_ADDSLAVEDIALOGEDSFILE, 
ID_ADDSLAVEDIALOGIMPORTEDS, ID_ADDSLAVEDIALOGSTATICTEXT1, 
ID_ADDSLAVEDIALOGSTATICTEXT2, ID_ADDSLAVEDIALOGSTATICTEXT3, 
+] = [wx.NewId() for _init_ctrls in range(8)]
 
 class AddSlaveDialog(wx.Dialog):
     def _init_coll_flexGridSizer1_Items(self, parent):
-        # generated method, don't edit
+        parent.AddSizer(self.MainSizer, 0, border=20, flag=wx.GROW|wx.TOP|wx.LEFT|wx.RIGHT)
+        parent.AddSizer(self.ButtonSizer, 0, border=20, flag=wx.ALIGN_RIGHT|wx.BOTTOM|wx.LEFT|wx.RIGHT)
 
-        parent.AddWindow(self.MainPanel, 0, border=0, flag=0)
+    def _init_coll_flexGridSizer1_Growables(self, parent):
+        parent.AddGrowableCol(0)
+        parent.AddGrowableRow(0)
 
-    def _init_sizers(self):
-        # generated method, don't edit
-        self.flexGridSizer1 = wx.FlexGridSizer(cols=1, hgap=0, rows=2, vgap=0)
+    def _init_coll_MainSizer_Items(self, parent):
+        parent.AddWindow(self.staticText1, 0, border=5, flag=wx.GROW|wx.BOTTOM)
+        parent.AddWindow(self.SlaveName, 0, border=10, flag=wx.GROW|wx.BOTTOM)
+        parent.AddWindow(self.staticText2, 0, border=5, flag=wx.GROW|wx.BOTTOM)
+        parent.AddWindow(self.SlaveNodeID, 0, border=10, flag=wx.GROW|wx.BOTTOM)
+        parent.AddWindow(self.staticText3, 0, border=5, flag=wx.GROW|wx.BOTTOM)
+        parent.AddSizer(self.BottomSizer, 0, border=0, flag=wx.GROW)
 
-        self._init_coll_flexGridSizer1_Items(self.flexGridSizer1)
+    def _init_coll_BottomSizer_Items(self, parent):
+        parent.AddWindow(self.EDSFile, 0, border=4, flag=wx.GROW|wx.TOP|wx.BOTTOM)
+        parent.AddWindow(self.ImportEDS, 0, border=0, flag=0)
+
+    def _init_coll_BottomSizer_Growables(self, parent):
+        parent.AddGrowableCol(0)
+        parent.AddGrowableRow(0)
 
+    def _init_sizers(self):
+        self.flexGridSizer1 = wx.FlexGridSizer(cols=1, hgap=0, rows=2, vgap=10)
+        self.MainSizer = wx.BoxSizer(wx.VERTICAL)
+        self.BottomSizer = wx.FlexGridSizer(cols=2, hgap=5, rows=1, vgap=0)
+        
+        self._init_coll_flexGridSizer1_Items(self.flexGridSizer1)
+        self._init_coll_flexGridSizer1_Growables(self.flexGridSizer1)
+        self._init_coll_MainSizer_Items(self.MainSizer)
+        self._init_coll_BottomSizer_Items(self.BottomSizer)
+        self._init_coll_BottomSizer_Growables(self.BottomSizer)
+        
         self.SetSizer(self.flexGridSizer1)
 
     def _init_ctrls(self, prnt):
-        # generated method, don't edit
-        wx.Dialog.__init__(self, id=wxID_ADDSLAVEDIALOG,
+        wx.Dialog.__init__(self, id=ID_ADDSLAVEDIALOG,
               name='AddSlaveDialog', parent=prnt, pos=wx.Point(376, 223),
-              size=wx.Size(300, 250), style=wx.DEFAULT_DIALOG_STYLE,
+              size=wx.Size(300, 250), style=wx.DEFAULT_DIALOG_STYLE|wx.RESIZE_BORDER,
               title='Add a slave to nodelist')
         self.SetClientSize(wx.Size(300, 250))
 
-        self.MainPanel = wx.Panel(id=wxID_ADDSLAVEDIALOGMAINPANEL,
-              name='MainPanel', parent=self, pos=wx.Point(0, 0),
-              size=wx.Size(350, 250), style=wx.TAB_TRAVERSAL)
-        self.MainPanel.SetAutoLayout(True)
-
-        self.staticText1 = wx.StaticText(id=wxID_ADDSLAVEDIALOGSTATICTEXT1,
-              label='Slave Name:', name='staticText1', parent=self.MainPanel,
-              pos=wx.Point(24, 24), size=wx.Size(150, 17), style=0)
+        self.staticText1 = wx.StaticText(id=ID_ADDSLAVEDIALOGSTATICTEXT1,
+              label='Slave Name:', name='staticText1', parent=self,
+              pos=wx.Point(0, 0), size=wx.Size(0, 17), style=0)
 
-        self.SlaveName = wx.TextCtrl(id=wxID_ADDSLAVEDIALOGSLAVENAME,
-              name='SlaveName', parent=self.MainPanel, pos=wx.Point(24, 48), 
-              size=wx.Size(250, 24), style=0)
+        self.SlaveName = wx.TextCtrl(id=ID_ADDSLAVEDIALOGSLAVENAME,
+              name='SlaveName', parent=self, pos=wx.Point(0, 0), 
+              size=wx.Size(0, 24), style=0)
 
-        self.staticText2 = wx.StaticText(id=wxID_ADDSLAVEDIALOGSTATICTEXT2,
-              label='Slave Node ID:', name='staticText2', parent=self.MainPanel,
-              pos=wx.Point(24, 80), size=wx.Size(150, 17), style=0)
+        self.staticText2 = wx.StaticText(id=ID_ADDSLAVEDIALOGSTATICTEXT2,
+              label='Slave Node ID:', name='staticText2', parent=self,
+              pos=wx.Point(0, 0), size=wx.Size(0, 17), style=0)
 
-        self.SlaveNodeID = wx.TextCtrl(id=wxID_ADDSLAVEDIALOGSLAVENODEID,
-              name='SlaveName', parent=self.MainPanel, pos=wx.Point(24, 104), 
-              size=wx.Size(250, 24), style=wxALIGN_RIGHT)
+        self.SlaveNodeID = wx.TextCtrl(id=ID_ADDSLAVEDIALOGSLAVENODEID,
+              name='SlaveName', parent=self, pos=wx.Point(0, 0), 
+              size=wx.Size(0, 24), style=wx.ALIGN_RIGHT)
 
-        self.staticText3 = wx.StaticText(id=wxID_ADDSLAVEDIALOGSTATICTEXT3,
-              label='EDS File:', name='staticText3', parent=self.MainPanel,
-              pos=wx.Point(24, 136), size=wx.Size(155, 17), style=0)
+        self.staticText3 = wx.StaticText(id=ID_ADDSLAVEDIALOGSTATICTEXT3,
+              label='EDS File:', name='staticText3', parent=self,
+              pos=wx.Point(0, 0), size=wx.Size(0, 17), style=0)
 
-        self.EDSFile = wx.Choice(id=wxID_ADDSLAVEDIALOGEDSFILE,
-              name='EDSFile', parent=self.MainPanel, pos=wx.Point(24, 160),
-              size=wx.Size(145, 24), style=0)
+        self.EDSFile = wx.Choice(id=ID_ADDSLAVEDIALOGEDSFILE,
+              name='EDSFile', parent=self, pos=wx.Point(0, 0),
+              size=wx.Size(0, 24), style=0)
         
-        self.ImportEDS = wxButton(id=wxID_ADDSLAVEDIALOGIMPORTEDS, label='Import EDS',
-              name='ImportEDS', parent=self.MainPanel, pos=wx.Point(174, 160),
+        self.ImportEDS = wx.Button(id=ID_ADDSLAVEDIALOGIMPORTEDS, label='Import EDS',
+              name='ImportEDS', parent=self, pos=wx.Point(0, 0),
               size=wx.Size(100, 32), style=0)
         self.ImportEDS.Bind(wx.EVT_BUTTON, self.OnImportEDSButton,
-              id=wxID_ADDSLAVEDIALOGIMPORTEDS)
+              id=ID_ADDSLAVEDIALOGIMPORTEDS)
         
+        self.ButtonSizer = self.CreateButtonSizer(wx.OK|wx.CANCEL|wx.CENTRE)
+        self.Bind(wx.EVT_BUTTON, self.OnOK, id=self.ButtonSizer.GetAffirmativeButton().GetId())
+    
         self._init_sizers()
 
     def __init__(self, parent):
         self._init_ctrls(parent)
-        self.ButtonSizer = self.CreateButtonSizer(wxOK|wxCANCEL|wxCENTRE)
-        self.flexGridSizer1.Add(self.ButtonSizer, 1, wxALIGN_RIGHT)
         
         self.SlaveNodeID.SetValue("0x00")
-        
-        EVT_BUTTON(self, self.ButtonSizer.GetAffirmativeButton().GetId(), self.OnOK)
-    
+            
     def OnOK(self, event):
         error = []
         if self.SlaveName.GetValue() == "":
@@ -987,7 +1211,7 @@ class AddSlaveDialog(wx.Dialog):
                     text += " and %s"%item
                 else:
                     text += ", %s"%item 
-            message = wxMessageDialog(self, "Form isn't complete. %s must be filled!"%text, "Error", wxOK|wxICON_ERROR)
+            message = wx.MessageDialog(self, "Form isn't complete. %s must be filled!"%text, "Error", wx.OK|wx.ICON_ERROR)
             message.ShowModal()
             message.Destroy()
         else:
@@ -998,30 +1222,36 @@ class AddSlaveDialog(wx.Dialog):
                 else:
                     nodeid = int(nodeid)
             except:
-                message = wxMessageDialog(self, "Slave Node ID must be a value in decimal or hexadecimal!", "Error", wxOK|wxICON_ERROR)
+                message = wx.MessageDialog(self, "Slave Node ID must be a value in decimal or hexadecimal!", "Error", wx.OK|wx.ICON_ERROR)
                 message.ShowModal()
                 message.Destroy()
                 return
             if not 0 <= nodeid <= 127:
-                message = wxMessageDialog(self, "Slave Node ID must be between 0 and 127!", "Error", wxOK|wxICON_ERROR)
+                message = wx.MessageDialog(self, "Slave Node ID must be between 0 and 127!", "Error", wx.OK|wx.ICON_ERROR)
                 message.ShowModal()
                 message.Destroy()
             elif nodeid == 0 or nodeid in self.NodeList.SlaveNodes.keys():
-                message = wxMessageDialog(self, "A Node with this ID already exist in the network!", "Error", wxOK|wxICON_ERROR)
+                message = wx.MessageDialog(self, "A Node with this ID already exist in the network!", "Error", wx.OK|wx.ICON_ERROR)
                 message.ShowModal()
                 message.Destroy()
             else:
-                self.EndModal(wxID_OK)
+                self.EndModal(wx.ID_OK)
 
     def OnImportEDSButton(self, event):
-        dialog = wxFileDialog(self, "Choose an EDS file", os.getcwd(), "",  "EDS files (*.eds)|*.eds|All files|*.*", wxOPEN|wxCHANGE_DIR)
-        if dialog.ShowModal() == wxID_OK:
+        dialog = wx.FileDialog(self,
+                               "Choose an EDS file",
+                               os.getcwd(),
+                               "",
+                               "EDS files (*.eds)|*.eds|All files|*.*",
+                               wx.OPEN)
+        if dialog.ShowModal() == wx.ID_OK:
             filepath = dialog.GetPath()
             if os.path.isfile(filepath):
                 result = self.NodeList.ImportEDSFile(filepath)
                 if result:
-                    message = wxMessageDialog(self, result, "Error", wxOK|wxICON_ERROR)
-                    message.ShowModal()
+                    message = wx.MessageDialog(self, "%s\nWould you like to replace it ?"%result, "Question", wx.YES_NO|wx.ICON_QUESTION)
+                    if message.ShowModal() == wx.ID_YES:
+                        self.NodeList.ImportEDSFile(filepath, True)
                     message.Destroy()
         dialog.Destroy()
         self.RefreshEDSFile()
@@ -1032,7 +1262,7 @@ class AddSlaveDialog(wx.Dialog):
         self.EDSFile.Clear()
         for option in self.NodeList.EDSNodes.keys():
             self.EDSFile.Append(option)
-        if self.EDSFile.FindString(selection) != wxNOT_FOUND:
+        if self.EDSFile.FindString(selection) != wx.NOT_FOUND:
             self.EDSFile.SetStringSelection(selection)
     
     def SetNodeList(self, nodelist):
@@ -1049,3 +1279,315 @@ class AddSlaveDialog(wx.Dialog):
             values["slaveNodeID"] = int(nodeid)
         values["edsFile"] = self.EDSFile.GetStringSelection()
         return values
+
+#-------------------------------------------------------------------------------
+#                            Editing DCF Entry Dialog
+#-------------------------------------------------------------------------------
+
+class DCFEntryValuesTable(wx.grid.PyGridTableBase):
+    
+    """
+    A custom wxGrid Table using user supplied data
+    """
+    def __init__(self, parent, data, colnames):
+        # The base class must be initialized *first*
+        wx.grid.PyGridTableBase.__init__(self)
+        self.data = data
+        self.colnames = colnames
+        self.Parent = parent
+        # XXX
+        # we need to store the row length and collength to
+        # see if the table has changed size
+        self._rows = self.GetNumberRows()
+        self._cols = self.GetNumberCols()
+    
+    def GetNumberCols(self):
+        return len(self.colnames)
+        
+    def GetNumberRows(self):
+        return len(self.data)
+
+    def GetColLabelValue(self, col):
+        if col < len(self.colnames):
+            return self.colnames[col]
+
+    def GetRowLabelValues(self, row):
+        return row
+
+    def GetValue(self, row, col):
+        if row < self.GetNumberRows():
+            return str(self.data[row].get(self.GetColLabelValue(col), ""))
+            
+    def GetEditor(self, row, col):
+        if row < self.GetNumberRows():
+            return self.editors[row].get(self.GetColLabelValue(col), "")
+    
+    def GetValueByName(self, row, colname):
+        return self.data[row].get(colname)
+
+    def SetValue(self, row, col, value):
+        if col < len(self.colnames):
+            self.data[row][self.GetColLabelValue(col)] = value
+        
+    def ResetView(self, grid):
+        """
+        (wx.grid.Grid) -> Reset the grid view.   Call this to
+        update the grid if rows and columns have been added or deleted
+        """
+        grid.BeginBatch()
+        for current, new, delmsg, addmsg in [
+            (self._rows, self.GetNumberRows(), wx.grid.GRIDTABLE_NOTIFY_ROWS_DELETED, wx.grid.GRIDTABLE_NOTIFY_ROWS_APPENDED),
+            (self._cols, self.GetNumberCols(), wx.grid.GRIDTABLE_NOTIFY_COLS_DELETED, wx.grid.GRIDTABLE_NOTIFY_COLS_APPENDED),
+        ]:
+            if new < current:
+                msg = wx.grid.GridTableMessage(self,delmsg,new,current-new)
+                grid.ProcessTableMessage(msg)
+            elif new > current:
+                msg = wx.grid.GridTableMessage(self,addmsg,new-current)
+                grid.ProcessTableMessage(msg)
+                self.UpdateValues(grid)
+        grid.EndBatch()
+
+        self._rows = self.GetNumberRows()
+        self._cols = self.GetNumberCols()
+        # update the column rendering scheme
+        self._updateColAttrs(grid)
+
+        # update the scrollbars and the displayed part of the grid
+        grid.AdjustScrollbars()
+        grid.ForceRefresh()
+
+
+    def UpdateValues(self, grid):
+        """Update all displayed values"""
+        # This sends an event to the grid table to update all of the values
+        msg = wx.grid.GridTableMessage(self, wx.grid.GRIDTABLE_REQUEST_VIEW_GET_VALUES)
+        grid.ProcessTableMessage(msg)
+
+    def _updateColAttrs(self, grid):
+        """
+        wx.grid.Grid -> update the column attributes to add the
+        appropriate renderer given the column name.
+
+        Otherwise default to the default renderer.
+        """
+        
+        for row in range(self.GetNumberRows()):
+            for col in range(self.GetNumberCols()):
+                editor = wx.grid.GridCellTextEditor()
+                renderer = wx.grid.GridCellStringRenderer()
+                    
+                grid.SetCellEditor(row, col, editor)
+                grid.SetCellRenderer(row, col, renderer)
+                
+                grid.SetCellBackgroundColour(row, col, wx.WHITE)
+    
+    def SetData(self, data):
+        self.data = data
+    
+    def AppendRow(self, row_content):
+        self.data.append(row_content)
+
+    def Empty(self):
+        self.data = []
+        self.editors = []
+
+[ID_DCFENTRYVALUESDIALOG, ID_DCFENTRYVALUESDIALOGVALUESGRID, 
+ ID_DCFENTRYVALUESDIALOGADDBUTTON, ID_DCFENTRYVALUESDIALOGDELETEBUTTON, 
+ ID_DCFENTRYVALUESDIALOGUPBUTTON, ID_DCFENTRYVALUESDIALOGDOWNBUTTON, 
+ ID_VARIABLEEDITORPANELSTATICTEXT1, 
+] = [wx.NewId() for _init_ctrls in range(7)]
+
+class DCFEntryValuesDialog(wx.Dialog):
+    
+    if wx.VERSION < (2, 6, 0):
+        def Bind(self, event, function, id = None):
+            if id is not None:
+                event(self, id, function)
+            else:
+                event(self, function)
+    
+    def _init_coll_MainSizer_Items(self, parent):
+        parent.AddWindow(self.staticText1, 0, border=20, flag=wx.GROW|wx.TOP|wx.LEFT|wx.RIGHT)
+        parent.AddWindow(self.ValuesGrid, 0, border=20, flag=wx.GROW|wx.TOP|wx.LEFT|wx.RIGHT)
+        parent.AddSizer(self.ButtonPanelSizer, 0, border=20, flag=wx.ALIGN_RIGHT|wx.LEFT|wx.RIGHT)
+        parent.AddSizer(self.ButtonSizer, 0, border=20, flag=wx.ALIGN_RIGHT|wx.BOTTOM|wx.LEFT|wx.RIGHT)
+    
+    def _init_coll_MainSizer_Growables(self, parent):
+        parent.AddGrowableCol(0)
+        parent.AddGrowableRow(1)
+    
+    def _init_coll_ButtonPanelSizer_Items(self, parent):
+        parent.AddWindow(self.UpButton, 0, border=5, flag=wx.ALL)
+        parent.AddWindow(self.AddButton, 0, border=5, flag=wx.ALL)
+        parent.AddWindow(self.DownButton, 0, border=5, flag=wx.ALL)
+        parent.AddWindow(self.DeleteButton, 0, border=5, flag=wx.ALL)
+        
+    def _init_sizers(self):
+        self.MainSizer = wx.FlexGridSizer(cols=1, hgap=0, rows=3, vgap=0)
+        self.ButtonPanelSizer = wx.BoxSizer(wx.HORIZONTAL)
+        
+        self._init_coll_MainSizer_Items(self.MainSizer)
+        self._init_coll_MainSizer_Growables(self.MainSizer)
+        self._init_coll_ButtonPanelSizer_Items(self.ButtonPanelSizer)
+        
+        self.SetSizer(self.MainSizer)
+
+    def _init_ctrls(self, prnt):
+        wx.Dialog.__init__(self, id=ID_DCFENTRYVALUESDIALOG,
+              name='DCFEntryValuesDialog', parent=prnt, pos=wx.Point(376, 223),
+              size=wx.Size(400, 300), style=wx.DEFAULT_DIALOG_STYLE|wx.RESIZE_BORDER,
+              title='Edit DCF Entry Values')
+        self.SetClientSize(wx.Size(400, 300))
+
+        self.staticText1 = wx.StaticText(id=ID_VARIABLEEDITORPANELSTATICTEXT1,
+              label='Entry Values:', name='staticText1', parent=self,
+              pos=wx.Point(0, 0), size=wx.Size(95, 17), style=0)
+
+        self.ValuesGrid = wx.grid.Grid(id=ID_DCFENTRYVALUESDIALOGVALUESGRID,
+              name='ValuesGrid', parent=self, pos=wx.Point(0, 0), 
+              size=wx.Size(0, 150), style=wx.VSCROLL)
+        self.ValuesGrid.SetFont(wx.Font(12, 77, wx.NORMAL, wx.NORMAL, False,
+              'Sans'))
+        self.ValuesGrid.SetLabelFont(wx.Font(10, 77, wx.NORMAL, wx.NORMAL,
+              False, 'Sans'))
+        self.ValuesGrid.SetRowLabelSize(0)
+        self.ValuesGrid.SetSelectionBackground(wx.WHITE)
+        self.ValuesGrid.SetSelectionForeground(wx.BLACK)
+        if wx.VERSION >= (2, 6, 0):
+            self.ValuesGrid.Bind(wx.grid.EVT_GRID_CELL_CHANGE, self.OnValuesGridCellChange)
+            self.ValuesGrid.Bind(wx.grid.EVT_GRID_SELECT_CELL, self.OnValuesGridSelectCell)
+        else:
+            wx.grid.EVT_GRID_CELL_CHANGE(self.ValuesGrid, self.OnValuesGridCellChange)
+            wx.grid.EVT_GRID_SELECT_CELL(self.ValuesGrid, self.OnValuesGridSelectCell)
+        
+        self.AddButton = wx.Button(id=ID_DCFENTRYVALUESDIALOGADDBUTTON, label='Add',
+              name='AddButton', parent=self, pos=wx.Point(0, 0),
+              size=wx.Size(72, 32), style=0)
+        self.Bind(wx.EVT_BUTTON, self.OnAddButton, id=ID_DCFENTRYVALUESDIALOGADDBUTTON)
+
+        self.DeleteButton = wx.Button(id=ID_DCFENTRYVALUESDIALOGDELETEBUTTON, label='Delete',
+              name='DeleteButton', parent=self, pos=wx.Point(0, 0),
+              size=wx.Size(72, 32), style=0)
+        self.Bind(wx.EVT_BUTTON, self.OnDeleteButton, id=ID_DCFENTRYVALUESDIALOGDELETEBUTTON)
+
+        self.UpButton = wx.Button(id=ID_DCFENTRYVALUESDIALOGUPBUTTON, label='^',
+              name='UpButton', parent=self, pos=wx.Point(0, 0),
+              size=wx.Size(32, 32), style=0)
+        self.Bind(wx.EVT_BUTTON, self.OnUpButton, id=ID_DCFENTRYVALUESDIALOGUPBUTTON)
+
+        self.DownButton = wx.Button(id=ID_DCFENTRYVALUESDIALOGDOWNBUTTON, label='v',
+              name='DownButton', parent=self, pos=wx.Point(0, 0),
+              size=wx.Size(32, 32), style=0)
+        self.Bind(wx.EVT_BUTTON, self.OnDownButton, id=ID_DCFENTRYVALUESDIALOGDOWNBUTTON)
+
+        self.ButtonSizer = self.CreateButtonSizer(wx.OK|wx.CANCEL|wx.CENTRE)
+        
+        self._init_sizers()
+
+    def __init__(self, parent):
+        self._init_ctrls(parent)
+        
+        self.Values = []
+        self.DefaultValue = {"Index" : 0, "Subindex" : 0, "Size" : 1, "Value" : 0}
+        
+        self.Table = DCFEntryValuesTable(self, [], ["Index", "Subindex", "Size", "Value"])
+        self.ValuesGrid.SetTable(self.Table)
+        
+    def OnValuesGridCellChange(self, event):
+        row, col = event.GetRow(), event.GetCol()
+        colname = self.Table.GetColLabelValue(col)
+        value = self.Table.GetValue(row, col)
+        try:
+            self.Values[row][colname] = int(value, 16)
+        except:
+            message = wx.MessageDialog(self, "\"%s\" is not a valid value!"%value, "Error", wx.OK|wx.ICON_ERROR)
+            message.ShowModal()
+            message.Destroy()
+        wx.CallAfter(self.RefreshValues)
+        event.Skip()
+    
+    def OnValuesGridSelectCell(self, event):
+        wx.CallAfter(self.RefreshButtons)
+        event.Skip()
+    
+    def RefreshButtons(self):
+        row = self.ValuesGrid.GetGridCursorRow()
+        length = len(self.Table.data)
+        self.DeleteButton.Enable(length > 0)
+        self.UpButton.Enable(row > 0)
+        self.DownButton.Enable(row < length - 1)
+    
+    def OnAddButton(self, event):
+        new_row = self.DefaultValue.copy()
+        self.Values.append(new_row)
+        self.RefreshValues()
+        event.Skip()
+
+    def OnDeleteButton(self, event):
+        row = self.ValuesGrid.GetGridCursorRow()
+        self.Values.pop(row)
+        self.RefreshValues()
+        event.Skip()
+
+    def OnUpButton(self, event):
+        self.MoveValue(self.ValuesGrid.GetGridCursorRow(), -1)
+        event.Skip()
+
+    def OnDownButton(self, event):
+        self.MoveValue(self.ValuesGrid.GetGridCursorRow(), 1)
+        event.Skip()
+
+    def MoveValue(self, value_index, move):
+        new_index = max(0, min(value_index + move, len(self.Values) - 1))
+        if new_index != value_index:
+            self.Values.insert(new_index, self.Values.pop(value_index))
+            col = self.ValuesGrid.GetGridCursorCol()
+            self.RefreshValues()
+            self.ValuesGrid.SetGridCursor(new_index, col)
+            self.RefreshButtons()
+        else:
+            self.RefreshValues()
+
+    def SetValues(self, values):
+        self.Values = []
+        if values != "":
+            data = values[4:]
+            current = 0
+            for i in xrange(BE_to_LE(values[:4])):
+                value = {}
+                value["Index"] = BE_to_LE(data[current:current+2])
+                value["Subindex"] = BE_to_LE(data[current+2:current+3])
+                size = BE_to_LE(data[current+3:current+7])
+                value["Size"] = size
+                value["Value"] = BE_to_LE(data[current+7:current+7+size])
+                current += 7 + size
+                self.Values.append(value)
+        self.RefreshValues()
+    
+    def GetValues(self):
+        if len(self.Values) > 0:
+            value = LE_to_BE(len(self.Values), 4)
+            for row in self.Values:
+                value += LE_to_BE(row["Index"], 2)
+                value += LE_to_BE(row["Subindex"], 1)
+                value += LE_to_BE(row["Size"], 4)
+                value += LE_to_BE(row["Value"], row["Size"])
+            return value
+        return ""
+    
+    def RefreshValues(self):
+        if len(self.Table.data) > 0:
+            self.ValuesGrid.SetGridCursor(0, 0)
+        data = []
+        for value in self.Values:
+            row = {}
+            row["Index"] = "%04X"%value["Index"]
+            row["Subindex"] = "%02X"%value["Subindex"]
+            row["Size"] = "%08X"%value["Size"]
+            row["Value"] = ("%0"+"%d"%(value["Size"] * 2)+"X")%value["Value"]
+            data.append(row)
+        self.Table.SetData(data)
+        self.Table.ResetView(self.ValuesGrid)
+        self.RefreshButtons()
+        
\ No newline at end of file