plcopeneditor_history: comparison PLCOpenEditor.py

equal deleted inserted replaced

-:d803ba077da0
+:9106d66bd204
 kind=wx.ITEM_NORMAL, text=u'Function Block')
 AppendMenu(addmenu, help='', id=ID_PLCOPENEDITOREDITMENUADDPROGRAM,
 kind=wx.ITEM_NORMAL, text=u'Program')
 AppendMenu(addmenu, help='', id=ID_PLCOPENEDITOREDITMENUADDCONFIGURATION,
 kind=wx.ITEM_NORMAL, text=u'Configuration')
+AppendMenu(parent, help='', id=wx.ID_SELECTALL,
+kind=wx.ITEM_NORMAL, text=u'Select All\tCTRL+A')
 AppendMenu(parent, help='', id=wx.ID_DELETE,
 kind=wx.ITEM_NORMAL, text=u'Delete')
 self.Bind(wx.EVT_MENU, self.OnRefreshMenu, id=wx.ID_REFRESH)
 if not self.Debug:
 if not self.ModeSolo:
 id=ID_PLCOPENEDITOREDITMENUADDFUNCTIONBLOCK)
 self.Bind(wx.EVT_MENU, self.GenerateAddPouFunction("program"),
 id=ID_PLCOPENEDITOREDITMENUADDPROGRAM)
 self.Bind(wx.EVT_MENU, self.OnAddConfigurationMenu,
 id=ID_PLCOPENEDITOREDITMENUADDCONFIGURATION)
+self.Bind(wx.EVT_MENU, self.OnSelectAllMenu, id=wx.ID_SELECTALL)
 self.Bind(wx.EVT_MENU, self.OnDeleteMenu, id=wx.ID_DELETE)
 def _init_coll_HelpMenu_Items(self, parent):
 AppendMenu(parent, help='', id=wx.ID_HELP,
 kind=wx.ITEM_NORMAL, text=u'PLCOpenEditor\tF1')
 if self.Controler.HasOpenedProject() > 0:
 self.SetTitle("%s - %s"%(name, self.Controler.GetFilename()))
 else:
 self.SetTitle(name)
+def RefreshScaling(self):
+for i in xrange(self.TabsOpened.GetPageCount()):
+editor = self.TabsOpened.GetPage(i)
+editor.RefreshScaling()
 def ShowProperties(self):
 old_values = self.Controler.GetProjectProperties(self.Debug)
 dialog = ProjectDialog(self)
 dialog.SetValues(old_values)
 if dialog.ShowModal() == wx.ID_OK:
 self.Controler.SetProjectProperties(None, new_values)
 self.RefreshTitle()
 self.RefreshFileMenu()
 self.RefreshEditMenu()
 self.RefreshTypesTree()
-for i in xrange(self.TabsOpened.GetPageCount()):
+self.RefreshScaling()
-editor = self.TabsOpened.GetPage(i)
-editor.RefreshScaling()
 dialog.Destroy()
 def OnCloseFrame(self, event):
 if not self.ModeSolo and getattr(self, "_onclose", None) is not None:
 self.AUIManager.UnInit()
 undo, redo = self.Controler.GetBufferState()
 self.EditMenu.Enable(wx.ID_UNDO, undo)
 self.EditMenu.Enable(wx.ID_REDO, redo)
 self.EditMenu.Enable(wx.ID_ADD, True)
 self.EditMenu.Enable(wx.ID_DELETE, True)
+if self.TabsOpened.GetPageCount() > 0:
+self.EditMenu.Enable(wx.ID_CUT, True)
+self.EditMenu.Enable(wx.ID_COPY, True)
+if self.CopyBuffer is not None:
+self.EditMenu.Enable(wx.ID_PASTE, True)
+else:
+self.EditMenu.Enable(wx.ID_PASTE, False)
+self.EditMenu.Enable(wx.ID_SELECTALL, True)
+else:
+self.EditMenu.Enable(wx.ID_CUT, False)
+self.EditMenu.Enable(wx.ID_COPY, False)
+self.EditMenu.Enable(wx.ID_PASTE, False)
+self.EditMenu.Enable(wx.ID_SELECTALL, False)
 else:
 self.EditMenu.Enable(wx.ID_REFRESH, False)
 if not self.Debug:
 self.EditMenu.Enable(wx.ID_UNDO, False)
 self.EditMenu.Enable(wx.ID_REDO, False)
+self.EditMenu.Enable(wx.ID_CUT, False)
+self.EditMenu.Enable(wx.ID_COPY, False)
+self.EditMenu.Enable(wx.ID_PASTE, False)
+self.EditMenu.Enable(wx.ID_SELECTALL, False)
 self.EditMenu.Enable(wx.ID_ADD, False)
 self.EditMenu.Enable(wx.ID_DELETE, False)
-if not self.Debug:
-self.EditMenu.Enable(wx.ID_CUT, True)
-self.EditMenu.Enable(wx.ID_COPY, True)
-if self.CopyBuffer is not None:
-self.EditMenu.Enable(wx.ID_PASTE, True)
-else:
-self.EditMenu.Enable(wx.ID_PASTE, False)
 def OnRefreshMenu(self, event):
 selected = self.TabsOpened.GetSelection()
 if selected != -1:
 window = self.TabsOpened.GetPage(selected)
 window.RefreshView()
 self.RefreshTitle()
 self.RefreshEditMenu()
 self.RefreshTypesTree()
 self.RefreshInstancesTree()
 self.RefreshLibraryTree()
+self.RefreshScaling()
 event.Skip()
 def OnRedoMenu(self, event):
 self.Controler.LoadNext()
 idxs = range(self.TabsOpened.GetPageCount())
 self.RefreshTitle()
 self.RefreshEditMenu()
 self.RefreshTypesTree()
 self.RefreshInstancesTree()
 self.RefreshLibraryTree()
+self.RefreshScaling()
 event.Skip()
 def OnCutMenu(self, event):
 control = self.FindFocus()
 if isinstance(control, (Viewer, TextViewer)):
 control = self.FindFocus()
 if isinstance(control, (Viewer, TextViewer)):
 control.Paste()
 elif isinstance(control, wx.TextCtrl):
 control.ProcessEvent(event)
+event.Skip()
+def OnSelectAllMenu(self, event):
+selected = self.TabsOpened.GetSelection()
+if selected != -1:
+window = self.TabsOpened.GetPage(selected)
+window.SelectAll()
 event.Skip()
 def OnDeleteMenu(self, event):
 window = self.FindFocus()
 if window == self.TypesTree:
 if self.Debug:
 self.TabsOpened.SetPageText(idx, window.GetInstancePath())
 else:
 self.TabsOpened.SetPageText(idx, "-".join(words[1:]))
+def GetTabsOpenedDClickFunction(self, window):
+def OnTabsOpenedDClick(event):
+pane = self.AUIManager.GetPane(self.TabsOpened)
+if pane.IsMaximized():
+self.AUIManager.RestorePane(pane)
+else:
+self.AUIManager.MaximizePane(pane)
+self.AUIManager.Update()
+event.Skip()
+return OnTabsOpenedDClick
 #-------------------------------------------------------------------------------
 #                         Types Tree Management Functions
 #-------------------------------------------------------------------------------
 words = tagname.split("::")
 self.VariablePanelIndexer.AddVariablePanel(tagname, self.Controler.GetPouType(words[1], self.Debug))
 elif elementtype == ITEM_DATATYPE:
 new_window = DataTypeEditor(self.TabsOpened, tagname, self, self.Controler)
 self.TabsOpened.AddPage(new_window, "")
+if wx.VERSION >= (2, 6, 0):
+children = self.TabsOpened.GetChildren()
+children[len(children) - 1].Bind(wx.EVT_LEFT_DCLICK, self.GetTabsOpenedDClickFunction(new_window))
 self.VariablePanelIndexer.ChangeVariablePanel(tagname)
 openedidx = self.IsOpened(tagname)
 old_selected = self.TabsOpened.GetSelection()
 if old_selected != openedidx:
 if old_selected >= 0:
 else:
 event(self, function)
 def _init_coll_MainSizer_Items(self, parent):
 parent.AddWindow(self.VariablesGrid, 0, border=0, flag=wx.GROW)
-parent.AddSizer(self.ControlPanelSizer, 0, border=0, flag=wx.GROW)
+parent.AddSizer(self.ControlPanelSizer, 0, border=5, flag=wx.GROW|wx.ALL)
 def _init_coll_MainSizer_Growables(self, parent):
 parent.AddGrowableCol(0)
 parent.AddGrowableRow(0)
 parent.AddGrowableCol(3)
 parent.AddGrowableRow(0)
 def _init_sizers(self):
 self.MainSizer = wx.FlexGridSizer(cols=2, hgap=10, rows=1, vgap=0)
-self.ControlPanelSizer = wx.FlexGridSizer(cols=1, hgap=0, rows=2, vgap=10)
+self.ControlPanelSizer = wx.FlexGridSizer(cols=1, hgap=0, rows=2, vgap=5)
 self.ChoicePanelSizer = wx.GridSizer(cols=1, hgap=5, rows=4, vgap=5)
-self.ButtonPanelSizer = wx.FlexGridSizer(cols=2, hgap=5, rows=2, vgap=0)
+self.ButtonPanelSizer = wx.FlexGridSizer(cols=2, hgap=5, rows=2, vgap=5)
 self._init_coll_MainSizer_Items(self.MainSizer)
 self._init_coll_MainSizer_Growables(self.MainSizer)
 self._init_coll_ControlPanelSizer_Items(self.ControlPanelSizer)
 self._init_coll_ControlPanelSizer_Growables(self.ControlPanelSizer)
 self.ReturnType.Enable(True)
 else:
 self.ReturnType.Enable(False)
 self.staticText1.Hide()
 self.ReturnType.Hide()
 self.VariablesGrid.SetTable(self.Table)
 self.VariablesGrid.SetRowLabelSize(0)
 for col in range(self.Table.GetNumberCols()):
 attr = wx.grid.GridCellAttr()
 attr.SetAlignment(self.ColAlignements[col], wx.ALIGN_CENTRE)

changeset 331	9106d66bd204
parent 324	9f240641e3f0
child 332	555124c752ec