# HG changeset patch # User 'Laurent Bessard ' # Date 1254500083 -7200 # Node ID e183bffc05f0606564adc94b4af8de44b928a2a1 # Parent eebcf66f2d5a48ade254ab4888eb6d0ee69d6d68# Parent c7e0254be378ed5c9ba44763c5b750a065374116 Changes from bct merged diff -r eebcf66f2d5a -r e183bffc05f0 DataTypeEditor.py --- a/DataTypeEditor.py Sat Sep 26 18:47:40 2009 +0200 +++ b/DataTypeEditor.py Fri Oct 02 18:14:43 2009 +0200 @@ -826,7 +826,6 @@ self.StructureElementsTable.SetValueByName(row, "Type", base_type) self.RefreshTypeInfos() self.StructureElementsTable.ResetView(self.StructureElementsGrid) - event.Skip() return ElementTypeFunction def RefreshDisplayedInfos(self): diff -r eebcf66f2d5a -r e183bffc05f0 PLCOpenEditor.py Binary file PLCOpenEditor.py has changed diff -r eebcf66f2d5a -r e183bffc05f0 VariablePanel.py --- a/VariablePanel.py Sat Sep 26 18:47:40 2009 +0200 +++ b/VariablePanel.py Fri Oct 02 18:14:43 2009 +0200 @@ -775,8 +775,7 @@ self.SaveValues(False) self.ParentWindow.RefreshEditor(variablepanel = False) self.Controler.BufferProject() - self.ParentWindow._Refresh(TITLE, EDITMENU, INSTANCESTREE, LIBRARYTREE) - event.Skip() + self.ParentWindow._Refresh(TITLE, EDITMENU, INSTANCESTREE, LIBRARYTREE) return VariableTypeFunction def OnVariablesGridCellLeftClick(self, event): diff -r eebcf66f2d5a -r e183bffc05f0 Viewer.py --- a/Viewer.py Sat Sep 26 18:47:40 2009 +0200 +++ b/Viewer.py Fri Oct 02 18:14:43 2009 +0200 @@ -1197,97 +1197,82 @@ self.SelectedElement.AlignElements(ALIGN_LEFT, None) self.RefreshBuffer() self.Refresh(False) - event.Skip() def OnAlignCenterMenu(self, event): if self.SelectedElement is not None and isinstance(self.SelectedElement, Graphic_Group): self.SelectedElement.AlignElements(ALIGN_CENTER, None) self.RefreshBuffer() self.Refresh(False) - event.Skip() def OnAlignRightMenu(self, event): if self.SelectedElement is not None and isinstance(self.SelectedElement, Graphic_Group): self.SelectedElement.AlignElements(ALIGN_RIGHT, None) self.RefreshBuffer() self.Refresh(False) - event.Skip() def OnAlignTopMenu(self, event): if self.SelectedElement is not None and isinstance(self.SelectedElement, Graphic_Group): self.SelectedElement.AlignElements(None, ALIGN_TOP) self.RefreshBuffer() self.Refresh(False) - event.Skip() def OnAlignMiddleMenu(self, event): if self.SelectedElement is not None and isinstance(self.SelectedElement, Graphic_Group): self.SelectedElement.AlignElements(None, ALIGN_MIDDLE) self.RefreshBuffer() self.Refresh(False) - event.Skip() def OnAlignBottomMenu(self, event): if self.SelectedElement is not None and isinstance(self.SelectedElement, Graphic_Group): self.SelectedElement.AlignElements(None, ALIGN_BOTTOM) self.RefreshBuffer() self.Refresh(False) - event.Skip() def OnNoModifierMenu(self, event): if self.SelectedElement is not None and self.IsBlock(self.SelectedElement): self.SelectedElement.SetConnectorNegated(False) self.SelectedElement.Refresh() self.RefreshBuffer() - event.Skip() def OnNegatedMenu(self, event): if self.SelectedElement is not None and self.IsBlock(self.SelectedElement): self.SelectedElement.SetConnectorNegated(True) self.SelectedElement.Refresh() self.RefreshBuffer() - event.Skip() def OnRisingEdgeMenu(self, event): if self.SelectedElement is not None and self.IsBlock(self.SelectedElement): self.SelectedElement.SetConnectorEdge("rising") self.SelectedElement.Refresh() self.RefreshBuffer() - event.Skip() def OnFallingEdgeMenu(self, event): if self.SelectedElement is not None and self.IsBlock(self.SelectedElement): self.SelectedElement.SetConnectorEdge("falling") self.SelectedElement.Refresh() self.RefreshBuffer() - event.Skip() def OnAddSegmentMenu(self, event): if self.SelectedElement is not None and self.IsWire(self.SelectedElement): self.SelectedElement.AddSegment() self.SelectedElement.Refresh() - event.Skip() def OnDeleteSegmentMenu(self, event): if self.SelectedElement is not None and self.IsWire(self.SelectedElement): self.SelectedElement.DeleteSegment() self.SelectedElement.Refresh() - event.Skip() def OnAddBranchMenu(self, event): if self.SelectedElement is not None and self.IsBlock(self.SelectedElement): self.AddDivergenceBranch(self.SelectedElement) - event.Skip() def OnDeleteBranchMenu(self, event): if self.SelectedElement is not None and self.IsBlock(self.SelectedElement): self.RemoveDivergenceBranch(self.SelectedElement) - event.Skip() def OnEditBlockMenu(self, event): if self.SelectedElement is not None: self.ParentWindow.EditProjectElement(ITEM_POU, "P::%s"%self.SelectedElement.GetType()) - event.Skip() def OnDeleteMenu(self, event): if self.SelectedElement is not None: @@ -1295,7 +1280,6 @@ self.SelectedElement = None self.RefreshBuffer() self.Refresh(False) - event.Skip() def OnClearExecutionOrderMenu(self, event): self.Controler.ClearEditedElementExecutionOrder(self.TagName)