beremiz: comparison BeremizIDE.py

equal deleted inserted replaced

-:c74815729afd
+:691083b5682a
 IDEFrame._init_utils(self)
 def _init_coll_FileMenu_Items(self, parent):
 AppendMenu(parent, help='', id=wx.ID_NEW,
 kind=wx.ITEM_NORMAL, text=_(u'New') + '\tCTRL+N')
 AppendMenu(parent, help='', id=wx.ID_OPEN,
 kind=wx.ITEM_NORMAL, text=_(u'Open') + '\tCTRL+O')
 parent.AppendMenu(ID_FILEMENURECENTPROJECTS, _("&Recent Projects"), self.RecentProjectsMenu)
 parent.AppendSeparator()
 AppendMenu(parent, help='', id=wx.ID_SAVE,
 kind=wx.ITEM_NORMAL, text=_(u'Save') + '\tCTRL+S')
 AppendMenu(parent, help='', id=wx.ID_SAVEAS,
 kind=wx.ITEM_NORMAL, text=_(u'Save as') + '\tCTRL+SHIFT+S')
 AppendMenu(parent, help='', id=wx.ID_CLOSE,
 kind=wx.ITEM_NORMAL, text=_(u'Close Tab') + '\tCTRL+W')
 AppendMenu(parent, help='', id=wx.ID_CLOSE_ALL,
 kind=wx.ITEM_NORMAL, text=_(u'Close Project') + '\tCTRL+SHIFT+W')
 parent.AppendSeparator()
 AppendMenu(parent, help='', id=wx.ID_PAGE_SETUP,
 kind=wx.ITEM_NORMAL, text=_(u'Page Setup') + '\tCTRL+ALT+P')
 AppendMenu(parent, help='', id=wx.ID_PREVIEW,
 kind=wx.ITEM_NORMAL, text=_(u'Preview') + '\tCTRL+SHIFT+P')
 AppendMenu(parent, help='', id=wx.ID_PRINT,
 kind=wx.ITEM_NORMAL, text=_(u'Print') + '\tCTRL+P')
 parent.AppendSeparator()
 AppendMenu(parent, help='', id=wx.ID_EXIT,
 kind=wx.ITEM_NORMAL, text=_(u'Quit') + '\tCTRL+Q')
 self.Bind(wx.EVT_MENU, self.OnNewProjectMenu, id=wx.ID_NEW)
 self.Bind(wx.EVT_MENU, self.OnOpenProjectMenu, id=wx.ID_OPEN)
 self.Bind(wx.EVT_MENU, self.OnSaveProjectMenu, id=wx.ID_SAVE)
 self.Bind(wx.EVT_MENU, self.OnSaveProjectAsMenu, id=wx.ID_SAVEAS)
 new_menu = wx.Menu(title='')
 menu.AppendMenu(new_id, text, new_menu)
 self._RecursiveAddMenuItems(new_menu, children)
 else:
 AppendMenu(menu, help=help, id=new_id,
 kind=wx.ITEM_NORMAL, text=text)
 self.Bind(wx.EVT_MENU, self.GetAddConfNodeFunction(name),
 id=new_id)
 def _init_coll_AddMenu_Items(self, parent):
 IDEFrame._init_coll_AddMenu_Items(self, parent, False)
 id = wx.NewId()
 parent.Append(help='', id=id, kind=wx.ITEM_NORMAL, text=_(u'Community support'))
 self.Bind(wx.EVT_MENU, handler, id=id)
 parent.Append(help='', id=wx.ID_ABOUT,
 kind=wx.ITEM_NORMAL, text=_(u'About'))
 self.Bind(wx.EVT_MENU, self.OnAboutMenu, id=wx.ID_ABOUT)
 def _init_coll_ConnectionStatusBar_Fields(self, parent):
 parent.SetFieldsCount(3)
 self.MainTabs["LogViewer"] = (self.LogViewer, _("PLC Log"))
 self.BottomNoteBook.AddPage(*self.MainTabs["LogViewer"])
 #self.BottomNoteBook.Split(self.BottomNoteBook.GetPageIndex(self.LogViewer), wx.RIGHT)
 StatusToolBar = wx.ToolBar(self, -1, wx.DefaultPosition, wx.DefaultSize,
 wx.TB_FLAT | wx.TB_NODIVIDER | wx.NO_BORDER)
 StatusToolBar.SetToolBitmapSize(wx.Size(25, 25))
 StatusToolBar.Realize()
 self.Panes["StatusToolBar"] = StatusToolBar
 self.AUIManager.AddPane(StatusToolBar, wx.aui.AuiPaneInfo().
 Name("StatusToolBar").Caption(_("Status ToolBar")).
 ToolbarPane().Top().Position(1).
 LeftDockable(False).RightDockable(False))
 self.AUIManager.Update()
 self.ConnectionStatusBar = esb.EnhancedStatusBar(self, style=wx.ST_SIZEGRIP)
 self._init_coll_ConnectionStatusBar_Fields(self.ConnectionStatusBar)
 # create temporary directory for runtime working directory
 self.local_runtime_tmpdir = tempfile.mkdtemp()
 # choose an arbitrary random port for runtime
 self.runtime_port = int(random.random() * 1000) + 61131
 # launch local runtime
-self.local_runtime = ProcessLogger(self.Log,
+self.local_runtime = ProcessLogger(
+self.Log,
 "\"%s\" \"%s\" -p %s -i localhost %s %s" % (
 sys.executable,
 Bpath("Beremiz_service.py"),
 self.runtime_port,
 {False: "-x 0", True: "-x 1"}[taskbaricon],
 if self.CTR is not None:
 for confnode_method in self.CTR.StatusMethods:
 if "method" in confnode_method and confnode_method.get("shown", True):
 id = wx.NewId()
-StatusToolBar.AddSimpleTool(id,
+StatusToolBar.AddSimpleTool(
-GetBitmap(confnode_method.get("bitmap", "Unknown")),
+id, GetBitmap(confnode_method.get("bitmap", "Unknown")),
 confnode_method["tooltip"])
 self.Bind(wx.EVT_MENU, self.GetMenuCallBackFunction(confnode_method["method"]), id=id)
 StatusToolBar.Realize()
 self.AUIManager.GetPane("StatusToolBar").BestSize(StatusToolBar.GetBestSize()).Show()
 if tagname == "Project":
 self.SelectedItem = root
 self.ProjectTree.SelectItem(root)
 self.ResetSelectedItem()
 else:
-return self.RecursiveProjectTreeItemSelection(root,
+return self.RecursiveProjectTreeItemSelection(
-[(word, ITEM_CONFNODE) for word in tagname.split(".")])
+root,
+[(word, ITEM_CONFNODE) for word in tagname.split(".")])
 elif words[0] == "R":
 return self.RecursiveProjectTreeItemSelection(root, [(words[2], ITEM_RESOURCE)])
 elif not os.path.exists(words[0]):
 IDEFrame.SelectProjectTreeItem(self, tagname)
 self.CTR.CTNAddChild(ConfNodeName, ConfNodeType)
 self._Refresh(TITLE, FILEMENU, PROJECTTREE)
 def DeleteConfNode(self, confnode):
 if self.CTR.CheckProjectPathPerm():
-dialog = wx.MessageDialog(self,
+dialog = wx.MessageDialog(
+self,
 _("Really delete node '%s'?") % confnode.CTNName(),
 _("Remove %s node") % confnode.CTNType,
 wx.YES_NO | wx.NO_DEFAULT)
 if dialog.ShowModal() == wx.ID_YES:
 confnode.CTNRemove()
 # Allow clicking....
 cap = wx.Window_GetCapture()
 if cap:
 cap.ReleaseMouse()
-dlg = wx.SingleChoiceDialog(None,
+dlg = wx.SingleChoiceDialog(
+None,
 _("""
 An unhandled exception (bug) occured. Bug report saved at :
 (%s)
 Please be kind enough to send this file to:

changeset 1768	691083b5682a
parent 1767	c74815729afd
child 1769	4665ba25a0ba