plcopeneditor_history: comparison PLCOpenEditor.py

equal deleted inserted replaced

-:f10449b18dbe
+:ecd2226716d8
 #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 datetime import datetime
 import wx, wx.grid
+import wx.aui
-if wx.VERSION >= (2, 8, 0):
-import wx.aui
-USE_AUI = True
-else:
-USE_AUI = False
 import os, re, platform, sys, time, traceback, getopt
 import cPickle
 CWD = os.path.split(os.path.realpath(__file__))[0]
 base_folder = os.path.split(CWD)[0]
 new_id = wx.NewId()
 AppendMenu(zoommenu, help='', id=new_id,
 kind=wx.ITEM_RADIO, text=str(int(round(value * 100))) + "%")
 self.Bind(wx.EVT_MENU, self.GenerateZoomFunction(idx), id=new_id)
-if USE_AUI:
+parent.AppendSeparator()
-parent.AppendSeparator()
+AppendMenu(parent, help='', id=ID_PLCOPENEDITORDISPLAYMENURESETPERSPECTIVE,
-AppendMenu(parent, help='', id=ID_PLCOPENEDITORDISPLAYMENURESETPERSPECTIVE,
+kind=wx.ITEM_NORMAL, text=_(u'Reset Perspective'))
-kind=wx.ITEM_NORMAL, text=_(u'Reset Perspective'))
+self.Bind(wx.EVT_MENU, self.OnResetPerspective, id=ID_PLCOPENEDITORDISPLAYMENURESETPERSPECTIVE)
-self.Bind(wx.EVT_MENU, self.OnResetPerspective, id=ID_PLCOPENEDITORDISPLAYMENURESETPERSPECTIVE)
 self.Bind(wx.EVT_MENU, self.OnRefreshMenu, id=wx.ID_REFRESH)
 if self.EnableDebug:
 self.Bind(wx.EVT_MENU, self.OnClearErrorsMenu, id=wx.ID_CLEAR)
 #-----------------------------------------------------------------------
 #                          Creating main structure
 #-----------------------------------------------------------------------
-if USE_AUI:
+self.AUIManager = wx.aui.AuiManager(self)
-self.AUIManager = wx.aui.AuiManager(self)
+self.AUIManager.SetDockSizeConstraint(0.5, 0.5)
-self.AUIManager.SetDockSizeConstraint(0.5, 0.5)
+self.Panes = {}
-self.Panes = {}
+self.LeftNoteBook = wx.aui.AuiNotebook(self, ID_PLCOPENEDITORLEFTNOTEBOOK,
-self.LeftNoteBook = wx.aui.AuiNotebook(self, ID_PLCOPENEDITORLEFTNOTEBOOK,
+style=wx.aui.AUI_NB_TOP|wx.aui.AUI_NB_TAB_SPLIT|wx.aui.AUI_NB_TAB_MOVE|
-style=wx.aui.AUI_NB_TOP|wx.aui.AUI_NB_TAB_SPLIT|wx.aui.AUI_NB_TAB_MOVE|
+wx.aui.AUI_NB_SCROLL_BUTTONS|wx.aui.AUI_NB_TAB_EXTERNAL_MOVE)
-wx.aui.AUI_NB_SCROLL_BUTTONS|wx.aui.AUI_NB_TAB_EXTERNAL_MOVE)
+self.LeftNoteBook.Bind(wx.aui.EVT_AUINOTEBOOK_ALLOW_DND,
-self.LeftNoteBook.Bind(wx.aui.EVT_AUINOTEBOOK_ALLOW_DND,
+self.OnAllowNotebookDnD)
-self.OnAllowNotebookDnD)
+self.AUIManager.AddPane(self.LeftNoteBook,
-self.AUIManager.AddPane(self.LeftNoteBook,
+wx.aui.AuiPaneInfo().Name("ProjectPane").
-wx.aui.AuiPaneInfo().Name("ProjectPane").
+Left().Layer(1).
-Left().Layer(1).
+BestSize(wx.Size(300, 500)).CloseButton(False))
-BestSize(wx.Size(300, 500)).CloseButton(False))
+self.BottomNoteBook = wx.aui.AuiNotebook(self, ID_PLCOPENEDITORBOTTOMNOTEBOOK,
-self.BottomNoteBook = wx.aui.AuiNotebook(self, ID_PLCOPENEDITORBOTTOMNOTEBOOK,
+style=wx.aui.AUI_NB_TOP|wx.aui.AUI_NB_TAB_SPLIT|wx.aui.AUI_NB_TAB_MOVE|
-style=wx.aui.AUI_NB_TOP|wx.aui.AUI_NB_TAB_SPLIT|wx.aui.AUI_NB_TAB_MOVE|
+wx.aui.AUI_NB_SCROLL_BUTTONS|wx.aui.AUI_NB_TAB_EXTERNAL_MOVE)
-wx.aui.AUI_NB_SCROLL_BUTTONS|wx.aui.AUI_NB_TAB_EXTERNAL_MOVE)
+self.BottomNoteBook.Bind(wx.aui.EVT_AUINOTEBOOK_ALLOW_DND,
-self.BottomNoteBook.Bind(wx.aui.EVT_AUINOTEBOOK_ALLOW_DND,
+self.OnAllowNotebookDnD)
-self.OnAllowNotebookDnD)
+self.AUIManager.AddPane(self.BottomNoteBook,
-self.AUIManager.AddPane(self.BottomNoteBook,
+wx.aui.AuiPaneInfo().Name("ResultPane").
-wx.aui.AuiPaneInfo().Name("ResultPane").
+Bottom().Layer(0).
-Bottom().Layer(0).
+BestSize(wx.Size(800, 300)).CloseButton(False))
-BestSize(wx.Size(800, 300)).CloseButton(False))
+self.RightNoteBook = wx.aui.AuiNotebook(self, ID_PLCOPENEDITORRIGHTNOTEBOOK,
-self.RightNoteBook = wx.aui.AuiNotebook(self, ID_PLCOPENEDITORRIGHTNOTEBOOK,
+style=wx.aui.AUI_NB_TOP|wx.aui.AUI_NB_TAB_SPLIT|wx.aui.AUI_NB_TAB_MOVE|
-style=wx.aui.AUI_NB_TOP|wx.aui.AUI_NB_TAB_SPLIT|wx.aui.AUI_NB_TAB_MOVE|
+wx.aui.AUI_NB_SCROLL_BUTTONS|wx.aui.AUI_NB_TAB_EXTERNAL_MOVE)
-wx.aui.AUI_NB_SCROLL_BUTTONS|wx.aui.AUI_NB_TAB_EXTERNAL_MOVE)
+self.RightNoteBook.Bind(wx.aui.EVT_AUINOTEBOOK_ALLOW_DND,
-self.RightNoteBook.Bind(wx.aui.EVT_AUINOTEBOOK_ALLOW_DND,
+self.OnAllowNotebookDnD)
-self.OnAllowNotebookDnD)
+self.AUIManager.AddPane(self.RightNoteBook,
-self.AUIManager.AddPane(self.RightNoteBook,
+wx.aui.AuiPaneInfo().Name("LibraryPane").
-wx.aui.AuiPaneInfo().Name("LibraryPane").
+Right().Layer(0).
-Right().Layer(0).
+BestSize(wx.Size(250, 400)).CloseButton(False))
-BestSize(wx.Size(250, 400)).CloseButton(False))
+self.TabsOpened = wx.aui.AuiNotebook(self, ID_PLCOPENEDITORTABSOPENED,
-self.TabsOpened = wx.aui.AuiNotebook(self, ID_PLCOPENEDITORTABSOPENED,
+style=wx.aui.AUI_NB_DEFAULT_STYLE|wx.aui.AUI_NB_WINDOWLIST_BUTTON)
-style=wx.aui.AUI_NB_DEFAULT_STYLE|wx.aui.AUI_NB_WINDOWLIST_BUTTON)
+self.TabsOpened.Bind(wx.aui.EVT_AUINOTEBOOK_PAGE_CHANGING,
-self.TabsOpened.Bind(wx.aui.EVT_AUINOTEBOOK_PAGE_CHANGING,
+self.OnPouSelectedChanging)
-self.OnPouSelectedChanging)
+self.TabsOpened.Bind(wx.aui.EVT_AUINOTEBOOK_PAGE_CHANGED,
-self.TabsOpened.Bind(wx.aui.EVT_AUINOTEBOOK_PAGE_CHANGED,
+self.OnPouSelectedChanged)
-self.OnPouSelectedChanged)
+self.TabsOpened.Bind(wx.aui.EVT_AUINOTEBOOK_PAGE_CLOSE,
-self.TabsOpened.Bind(wx.aui.EVT_AUINOTEBOOK_PAGE_CLOSE,
+self.OnPageClose)
-self.OnPageClose)
+self.TabsOpened.Bind(wx.aui.EVT_AUINOTEBOOK_END_DRAG,
-self.TabsOpened.Bind(wx.aui.EVT_AUINOTEBOOK_END_DRAG,
+self.OnPageDragged)
-self.OnPageDragged)
+self.AUIManager.AddPane(self.TabsOpened,
-self.AUIManager.AddPane(self.TabsOpened,
+wx.aui.AuiPaneInfo().CentrePane().Name("TabsPane"))
-wx.aui.AuiPaneInfo().CentrePane().Name("TabsPane"))
-else:
-self.MainSplitter = wx.SplitterWindow(id=ID_PLCOPENEDITORMAINSPLITTER,
-name='MainSplitter', parent=self, point=wx.Point(0, 0),
-size=wx.Size(0, 0), style=wx.SP_3D)
-self.MainSplitter.SetNeedUpdating(True)
-self.MainSplitter.SetMinimumPaneSize(1)
-self.LeftNoteBook = wx.Notebook(id=ID_PLCOPENEDITORLEFTNOTEBOOK,
-name='LeftNoteBook', parent=self.MainSplitter, pos=wx.Point(0,
-0), size=wx.Size(0, 0), style=0)
-self.SecondSplitter = wx.SplitterWindow(id=ID_PLCOPENEDITORSECONDSPLITTER,
-name='SecondSplitter', parent=self.MainSplitter, point=wx.Point(0, 0),
-size=wx.Size(0, 0), style=wx.SP_3D)
-self.SecondSplitter.SetMinimumPaneSize(1)
-self.MainSplitter.SplitVertically(self.LeftNoteBook, self.SecondSplitter, 200)
-self.ThirdSplitter = wx.SplitterWindow(id=ID_PLCOPENEDITORTHIRDSPLITTER,
-name='ThirdSplitter', parent=self.SecondSplitter, point=wx.Point(0, 0),
-size=wx.Size(0, 0), style=wx.SP_3D)
-self.ThirdSplitter.SetMinimumPaneSize(1)
-self.BottomNoteBook = wx.Notebook(id=ID_PLCOPENEDITORBOTTOMNOTEBOOK,
-name='BottomNoteBook', parent=self.SecondSplitter, pos=wx.Point(0,
-0), size=wx.Size(0, 0), style=0)
-self.SecondSplitter.SplitHorizontally(self.ThirdSplitter, self.BottomNoteBook, -200)
-self.TabsOpened = wx.Notebook(id=ID_PLCOPENEDITORTABSOPENED,
-name='TabsOpened', parent=self.ThirdSplitter, pos=wx.Point(0,
-0), size=wx.Size(0, 0), style=0)
-self.TabsOpened.SetImageList(self.TabsImageList)
-if wx.VERSION >= (2, 6, 0):
-self.TabsOpened.Bind(wx.EVT_NOTEBOOK_PAGE_CHANGING,
-self.OnPouSelectedChanging, id=ID_PLCOPENEDITORTABSOPENED)
-self.TabsOpened.Bind(wx.EVT_NOTEBOOK_PAGE_CHANGED,
-self.OnPouSelectedChanged, id=ID_PLCOPENEDITORTABSOPENED)
-else:
-wx.EVT_NOTEBOOK_PAGE_CHANGING(self.TabsOpened, ID_PLCOPENEDITORTABSOPENED,
-self.OnPouSelectedChanging)
-wx.EVT_NOTEBOOK_PAGE_CHANGED(self.TabsOpened, ID_PLCOPENEDITORTABSOPENED,
-self.OnPouSelectedChanged)
-self.RightNoteBook = wx.Notebook(id=ID_PLCOPENEDITORRIGHTNOTEBOOK,
-name='RightNoteBook', parent=self.ThirdSplitter, pos=wx.Point(0,
-0), size=wx.Size(0, 0), style=0)
-self.ThirdSplitter.SplitVertically(self.TabsOpened, self.RightNoteBook, -250)
 #-----------------------------------------------------------------------
 #                    Creating PLCopen Project Types Tree
 #-----------------------------------------------------------------------
 #-----------------------------------------------------------------------
 #                            Creating Tool Bar
 #-----------------------------------------------------------------------
-if USE_AUI:
+MenuToolBar = wx.ToolBar(self, ID_PLCOPENEDITOREDITORMENUTOOLBAR, wx.DefaultPosition, wx.DefaultSize,
-MenuToolBar = wx.ToolBar(self, ID_PLCOPENEDITOREDITORMENUTOOLBAR, wx.DefaultPosition, wx.DefaultSize,
+wx.TB_FLAT | wx.TB_NODIVIDER | wx.NO_BORDER)
-wx.TB_FLAT | wx.TB_NODIVIDER | wx.NO_BORDER)
+MenuToolBar.SetToolBitmapSize(wx.Size(25, 25))
-MenuToolBar.SetToolBitmapSize(wx.Size(25, 25))
+MenuToolBar.Realize()
-MenuToolBar.Realize()
+self.Panes["MenuToolBar"] = MenuToolBar
-self.Panes["MenuToolBar"] = MenuToolBar
+self.AUIManager.AddPane(MenuToolBar, wx.aui.AuiPaneInfo().
-self.AUIManager.AddPane(MenuToolBar, wx.aui.AuiPaneInfo().
+Name("MenuToolBar").Caption(_("Menu ToolBar")).
-Name("MenuToolBar").Caption(_("Menu ToolBar")).
+ToolbarPane().Top().
-ToolbarPane().Top().
+LeftDockable(False).RightDockable(False))
-LeftDockable(False).RightDockable(False))
+EditorToolBar = wx.ToolBar(self, ID_PLCOPENEDITOREDITORTOOLBAR, wx.DefaultPosition, wx.DefaultSize,
-EditorToolBar = wx.ToolBar(self, ID_PLCOPENEDITOREDITORTOOLBAR, wx.DefaultPosition, wx.DefaultSize,
+wx.TB_FLAT | wx.TB_NODIVIDER | wx.NO_BORDER)
-wx.TB_FLAT | wx.TB_NODIVIDER | wx.NO_BORDER)
+EditorToolBar.SetToolBitmapSize(wx.Size(25, 25))
-EditorToolBar.SetToolBitmapSize(wx.Size(25, 25))
+EditorToolBar.AddRadioTool(ID_PLCOPENEDITOREDITORTOOLBARSELECTION,
-EditorToolBar.AddRadioTool(ID_PLCOPENEDITOREDITORTOOLBARSELECTION,
+wx.Bitmap(os.path.join(CWD, 'Images', 'select.png')), wx.NullBitmap, _("Select an object"))
-wx.Bitmap(os.path.join(CWD, 'Images', 'select.png')), wx.NullBitmap, _("Select an object"))
+EditorToolBar.Realize()
-EditorToolBar.Realize()
+self.Panes["EditorToolBar"] = EditorToolBar
-self.Panes["EditorToolBar"] = EditorToolBar
+self.AUIManager.AddPane(EditorToolBar, wx.aui.AuiPaneInfo().
-self.AUIManager.AddPane(EditorToolBar, wx.aui.AuiPaneInfo().
+Name("EditorToolBar").Caption(_("Editor ToolBar")).
-Name("EditorToolBar").Caption(_("Editor ToolBar")).
+ToolbarPane().Top().Position(1).
-ToolbarPane().Top().Position(1).
+LeftDockable(False).RightDockable(False))
-LeftDockable(False).RightDockable(False))
-else:
-self.EditorToolBar = self.CreateToolBar(wx.TB_HORIZONTAL|wx.TB_FLAT|wx.NO_BORDER,
-ID_PLCOPENEDITOREDITORTOOLBAR, 'EditorToolBar')
-self.EditorToolBar.SetToolBitmapSize(wx.Size(25, 25))
-self.EditorToolBar.AddRadioTool(ID_PLCOPENEDITOREDITORTOOLBARSELECTION,
-wx.Bitmap(os.path.join(CWD, 'Images', 'select.png')), wx.NullBitmap, _("Select an object"))
-self.EditorToolBar.Realize()
 self.Bind(wx.EVT_MENU, self.OnSelectionTool,
 id=ID_PLCOPENEDITOREDITORTOOLBARSELECTION)
 #-----------------------------------------------------------------------
 if self.EnableDebug:
 self.DebugVariablePanel = DebugVariablePanel(self.RightNoteBook, self.Controler)
 self.MainTabs["DebugVariablePanel"] = (self.DebugVariablePanel, _("Debugger"))
 self.RightNoteBook.AddPage(*self.MainTabs["DebugVariablePanel"])
-if USE_AUI:
+self.AUIManager.Update()
-self.AUIManager.Update()
 ## Constructor of the PLCOpenEditor class.
 #  @param parent The parent window.
 #  @param controler The controler been used by PLCOpenEditor (default: None).
 #  @param fileOpen The filepath to open if no controler defined (default: None).
 self.CurrentMenu = None
 self.SelectedItem = None
 self.Highlights = {}
 self.DrawingMode = FREEDRAWING_MODE
 #self.DrawingMode = DRIVENDRAWING_MODE
-if USE_AUI:
+self.AuiTabCtrl = []
-self.AuiTabCtrl = []
 self.DefaultPerspective = None
 # Initialize Printing configuring elements
 self.PrintData = wx.PrintData()
 self.PrintData.SetPaperId(wx.PAPER_A4)
 selected = page_idx
 if selected is not None:
 wx.CallAfter(notebook.SetSelection, selected)
 def ResetPerspective(self):
-	if USE_AUI and self.DefaultPerspective is not None:
+	if self.DefaultPerspective is not None:
 self.AUIManager.LoadPerspective(self.DefaultPerspective["perspective"])
 for notebook in [self.LeftNoteBook, self.BottomNoteBook, self.RightNoteBook]:
 for idx in xrange(notebook.GetPageCount()):
 notebook.RemovePage(0)
 self.Maximize()
 else:
 self.SetClientSize(frame_size)
 def RestoreLastOrganization(self):
-if USE_AUI:
+notebooks = {}
-notebooks = {}
+for notebook, entry_name in [(self.LeftNoteBook, "leftnotebook"),
-for notebook, entry_name in [(self.LeftNoteBook, "leftnotebook"),
+(self.BottomNoteBook, "bottomnotebook"),
-(self.BottomNoteBook, "bottomnotebook"),
+(self.RightNoteBook, "rightnotebook")]:
-(self.RightNoteBook, "rightnotebook")]:
+notebooks[entry_name] = self.SaveTabOrganization(notebook)
-notebooks[entry_name] = self.SaveTabOrganization(notebook)
+self.DefaultPerspective = {
-self.DefaultPerspective = {
+"perspective": self.AUIManager.SavePerspective(),
-"perspective": self.AUIManager.SavePerspective(),
+"notebooks": notebooks,
-"notebooks": notebooks,
+}
-}
+try:
-try:
+if self.Config.HasEntry("perspective"):
-if self.Config.HasEntry("perspective"):
+self.AUIManager.LoadPerspective(str(self.Config.Read("perspective")))
-self.AUIManager.LoadPerspective(str(self.Config.Read("perspective")))
+if self.Config.HasEntry("notebooks"):
-if self.Config.HasEntry("notebooks"):
+notebooks = cPickle.loads(str(self.Config.Read("notebooks")))
-notebooks = cPickle.loads(str(self.Config.Read("notebooks")))
+for notebook in [self.LeftNoteBook, self.BottomNoteBook, self.RightNoteBook]:
-for notebook in [self.LeftNoteBook, self.BottomNoteBook, self.RightNoteBook]:
+for idx in xrange(notebook.GetPageCount()):
-for idx in xrange(notebook.GetPageCount()):
+notebook.RemovePage(0)
-notebook.RemovePage(0)
+for notebook, entry_name in [(self.LeftNoteBook, "leftnotebook"),
-for notebook, entry_name in [(self.LeftNoteBook, "leftnotebook"),
+(self.BottomNoteBook, "bottomnotebook"),
-(self.BottomNoteBook, "bottomnotebook"),
+(self.RightNoteBook, "rightnotebook")]:
-(self.RightNoteBook, "rightnotebook")]:
+self.LoadTabOrganization(notebook, notebooks.get(entry_name))
-self.LoadTabOrganization(notebook, notebooks.get(entry_name))
+except:
-except:
+self.ResetPerspective()
-		self.ResetPerspective()
+self.LoadProjectOrganization()
-self.LoadProjectOrganization()
 def SaveLastState(self):
 if not self.IsMaximized():
 self.Config.Write("framesize", cPickle.dumps(self.GetClientSize()))
 elif self.Config.HasEntry("framesize"):
 self.Config.DeleteEntry("framesize")
-if USE_AUI:
+notebooks = {}
-notebooks = {}
+for notebook, entry_name in [(self.LeftNoteBook, "leftnotebook"),
-for notebook, entry_name in [(self.LeftNoteBook, "leftnotebook"),
+(self.BottomNoteBook, "bottomnotebook"),
-(self.BottomNoteBook, "bottomnotebook"),
+(self.RightNoteBook, "rightnotebook")]:
-(self.RightNoteBook, "rightnotebook")]:
+notebooks[entry_name] = self.SaveTabOrganization(notebook)
-notebooks[entry_name] = self.SaveTabOrganization(notebook)
+self.Config.Write("notebooks", cPickle.dumps(notebooks))
-self.Config.Write("notebooks", cPickle.dumps(notebooks))
+self.Config.Write("perspective", self.AUIManager.SavePerspective())
-self.Config.Write("perspective", self.AUIManager.SavePerspective())
+self.SaveProjectOrganization()
-self.SaveProjectOrganization()
 for i in xrange(self.TabsOpened.GetPageCount()):
 self.SavePageState(self.TabsOpened.GetPage(i))
 self.Config.Flush()
 def SaveProjectOrganization(self):
-if USE_AUI and self.Controler is not None:
+if self.Controler is not None:
 tabs = []
 projects = {}
 try:
 	if self.Config.HasEntry("projects"):
 self.Config.Write("projects", cPickle.dumps(projects))
 self.Config.Flush()
 def LoadProjectOrganization(self):
-if USE_AUI and self.Controler is not None:
+if self.Controler is not None:
 project = self.GetProjectConfiguration()
 try:
 if project.has_key("tabs"):
 self.LoadTabOrganization(self.TabsOpened, project["tabs"])
 def GenerateBitmap(self, icon1_name, icon2_name = None):
 # Find index of bitmap if already created
 index = self.TabsImageListIndexes.get((icon1_name, icon2_name), None)
 # Return index or bitmap if found
 if index is not None:
-if USE_AUI:
+return self.TabsImageList.GetBitmap(index)
-return self.TabsImageList.GetBitmap(index)
-else:
-return index
 if icon2_name is None:
 # Bitmap with only one icon
 bitmap = wx.Bitmap(os.path.join(CWD, 'Images', '%s.png'%icon1_name))
 else:
 # Bitmap with two icon
 # Store bitmap in ImageList
 index = self.TabsImageList.Add(bitmap)
 # Save bitmap index in ImageList in dictionary
 self.TabsImageListIndexes[(icon1_name, icon2_name)] = index
-if USE_AUI:
+return bitmap
-return bitmap
-else:
-return index
 ## Function that add a tab in Notebook, calling refresh for tab DClick event
 # for wx.aui.AUINotebook.
 #  @param window Panel to display in tab.
 #  @param text title for the tab ctrl.
 return
 ## Function that fix difference in deleting all tabs between
 # wx.Notebook and wx.aui.AUINotebook.
 def DeleteAllPages(self):
-if USE_AUI:
+for idx in xrange(self.TabsOpened.GetPageCount()):
-for idx in xrange(self.TabsOpened.GetPageCount()):
+self.TabsOpened.DeletePage(0)
-self.TabsOpened.DeletePage(0)
-else:
-self.TabsOpened.DeleteAllPages()
 self.RefreshTabCtrlEvent()
 ## Function that fix difference in setting picture on tab between
 # wx.Notebook and wx.aui.AUINotebook.
 #  @param idx Tab index.
 #  @param bitmap wx.Bitmap to define on tab.
 #  @return True if operation succeeded
 def SetPageBitmap(self, idx, bitmap):
-if USE_AUI:
+return self.TabsOpened.SetPageBitmap(idx, bitmap)
-return self.TabsOpened.SetPageBitmap(idx, bitmap)
-else:
-return self.TabsOpened.SetPageImage(idx, bitmap)
 #-------------------------------------------------------------------------------
 #                         Dialog Message Functions
 #-------------------------------------------------------------------------------
 def OnAllowNotebookDnD(self, event):
 event.Allow()
 def RefreshTabCtrlEvent(self):
-if USE_AUI:
+auitabctrl = []
-auitabctrl = []
+for child in self.TabsOpened.GetChildren():
-for child in self.TabsOpened.GetChildren():
+if isinstance(child, wx.aui.AuiTabCtrl):
-if isinstance(child, wx.aui.AuiTabCtrl):
+auitabctrl.append(child)
-auitabctrl.append(child)
+if child not in self.AuiTabCtrl:
-if child not in self.AuiTabCtrl:
+child.Bind(wx.EVT_LEFT_DCLICK, self.GetTabsOpenedDClickFunction(child))
-child.Bind(wx.EVT_LEFT_DCLICK, self.GetTabsOpenedDClickFunction(child))
+self.AuiTabCtrl = auitabctrl
-self.AuiTabCtrl = auitabctrl
+if self.TabsOpened.GetPageCount() == 0:
-if self.TabsOpened.GetPageCount() == 0:
+pane = self.AUIManager.GetPane(self.TabsOpened)
-pane = self.AUIManager.GetPane(self.TabsOpened)
+if pane.IsMaximized():
-if pane.IsMaximized():
+self.AUIManager.RestorePane(pane)
-self.AUIManager.RestorePane(pane)
+self.AUIManager.Update()
-self.AUIManager.Update()
 def OnPouSelectedChanging(self, event):
 if not self.Starting:
 selected = self.TabsOpened.GetSelection()
 if selected >= 0:
 window = self.TabsOpened.GetPage(selected)
 if not window.IsDebugging():
 self.SelectProjectTreeItem(window.GetTagName())
 else:
 self.PouInstanceVariablesPanel.SetPouType(window.GetTagName(), window.GetInstancePath())
-if USE_AUI:
+for child in self.TabsOpened.GetChildren():
-for child in self.TabsOpened.GetChildren():
+if isinstance(child, wx.aui.AuiTabCtrl):
-if isinstance(child, wx.aui.AuiTabCtrl):
+active_page = child.GetActivePage()
-active_page = child.GetActivePage()
+if active_page >= 0:
-if active_page >= 0:
+window = child.GetWindowFromIdx(active_page)
-window = child.GetWindowFromIdx(active_page)
+window.RefreshView()
-window.RefreshView()
-else:
-window.RefreshView()
 self._Refresh(FILEMENU, EDITMENU, DISPLAYMENU, EDITORTOOLBAR)
 def RefreshEditorNames(self, old_tagname, new_tagname):
 for i in xrange(self.TabsOpened.GetPageCount()):
 editor = self.TabsOpened.GetPage(i)
 id, bitmap, help, callback = toolbar_item
 MenuToolBar.AddSimpleTool(id=id, shortHelpString=help, bitmap=wx.Bitmap(os.path.join(CWD, 'Images', bitmap)))
 if callback is not None:
 self.Bind(wx.EVT_TOOL, callback, id=id)
 MenuToolBar.Realize()
-if USE_AUI:
+self.AUIManager.GetPane("MenuToolBar").BestSize(MenuToolBar.GetBestSize())
-self.AUIManager.GetPane("MenuToolBar").BestSize(MenuToolBar.GetBestSize())
 def ResetEditorToolBar(self):
-if USE_AUI:
+EditorToolBar = self.Panes["EditorToolBar"]
-EditorToolBar = self.Panes["EditorToolBar"]
-else:
-EditorToolBar = self.EditorToolBar
 for item in self.CurrentEditorToolBar:
 if wx.VERSION >= (2, 6, 0):
 self.Unbind(wx.EVT_MENU, id=item)
 else:
 if EditorToolBar:
 EditorToolBar.DeleteTool(item)
 if EditorToolBar:
 EditorToolBar.Realize()
-if USE_AUI:
+self.AUIManager.GetPane("EditorToolBar").BestSize(EditorToolBar.GetBestSize())
-self.AUIManager.GetPane("EditorToolBar").BestSize(EditorToolBar.GetBestSize())
+self.AUIManager.Update()
-self.AUIManager.Update()
 def RefreshEditorToolBar(self):
 selected = self.TabsOpened.GetSelection()
 menu = None
 if selected != -1:
 menu = "debug"
 if menu is not None and menu != self.CurrentMenu:
 self.ResetEditorToolBar()
 self.CurrentMenu = menu
 self.CurrentEditorToolBar = []
-if USE_AUI:
+EditorToolBar = self.Panes["EditorToolBar"]
-EditorToolBar = self.Panes["EditorToolBar"]
-else:
-EditorToolBar = self.EditorToolBar
 if EditorToolBar:
 for radio, modes, id, method, picture, help in EditorToolBarItems[menu]:
 if modes & self.DrawingMode:
 if radio or self.DrawingMode == FREEDRAWING_MODE:
 EditorToolBar.AddRadioTool(id, wx.Bitmap(os.path.join(CWD, "Images", picture)), wx.NullBitmap, help)
 else:
 EditorToolBar.AddSimpleTool(id, wx.Bitmap(os.path.join(CWD, "Images", picture)), help)
 self.Bind(wx.EVT_MENU, getattr(self, method), id=id)
 self.CurrentEditorToolBar.append(id)
 EditorToolBar.Realize()
-if USE_AUI:
+self.AUIManager.GetPane("EditorToolBar").BestSize(EditorToolBar.GetBestSize())
-self.AUIManager.GetPane("EditorToolBar").BestSize(EditorToolBar.GetBestSize())
+self.AUIManager.Update()
-self.AUIManager.Update()
 elif not menu:
 self.ResetEditorToolBar()
 self.CurrentMenu = menu
 self.ResetCurrentMode()
 def ResetCurrentMode(self):
 selected = self.TabsOpened.GetSelection()
 if selected != -1:
 window = self.TabsOpened.GetPage(selected)
 window.SetMode(MODE_SELECTION)
-if USE_AUI:
+EditorToolBar = self.Panes["EditorToolBar"]
-EditorToolBar = self.Panes["EditorToolBar"]
-else:
-EditorToolBar = self.EditorToolBar
 if EditorToolBar:
 EditorToolBar.ToggleTool(ID_PLCOPENEDITOREDITORTOOLBARSELECTION, False)
 EditorToolBar.ToggleTool(ID_PLCOPENEDITOREDITORTOOLBARSELECTION, True)
 def ResetToolToggle(self, id):
-if USE_AUI:
+tool = self.Panes["EditorToolBar"].FindById(id)
-tool = self.Panes["EditorToolBar"].FindById(id)
-else:
-tool = self.EditorToolBar.FindById(id)
 tool.SetToggle(False)
 def OnSelectionTool(self, event):
 selected = self.TabsOpened.GetSelection()
 if selected != -1:
 if result is not None:
 self.ShowErrorMessage(result)
 def OnCloseFrame(self, event):
 if self.Controler is None or self.CheckSaveBeforeClosing(_("Close Application")):
-if USE_AUI:
+self.AUIManager.UnInit()
-self.AUIManager.UnInit()
 self.SaveLastState()
 event.Skip()
 else:

changeset 685	ecd2226716d8
parent 684	f10449b18dbe
child 687	629680fb0582