plcopeneditor_history: comparison DataTypeEditor.py

equal deleted inserted replaced

-:020420ad8914
+:07447ee3538e
 #-------------------------------------------------------------------------------
 #                            Structure Elements Table
 #-------------------------------------------------------------------------------
+def GetElementsTableColnames():
+_ = lambda x : x
+return ["#", _("Name"), _("Type"), _("Initial Value")]
 class ElementsTable(wx.grid.PyGridTableBase):
 """
 A custom wx.grid.Grid Table using user supplied data
 """
 return len(self.colnames)
 def GetNumberRows(self):
 return len(self.data)
-def GetColLabelValue(self, col):
+def GetColLabelValue(self, col, translate=True):
 if col < len(self.colnames):
+if translate:
+return _(self.colnames[col])
 return self.colnames[col]
-def GetRowLabelValues(self, row):
+def GetRowLabelValues(self, row, translate=True):
 return row
 def GetValue(self, row, col):
 if row < self.GetNumberRows():
 if col == 0:
 return row + 1
-name = str(self.data[row].get(self.GetColLabelValue(col), ""))
+name = str(self.data[row].get(self.GetColLabelValue(col, False), ""))
 return name
 def SetValue(self, row, col, value):
 if col < len(self.colnames):
-colname = self.GetColLabelValue(col)
+colname = self.GetColLabelValue(col, False)
 if colname == "Name":
 self.old_value = self.data[row][colname]
 self.data[row][colname] = value
 def GetValueByName(self, row, colname):
 appropriate renderer given the column name.
 Otherwise default to the default renderer.
 """
-typelist = None
-accesslist = None
 for row in range(self.GetNumberRows()):
 for col in range(self.GetNumberCols()):
 editor = None
 renderer = None
-colname = self.GetColLabelValue(col)
+colname = self.GetColLabelValue(col, False)
 if col != 0:
 grid.SetReadOnly(row, col, False)
 if colname == "Name":
 editor = wx.grid.GridCellTextEditor()
 renderer = wx.grid.GridCellStringRenderer()
 ID_DATATYPEEDITORSTATICTEXT7, ID_DATATYPEEDITORSTATICTEXT8,
 ID_DATATYPEEDITORSTATICTEXT9, ID_DATATYPEEDITORSTATICTEXT10,
 ID_DATATYPEEDITORSTATICTEXT11,
 ] = [wx.NewId() for _init_ctrls in range(35)]
+def GetDatatypeTypes():
+_ = lambda x : x
+return [_("Directly"), _("Subrange"), _("Enumerated"), _("Array"), _("Structure")]
+DATATYPE_TYPES_DICT = dict([(_(datatype), datatype) for datatype in GetDatatypeTypes()])
 class DataTypeEditor(wx.Panel):
 def _init_coll_MainSizer_Items(self, parent):
 parent.AddSizer(self.TopSizer, 0, border=5, flag=wx.GROW|wx.TOP|wx.LEFT|wx.RIGHT)
 parent.AddSizer(self.TypeInfosSizer, 0, border=5, flag=wx.GROW|wx.BOTTOM|wx.LEFT|wx.RIGHT)
 def _init_coll_MainSizer_Growables(self, parent):
 parent.AddGrowableCol(0)
 parent.AddGrowableRow(1)
 def _init_coll_TopSizer_Items(self, parent):
-parent.AddWindow(self.staticText1, 0, border=5, flag=wx.GROW|wx.LEFT)
+parent.AddWindow(self.staticText1, 0, border=5, flag=wx.ALIGN_CENTER_VERTICAL|wx.LEFT|wx.RIGHT)
-parent.AddWindow(self.DerivationType, 0, border=0, flag=wx.GROW)
+parent.AddWindow(self.DerivationType, 0, border=5, flag=wx.GROW|wx.RIGHT)
 def _init_coll_TypeInfosSizer_Items(self, parent):
 parent.AddWindow(self.DirectlyPanel, 1, border=0, flag=wx.ALL)
 parent.AddWindow(self.SubrangePanel, 1, border=0, flag=wx.ALL)
 parent.AddWindow(self.EnumeratedPanel, 1, border=0, flag=wx.GROW|wx.ALL)
 parent.AddWindow(self.ArrayPanel, 1, border=0, flag=wx.ALL)
 parent.AddWindow(self.StructurePanel, 1, border=0, flag=wx.GROW|wx.ALL)
 def _init_coll_DirectlyPanelSizer_Items(self, parent):
-parent.AddWindow(self.staticText2, 1, border=5, flag=wx.GROW|wx.ALL)
+parent.AddWindow(self.staticText2, 1, border=5, flag=wx.ALIGN_CENTER_VERTICAL|wx.ALL)
 parent.AddWindow(self.DirectlyBaseType, 1, border=5, flag=wx.GROW|wx.ALL)
-parent.AddWindow(self.staticText3, 1, border=5, flag=wx.GROW|wx.ALL)
+parent.AddWindow(self.staticText3, 1, border=5, flag=wx.ALIGN_CENTER_VERTICAL|wx.ALL)
 parent.AddWindow(self.DirectlyInitialValue, 1, border=5, flag=wx.GROW|wx.ALL)
 def _init_coll_SubrangePanelSizer_Items(self, parent):
-parent.AddWindow(self.staticText4, 1, border=5, flag=wx.GROW|wx.ALL)
+parent.AddWindow(self.staticText4, 1, border=5, flag=wx.ALIGN_CENTER_VERTICAL|wx.ALL)
 parent.AddWindow(self.SubrangeBaseType, 1, border=5, flag=wx.GROW|wx.ALL)
-parent.AddWindow(self.staticText5, 1, border=5, flag=wx.GROW|wx.ALL)
+parent.AddWindow(self.staticText5, 1, border=5, flag=wx.ALIGN_CENTER_VERTICAL|wx.ALL)
 parent.AddWindow(self.SubrangeInitialValue, 1, border=5, flag=wx.GROW|wx.ALL)
-parent.AddWindow(self.staticText6, 1, border=5, flag=wx.GROW|wx.ALL)
+parent.AddWindow(self.staticText6, 1, border=5, flag=wx.ALIGN_CENTER_VERTICAL|wx.ALL)
 parent.AddWindow(self.SubrangeMinimum, 1, border=5, flag=wx.GROW|wx.ALL)
 parent.AddWindow(wx.Size(0, 0), 1, border=5, flag=wx.GROW|wx.ALL)
 parent.AddWindow(wx.Size(0, 0), 1, border=5, flag=wx.GROW|wx.ALL)
-parent.AddWindow(self.staticText7, 1, border=5, flag=wx.GROW|wx.ALL)
+parent.AddWindow(self.staticText7, 1, border=5, flag=wx.ALIGN_CENTER_VERTICAL|wx.ALL)
 parent.AddWindow(self.SubrangeMaximum, 1, border=5, flag=wx.GROW|wx.ALL)
 def _init_coll_EnumeratedPanelSizer_Items(self, parent):
-parent.AddWindow(self.EnumeratedValues, 2, border=5, flag=wx.GROW|wx.ALL)
+parent.AddWindow(self.EnumeratedValues, 1, border=5, flag=wx.GROW|wx.ALL)
-parent.AddWindow(self.staticText8, 1, border=5, flag=wx.GROW|wx.ALL)
+parent.AddSizer(self.EnumeratedPanelRightSizer, 1, border=0, flag=0)
+def _init_coll_EnumeratedPanelRightSizer_Items(self, parent):
+parent.AddWindow(self.staticText8, 1, border=5, flag=wx.ALIGN_CENTER_VERTICAL|wx.ALL)
 parent.AddWindow(self.EnumeratedInitialValue, 1, border=5, flag=wx.ALL)
 def _init_coll_ArrayPanelSizer_Items(self, parent):
 parent.AddSizer(self.ArrayPanelLeftSizer, 0, border=0, flag=wx.GROW)
-parent.AddSizer(self.ArrayPanelRightSizer, 0, border=0, flag=wx.GROW)
+parent.AddSizer(self.ArrayPanelRightSizer, 0, border=0, flag=0)
 parent.AddWindow(self.ArrayDimensions, 0, border=5, flag=wx.GROW|wx.ALL)
 def _init_coll_ArrayPanelSizer_Growables(self, parent):
 parent.AddGrowableCol(0)
 parent.AddGrowableCol(1)
 parent.AddGrowableRow(1)
 def _init_coll_ArrayPanelLeftSizer_Items(self, parent):
-parent.AddWindow(self.staticText9, 1, border=5, flag=wx.GROW|wx.ALL)
+parent.AddWindow(self.staticText9, 1, border=5, flag=wx.ALIGN_CENTER_VERTICAL|wx.ALL)
 parent.AddWindow(self.ArrayBaseType, 1, border=5, flag=wx.GROW|wx.ALL)
 def _init_coll_ArrayPanelRightSizer_Items(self, parent):
-parent.AddWindow(self.staticText10, 1, border=5, flag=wx.GROW|wx.ALL)
+parent.AddWindow(self.staticText10, 1, border=5, flag=wx.ALIGN_CENTER_VERTICAL|wx.ALL)
 parent.AddWindow(self.ArrayInitialValue, 1, border=5, flag=wx.GROW|wx.ALL)
 def _init_coll_StructurePanelSizer_Items(self, parent):
-parent.AddWindow(self.staticText11, 0, border=5, flag=wx.GROW|wx.ALL)
+parent.AddWindow(self.staticText11, 0, border=5, flag=wx.ALL)
 parent.AddWindow(self.StructureElementsGrid, 0, border=0, flag=wx.GROW)
 parent.AddSizer(self.StructurePanelButtonSizer, 0, border=0, flag=wx.ALIGN_RIGHT)
 def _init_coll_StructurePanelSizer_Growables(self, parent):
 parent.AddGrowableCol(0)
 parent.AddGrowableRow(1)
 def _init_coll_StructurePanelButtonSizer_Items(self, parent):
-parent.AddWindow(self.StructureAddButton, 1, border=5, flag=wx.GROW|wx.ALL)
+parent.AddWindow(self.StructureAddButton, 0, border=5, flag=wx.ALL)
-parent.AddWindow(self.StructureDeleteButton, 1, border=5, flag=wx.GROW|wx.ALL)
+parent.AddWindow(self.StructureDeleteButton, 0, border=5, flag=wx.ALL)
-parent.AddWindow(self.StructureUpButton, 1, border=5, flag=wx.GROW|wx.ALL)
+parent.AddWindow(self.StructureUpButton, 0, border=5, flag=wx.ALL)
-parent.AddWindow(self.StructureDownButton, 1, border=5, flag=wx.GROW|wx.ALL)
+parent.AddWindow(self.StructureDownButton, 0, border=5, flag=wx.ALL)
 def _init_sizers(self):
 self.MainSizer = wx.FlexGridSizer(cols=1, hgap=0, rows=2, vgap=10)
 self.TopSizer = wx.BoxSizer(wx.HORIZONTAL)
 self.TypeInfosSizer = wx.StaticBoxSizer(self.staticbox, wx.HORIZONTAL)
 self.DirectlyPanelSizer = wx.BoxSizer(wx.HORIZONTAL)
-self.SubrangePanelSizer = wx.GridSizer(cols=4, hgap=0, rows=3, vgap=0)
+self.SubrangePanelSizer = wx.GridSizer(cols=4, hgap=5, rows=3, vgap=0)
 self.EnumeratedPanelSizer = wx.BoxSizer(wx.HORIZONTAL)
-self.ArrayPanelSizer = wx.FlexGridSizer(cols=2, hgap=0, rows=2, vgap=0)
+self.EnumeratedPanelRightSizer = wx.BoxSizer(wx.HORIZONTAL)
+self.ArrayPanelSizer = wx.FlexGridSizer(cols=2, hgap=5, rows=2, vgap=0)
 self.ArrayPanelLeftSizer = wx.BoxSizer(wx.HORIZONTAL)
 self.ArrayPanelRightSizer = wx.BoxSizer(wx.HORIZONTAL)
-self.StructurePanelSizer = wx.FlexGridSizer(cols=1, hgap=0, rows=3, vgap=0)
+self.StructurePanelSizer = wx.FlexGridSizer(cols=1, hgap=5, rows=3, vgap=0)
 self.StructurePanelButtonSizer = wx.BoxSizer(wx.HORIZONTAL)
 self._init_coll_MainSizer_Items(self.MainSizer)
 self._init_coll_MainSizer_Growables(self.MainSizer)
 self._init_coll_TopSizer_Items(self.TopSizer)
 self._init_coll_TypeInfosSizer_Items(self.TypeInfosSizer)
 self._init_coll_DirectlyPanelSizer_Items(self.DirectlyPanelSizer)
 self._init_coll_SubrangePanelSizer_Items(self.SubrangePanelSizer)
 self._init_coll_EnumeratedPanelSizer_Items(self.EnumeratedPanelSizer)
+self._init_coll_EnumeratedPanelRightSizer_Items(self.EnumeratedPanelRightSizer)
 self._init_coll_ArrayPanelSizer_Items(self.ArrayPanelSizer)
 self._init_coll_ArrayPanelSizer_Growables(self.ArrayPanelSizer)
 self._init_coll_ArrayPanelLeftSizer_Items(self.ArrayPanelLeftSizer)
 self._init_coll_ArrayPanelRightSizer_Items(self.ArrayPanelRightSizer)
 self._init_coll_StructurePanelSizer_Items(self.StructurePanelSizer)
 def _init_ctrls(self, prnt):
 wx.Panel.__init__(self, id=ID_DATATYPEEDITOR, name='', parent=prnt,
 size=wx.Size(0, 0), style=wx.SUNKEN_BORDER)
 self.staticbox = wx.StaticBox(id=ID_DATATYPEEDITORSTATICBOX,
-label='Type infos:', name='staticBox1', parent=self,
+label=_('Type infos:'), name='staticBox1', parent=self,
-pos=wx.Point(0, 0), size=wx.Size(10, 0), style=0)
+pos=wx.Point(0, 0), size=wx.DefaultSize, style=0)
 self.staticText1 = wx.StaticText(id=ID_DATATYPEEDITORSTATICTEXT1,
-label='Derivation Type:', name='staticText1', parent=self,
+label=_('Derivation Type:'), name='staticText1', parent=self,
-pos=wx.Point(0, 0), size=wx.Size(150, 17), style=0)
+pos=wx.Point(0, 0), size=wx.DefaultSize, style=0)
 self.DerivationType = wx.ComboBox(id=ID_DATATYPEEDITORDERIVATIONTYPE,
 name='DerivationType', parent=self, pos=wx.Point(0, 0),
 size=wx.Size(200, 28), style=wx.CB_READONLY)
 self.Bind(wx.EVT_COMBOBOX, self.OnDerivationTypeChanged, id=ID_DATATYPEEDITORDERIVATIONTYPE)
 self.DirectlyPanel = wx.Panel(id=ID_DATATYPEEDITORDIRECTLYPANEL,
 name='DirectlyPanel', parent=self, pos=wx.Point(0, 0),
 size=wx.Size(0, 0), style=wx.TAB_TRAVERSAL)
 self.staticText2 = wx.StaticText(id=ID_DATATYPEEDITORSTATICTEXT2,
-label='Base Type:', name='staticText2', parent=self.DirectlyPanel,
+label=_('Base Type:'), name='staticText2', parent=self.DirectlyPanel,
-pos=wx.Point(0, 0), size=wx.Size(150, 17), style=0)
+pos=wx.Point(0, 0), size=wx.DefaultSize, style=0)
 self.DirectlyBaseType = wx.ComboBox(id=ID_DATATYPEEDITORDIRECTLYBASETYPE,
 name='DirectlyBaseType', parent=self.DirectlyPanel, pos=wx.Point(0, 0),
 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,
-label='Initial Value:', name='staticText3', parent=self.DirectlyPanel,
+label=_('Initial Value:'), name='staticText3', parent=self.DirectlyPanel,
-pos=wx.Point(0, 0), size=wx.Size(150, 17), style=0)
+pos=wx.Point(0, 0), size=wx.DefaultSize, style=0)
 self.DirectlyInitialValue = wx.TextCtrl(id=ID_DATATYPEEDITORDIRECTLYINITIALVALUE,
 name='DirectlyInitialValue', parent=self.DirectlyPanel, pos=wx.Point(0, 0),
 size=wx.Size(0, 24), style=wx.TAB_TRAVERSAL|wx.TE_PROCESS_ENTER|wx.TE_MULTILINE|wx.TE_RICH)
 self.Bind(wx.EVT_TEXT_ENTER, self.OnReturnKeyPressed, id=ID_DATATYPEEDITORDIRECTLYINITIALVALUE)
 self.SubrangePanel = wx.Panel(id=ID_DATATYPEEDITORSUBRANGEPANEL,
 name='SubrangePanel', parent=self, pos=wx.Point(0, 0),
 size=wx.Size(0, 0), style=wx.TAB_TRAVERSAL)
 self.staticText4 = wx.StaticText(id=ID_DATATYPEEDITORSTATICTEXT4,
-label='Base Type:', name='staticText4', parent=self.SubrangePanel,
+label=_('Base Type:'), name='staticText4', parent=self.SubrangePanel,
-pos=wx.Point(0, 0), size=wx.Size(150, 17), style=0)
+pos=wx.Point(0, 0), size=wx.DefaultSize, style=0)
 self.SubrangeBaseType = wx.ComboBox(id=ID_DATATYPEEDITORSUBRANGEBASETYPE,
 name='SubrangeBaseType', parent=self.SubrangePanel, pos=wx.Point(0, 0),
 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,
-label='Initial Value:', name='staticText5', parent=self.SubrangePanel,
+label=_('Initial Value:'), name='staticText5', parent=self.SubrangePanel,
-pos=wx.Point(0, 0), size=wx.Size(150, 17), style=0)
+pos=wx.Point(0, 0), size=wx.DefaultSize, style=0)
 self.SubrangeInitialValue = wx.SpinCtrl(id=ID_DATATYPEEDITORSUBRANGEINITIALVALUE,
 name='SubrangeInitialValue', parent=self.SubrangePanel, pos=wx.Point(0, 0),
 size=wx.Size(0, 24), style=wx.TAB_TRAVERSAL)
 self.Bind(wx.EVT_SPINCTRL, self.OnInfosChanged, id=ID_DATATYPEEDITORSUBRANGEINITIALVALUE)
 self.staticText6 = wx.StaticText(id=ID_DATATYPEEDITORSTATICTEXT6,
-label='Minimum:', name='staticText6', parent=self.SubrangePanel,
+label=_('Minimum:'), name='staticText6', parent=self.SubrangePanel,
-pos=wx.Point(0, 0), size=wx.Size(150, 17), style=0)
+pos=wx.Point(0, 0), size=wx.DefaultSize, style=0)
 self.SubrangeMinimum = wx.SpinCtrl(id=ID_DATATYPEEDITORSUBRANGEMINIMUM,
 name='SubrangeMinimum', parent=self.SubrangePanel, pos=wx.Point(0, 0),
 size=wx.Size(0, 24), style=wx.TAB_TRAVERSAL)
 self.Bind(wx.EVT_SPINCTRL, self.OnSubrangeMinimumChanged, id=ID_DATATYPEEDITORSUBRANGEMINIMUM)
 self.staticText7 = wx.StaticText(id=ID_DATATYPEEDITORSTATICTEXT7,
-label='Maximum:', name='staticText7', parent=self.SubrangePanel,
+label=_('Maximum:'), name='staticText7', parent=self.SubrangePanel,
-pos=wx.Point(0, 0), size=wx.Size(150, 17), style=0)
+pos=wx.Point(0, 0), size=wx.DefaultSize, style=0)
 self.SubrangeMaximum = wx.SpinCtrl(id=ID_DATATYPEEDITORSUBRANGEMAXIMUM,
 name='SubrangeMaximum', parent=self.SubrangePanel, pos=wx.Point(0, 0),
 size=wx.Size(0, 24), style=wx.TAB_TRAVERSAL)
 self.Bind(wx.EVT_SPINCTRL, self.OnSubrangeMaximumChanged, id=ID_DATATYPEEDITORSUBRANGEMAXIMUM)
 self.EnumeratedPanel = wx.Panel(id=ID_DATATYPEEDITORENUMERATEDPANEL,
 name='EnumeratedPanel', parent=self, pos=wx.Point(0, 0),
 size=wx.Size(0, 0), style=wx.TAB_TRAVERSAL)
 self.EnumeratedValues = wx.gizmos.EditableListBox(id=ID_DATATYPEEDITORENUMERATEDVALUES,
-name='EnumeratedValues', parent=self.EnumeratedPanel, label="Values:", pos=wx.Point(0, 0),
+name='EnumeratedValues', parent=self.EnumeratedPanel, label=_("Values:"), pos=wx.Point(0, 0),
 size=wx.Size(0, 0), style=wx.gizmos.EL_ALLOW_NEW | wx.gizmos.EL_ALLOW_EDIT | wx.gizmos.EL_ALLOW_DELETE)
 self.EnumeratedValues.GetListCtrl().Bind(wx.EVT_LIST_END_LABEL_EDIT, self.OnEnumeratedValueEndEdit)
-self.EnumeratedValues.GetNewButton().Bind(wx.EVT_BUTTON, self.OnEnumeratedValuesChanged)
+self.EnumeratedValues.GetEditButton().SetToolTipString(_("Edit item"))
-self.EnumeratedValues.GetDelButton().Bind(wx.EVT_BUTTON, self.OnEnumeratedValuesChanged)
+new_button = self.EnumeratedValues.GetNewButton()
-self.EnumeratedValues.GetUpButton().Bind(wx.EVT_BUTTON, self.OnEnumeratedValuesChanged)
+new_button.SetToolTipString(_("New item"))
-self.EnumeratedValues.GetDownButton().Bind(wx.EVT_BUTTON, self.OnEnumeratedValuesChanged)
+new_button.Bind(wx.EVT_BUTTON, self.OnEnumeratedValuesChanged)
+del_button = self.EnumeratedValues.GetDelButton()
+del_button.SetToolTipString(_("Delete item"))
+del_button.Bind(wx.EVT_BUTTON, self.OnEnumeratedValuesChanged)
+up_button = self.EnumeratedValues.GetUpButton()
+up_button.SetToolTipString(_("Move up"))
+up_button.Bind(wx.EVT_BUTTON, self.OnEnumeratedValuesChanged)
+down_button = self.EnumeratedValues.GetDownButton()
+down_button.SetToolTipString(_("Move down"))
+down_button.Bind(wx.EVT_BUTTON, self.OnEnumeratedValuesChanged)
 self.staticText8 = wx.StaticText(id=ID_DATATYPEEDITORSTATICTEXT8,
-label='Initial Value:', name='staticText8', parent=self.EnumeratedPanel,
+label=_('Initial Value:'), name='staticText8', parent=self.EnumeratedPanel,
-pos=wx.Point(0, 0), size=wx.Size(150, 17), style=0)
+pos=wx.Point(0, 0), size=wx.DefaultSize, style=0)
 self.EnumeratedInitialValue = wx.ComboBox(id=ID_DATATYPEEDITORENUMERATEDINITIALVALUE,
 name='EnumeratedInitialValue', parent=self.EnumeratedPanel, pos=wx.Point(0, 0),
 size=wx.Size(0, 28), style=wx.CB_READONLY)
 self.Bind(wx.EVT_COMBOBOX, self.OnInfosChanged, id=ID_DATATYPEEDITORENUMERATEDINITIALVALUE)
 self.ArrayPanel = wx.Panel(id=ID_DATATYPEEDITORARRAYPANEL,
 name='ArrayPanel', parent=self, pos=wx.Point(0, 0),
 size=wx.Size(0, 0), style=wx.TAB_TRAVERSAL)
 self.staticText9 = wx.StaticText(id=ID_DATATYPEEDITORSTATICTEXT9,
-label='Base Type:', name='staticText9', parent=self.ArrayPanel,
+label=_('Base Type:'), name='staticText9', parent=self.ArrayPanel,
-pos=wx.Point(0, 0), size=wx.Size(150, 17), style=0)
+pos=wx.Point(0, 0), size=wx.DefaultSize, style=0)
 self.ArrayBaseType = wx.ComboBox(id=ID_DATATYPEEDITORARRAYBASETYPE,
 name='SubrangeBaseType', parent=self.ArrayPanel, pos=wx.Point(0, 0),
 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,
-name='ArrayDimensions', parent=self.ArrayPanel, label="Dimensions:", pos=wx.Point(0, 0),
+name='ArrayDimensions', parent=self.ArrayPanel, label=_("Dimensions:"), pos=wx.Point(0, 0),
 size=wx.Size(0, 24), style=wx.gizmos.EL_ALLOW_NEW | wx.gizmos.EL_ALLOW_EDIT | wx.gizmos.EL_ALLOW_DELETE)
 self.ArrayDimensions.GetListCtrl().Bind(wx.EVT_LIST_END_LABEL_EDIT, self.OnDimensionsChanged)
-self.ArrayDimensions.GetNewButton().Bind(wx.EVT_BUTTON, self.OnDimensionsChanged)
+self.ArrayDimensions.GetEditButton().SetToolTipString(_("Edit item"))
-self.ArrayDimensions.GetDelButton().Bind(wx.EVT_BUTTON, self.OnDimensionsChanged)
+new_button = self.ArrayDimensions.GetNewButton()
-self.ArrayDimensions.GetUpButton().Bind(wx.EVT_BUTTON, self.OnDimensionsChanged)
+new_button.SetToolTipString(_("New item"))
-self.ArrayDimensions.GetDownButton().Bind(wx.EVT_BUTTON, self.OnDimensionsChanged)
+new_button.Bind(wx.EVT_BUTTON, self.OnDimensionsChanged)
+del_button = self.ArrayDimensions.GetDelButton()
+del_button.SetToolTipString(_("Delete item"))
+del_button.Bind(wx.EVT_BUTTON, self.OnDimensionsChanged)
+up_button = self.ArrayDimensions.GetUpButton()
+up_button.SetToolTipString(_("Move up"))
+up_button.Bind(wx.EVT_BUTTON, self.OnDimensionsChanged)
+down_button = self.ArrayDimensions.GetDownButton()
+down_button.SetToolTipString(_("Move down"))
+down_button.Bind(wx.EVT_BUTTON, self.OnDimensionsChanged)
 self.staticText10 = wx.StaticText(id=ID_DATATYPEEDITORSTATICTEXT10,
-label='Initial Value:', name='staticText10', parent=self.ArrayPanel,
+label=_('Initial Value:'), name='staticText10', parent=self.ArrayPanel,
-pos=wx.Point(0, 0), size=wx.Size(150, 17), style=0)
+pos=wx.Point(0, 0), size=wx.DefaultSize, style=0)
 self.ArrayInitialValue = wx.TextCtrl(id=ID_DATATYPEEDITORARRAYINITIALVALUE,
 name='ArrayInitialValue', parent=self.ArrayPanel, pos=wx.Point(0, 0),
 size=wx.Size(0, 24), style=wx.TAB_TRAVERSAL|wx.TE_PROCESS_ENTER|wx.TE_MULTILINE|wx.TE_RICH)
 self.Bind(wx.EVT_TEXT_ENTER, self.OnReturnKeyPressed, id=ID_DATATYPEEDITORARRAYINITIALVALUE)
 self.StructurePanel = wx.Panel(id=ID_DATATYPEEDITORSTRUCTUREPANEL,
 name='StructurePanel', parent=self, pos=wx.Point(0, 0),
 size=wx.Size(0, 0), style=wx.TAB_TRAVERSAL)
 self.staticText11 = wx.StaticText(id=ID_DATATYPEEDITORSTATICTEXT11,
-label='Elements :', name='staticText11', parent=self.StructurePanel,
+label=_('Elements :'), name='staticText11', parent=self.StructurePanel,
-pos=wx.Point(0, 0), size=wx.Size(150, 17), style=0)
+pos=wx.Point(0, 0), size=wx.DefaultSize, style=0)
 self.StructureElementsGrid = wx.grid.Grid(id=ID_DATATYPEEDITORSTRUCTUREELEMENTSGRID,
 name='StructureElementsGrid', parent=self.StructurePanel, pos=wx.Point(0, 0),
 size=wx.Size(0, 150), style=wx.VSCROLL)
 self.StructureElementsGrid.SetFont(wx.Font(12, 77, wx.NORMAL, wx.NORMAL, False,
 self.StructureElementsGrid.Bind(wx.grid.EVT_GRID_EDITOR_SHOWN, self.OnStructureElementsGridEditorShown)
 else:
 wx.grid.EVT_GRID_CELL_CHANGE(self.StructureElementsGrid, self.OnStructureElementsGridCellChange)
 wx.grid.EVT_GRID_EDITOR_SHOWN(self.StructureElementsGrid, self.OnStructureElementsGridEditorShown)
-self.StructureAddButton = wx.Button(id=ID_DATATYPEEDITORSTRUCTUREADDBUTTON, label='Add',
+self.StructureAddButton = wx.Button(id=ID_DATATYPEEDITORSTRUCTUREADDBUTTON, label=_('Add'),
 name='StructureAddButton', parent=self.StructurePanel, pos=wx.Point(0, 0),
-size=wx.Size(72, 32), style=0)
+size=wx.DefaultSize, style=0)
 self.Bind(wx.EVT_BUTTON, self.OnStructureAddButton, id=ID_DATATYPEEDITORSTRUCTUREADDBUTTON)
-self.StructureDeleteButton = wx.Button(id=ID_DATATYPEEDITORSTRUCTUREDELETEBUTTON, label='Delete',
+self.StructureDeleteButton = wx.Button(id=ID_DATATYPEEDITORSTRUCTUREDELETEBUTTON, label=_('Delete'),
 name='StructureDeleteButton', parent=self.StructurePanel, pos=wx.Point(0, 0),
-size=wx.Size(72, 32), style=0)
+size=wx.DefaultSize, style=0)
 self.Bind(wx.EVT_BUTTON, self.OnStructureDeleteButton, id=ID_DATATYPEEDITORSTRUCTUREDELETEBUTTON)
 self.StructureUpButton = wx.Button(id=ID_DATATYPEEDITORSTRUCTUREUPBUTTON, label='^',
 name='StructureUpButton', parent=self.StructurePanel, pos=wx.Point(0, 0),
 size=wx.Size(32, 32), style=0)
 def __init__(self, parent, tagname, window, controler):
 self._init_ctrls(parent)
 self.StructureElementDefaultValue = {"Name" : "", "Type" : "INT", "Initial Value" : ""}
-self.StructureElementsTable = ElementsTable(self, [], ["#", "Name", "Type", "Initial Value"])
+self.StructureElementsTable = ElementsTable(self, [], GetElementsTableColnames())
 self.StructureColSizes = [40, 150, 100, 250]
 self.StructureColAlignements = [wx.ALIGN_CENTER, wx.ALIGN_LEFT, wx.ALIGN_LEFT, wx.ALIGN_LEFT]
 self.StructureElementsGrid.SetTable(self.StructureElementsTable)
 self.StructureElementsGrid.SetRowLabelSize(0)
 for col in range(self.StructureElementsTable.GetNumberCols()):
 attr = wx.grid.GridCellAttr()
 attr.SetAlignment(self.StructureColAlignements[col], wx.ALIGN_CENTRE)
 self.StructureElementsGrid.SetColAttr(col, attr)
-self.StructureElementsGrid.SetColSize(col, self.StructureColSizes[col])
+self.StructureElementsGrid.SetColMinimalWidth(col, self.StructureColSizes[col])
+self.StructureElementsGrid.AutoSizeColumn(col, False)
-self.DerivationType.Append("Directly")
-self.DerivationType.Append("Subrange")
+for datatype in GetDatatypeTypes():
-self.DerivationType.Append("Enumerated")
+self.DerivationType.Append(_(datatype))
-self.DerivationType.Append("Array")
-self.DerivationType.Append("Structure")
 self.SubrangePanel.Hide()
 self.EnumeratedPanel.Hide()
 self.ArrayPanel.Hide()
 self.StructurePanel.Hide()
 self.CurrentPanel = "Directly"
 self.SubrangeBaseType.Append(base_type)
 self.SubrangeBaseType.SetSelection(0)
 self.RefreshBoundsRange()
 type_infos = self.Controler.GetDataTypeInfos(self.TagName)
 if type_infos is not None:
-self.DerivationType.SetStringSelection(type_infos["type"])
+datatype = type_infos["type"]
+self.DerivationType.SetStringSelection(_(datatype))
 if type_infos["type"] == "Directly":
 self.DirectlyBaseType.SetStringSelection(type_infos["base_type"])
 self.DirectlyInitialValue.SetValue(type_infos["initial"])
 elif type_infos["type"] == "Subrange":
 self.SubrangeBaseType.SetStringSelection(type_infos["base_type"])
 text = event.GetText()
 values = self.EnumeratedValues.GetStrings()
 index = event.GetIndex()
 if index >= len(values) or values[index].upper() != text.upper():
 if text.upper() in [value.upper() for value in values]:
-message = wx.MessageDialog(self, "\"%s\" value already defined!"%text, "Error", wx.OK|wx.ICON_ERROR)
+message = wx.MessageDialog(self, _("\"%s\" value already defined!")%text, _("Error"), wx.OK|wx.ICON_ERROR)
 message.ShowModal()
 message.Destroy()
 event.Veto()
 elif text.upper() in IEC_KEYWORDS:
-message = wx.MessageDialog(self, "\"%s\" is a keyword. It can't be used!"%text, "Error", wx.OK|wx.ICON_ERROR)
+message = wx.MessageDialog(self, _("\"%s\" is a keyword. It can't be used!")%text, _("Error"), wx.OK|wx.ICON_ERROR)
 message.ShowModal()
 message.Destroy()
 else:
 wx.CallAfter(self.RefreshEnumeratedValues)
 wx.CallAfter(self.RefreshTypeInfos)
 row, col = event.GetRow(), event.GetCol()
 colname = self.StructureElementsTable.GetColLabelValue(col)
 value = self.StructureElementsTable.GetValue(row, col)
 if colname == "Name":
 if not TestIdentifier(value):
-message = wx.MessageDialog(self, "\"%s\" is not a valid identifier!"%value, "Error", wx.OK|wx.ICON_ERROR)
+message = wx.MessageDialog(self, _("\"%s\" is not a valid identifier!")%value, _("Error"), wx.OK|wx.ICON_ERROR)
 message.ShowModal()
 message.Destroy()
 event.Veto()
 elif value.upper() in IEC_KEYWORDS:
-message = wx.MessageDialog(self, "\"%s\" is a keyword. It can't be used!"%value, "Error", wx.OK|wx.ICON_ERROR)
+message = wx.MessageDialog(self, _("\"%s\" is a keyword. It can't be used!")%value, _("Error"), wx.OK|wx.ICON_ERROR)
 message.ShowModal()
 message.Destroy()
 event.Veto()
 ##            elif value.upper() in self.PouNames:
 ##                message = wx.MessageDialog(self, "A pou with \"%s\" as name exists!"%value, "Error", wx.OK|wx.ICON_ERROR)
 ##                message.ShowModal()
 ##                message.Destroy()
 ##                event.Veto()
 elif value.upper() in [var["Name"].upper() for idx, var in enumerate(self.StructureElementsTable.GetData()) if idx != row]:
-message = wx.MessageDialog(self, "A element with \"%s\" as name exists in this structure!"%value, "Error", wx.OK|wx.ICON_ERROR)
+message = wx.MessageDialog(self, _("A element with \"%s\" as name exists in this structure!")%value, _("Error"), wx.OK|wx.ICON_ERROR)
 message.ShowModal()
 message.Destroy()
 event.Veto()
 else:
 self.RefreshTypeInfos()
 base_menu = wx.Menu(title='')
 for base_type in self.Controler.GetBaseTypes():
 new_id = wx.NewId()
 AppendMenu(base_menu, help='', id=new_id, kind=wx.ITEM_NORMAL, text=base_type)
 self.Bind(wx.EVT_MENU, self.GetElementTypeFunction(base_type), id=new_id)
-type_menu.AppendMenu(wx.NewId(), "Base Types", base_menu)
+type_menu.AppendMenu(wx.NewId(), _("Base Types"), base_menu)
 datatype_menu = wx.Menu(title='')
 for datatype in self.Controler.GetDataTypes(self.TagName, False, self.ParentWindow.Debug):
 new_id = wx.NewId()
 AppendMenu(datatype_menu, help='', id=new_id, kind=wx.ITEM_NORMAL, text=datatype)
 self.Bind(wx.EVT_MENU, self.GetElementTypeFunction(datatype), id=new_id)
-type_menu.AppendMenu(wx.NewId(), "User Data Types", datatype_menu)
+type_menu.AppendMenu(wx.NewId(), _("User Data Types"), datatype_menu)
 ##            functionblock_menu = wx.Menu(title='')
 ##            bodytype = self.Controler.GetEditedElementBodyType(self.TagName, self.ParentWindow.Debug)
 ##            pouname, poutype = self.Controler.GetEditedElementType(self.TagName, self.ParentWindow.Debug)
 ##            if classtype in ["Input","Output","InOut","External","Global"] or poutype != "function" and bodytype in ["ST", "IL"]:
 ##                for functionblock_type in self.Controler.GetFunctionBlockTypes(self.TagName, self.ParentWindow.Debug):
 ##                    new_id = wx.NewId()
 ##                    AppendMenu(functionblock_menu, help='', id=new_id, kind=wx.ITEM_NORMAL, text=functionblock_type)
 ##                    self.Bind(wx.EVT_MENU, self.GetVariableTypeFunction(functionblock_type), id=new_id)
-##                type_menu.AppendMenu(wx.NewId(), "Function Block Types", functionblock_menu)
+##                type_menu.AppendMenu(wx.NewId(), _("Function Block Types"), functionblock_menu)
 rect = self.StructureElementsGrid.BlockToDeviceRect((row, col), (row, col))
 self.StructureElementsGrid.PopupMenuXY(type_menu, rect.x + rect.width, rect.y + self.StructureElementsGrid.GetColLabelSize())
 event.Veto()
 else:
 event.Skip()
 self.StructureElementsTable.ResetView(self.StructureElementsGrid)
 event.Skip()
 return ElementTypeFunction
 def RefreshDisplayedInfos(self):
-selected = self.DerivationType.GetStringSelection()
+selected = DATATYPE_TYPES_DICT[self.DerivationType.GetStringSelection()]
 if selected != self.CurrentPanel:
 if self.CurrentPanel == "Directly":
 self.DirectlyPanel.Hide()
 elif self.CurrentPanel == "Subrange":
 self.SubrangePanel.Hide()
 def RefreshSubrangeInitialValueRange(self):
 self.SubrangeInitialValue.SetRange(self.SubrangeMinimum.GetValue(), self.SubrangeMaximum.GetValue())
 def RefreshTypeInfos(self):
-selected = self.DerivationType.GetStringSelection()
+selected = DATATYPE_TYPES_DICT[self.DerivationType.GetStringSelection()]
 infos = {"type" : selected}
 if selected == "Directly":
 infos["base_type"] = self.DirectlyBaseType.GetStringSelection()
 infos["initial"] = self.DirectlyInitialValue.GetValue()
 elif selected == "Subrange":
 infos["base_type"] = self.ArrayBaseType.GetStringSelection()
 infos["dimensions"] = []
 for dimensions in self.ArrayDimensions.GetStrings():
 result = DIMENSION_MODEL.match(dimensions)
 if result is None:
-message = wx.MessageDialog(self, "\"%s\" value isn't a valid array dimension!"%dimensions, "Error", wx.OK|wx.ICON_ERROR)
+message = wx.MessageDialog(self, _("\"%s\" value isn't a valid array dimension!")%dimensions, _("Error"), wx.OK|wx.ICON_ERROR)
 message.ShowModal()
 message.Destroy()
 self.RefreshView()
 return
 bounds = result.groups()
 if bounds[0] >= bounds[1]:
-message = wx.MessageDialog(self, "\"%s\" value isn't a valid array dimension!\nRight value must be greater than left value."%dimensions, "Error", wx.OK|wx.ICON_ERROR)
+message = wx.MessageDialog(self, _("\"%s\" value isn't a valid array dimension!\nRight value must be greater than left value.")%dimensions, _("Error"), wx.OK|wx.ICON_ERROR)
 message.ShowModal()
 message.Destroy()
 self.RefreshView()
 return
 infos["dimensions"].append(bounds)

changeset 391	07447ee3538e
parent 389	6a72016d721a
child 407	0a324a874981
child 427	22d16c457d87