450 projectOpen = DecodeFileSystemPath(projectOpen, False) |
450 projectOpen = DecodeFileSystemPath(projectOpen, False) |
451 |
451 |
452 if projectOpen is not None and os.path.isdir(projectOpen): |
452 if projectOpen is not None and os.path.isdir(projectOpen): |
453 self.CTR = ProjectController(self, self.Log) |
453 self.CTR = ProjectController(self, self.Log) |
454 self.Controler = self.CTR |
454 self.Controler = self.CTR |
455 result, err = self.CTR.LoadProject(projectOpen, buildpath) |
455 result, _err = self.CTR.LoadProject(projectOpen, buildpath) |
456 if not result: |
456 if not result: |
457 self.LibraryPanel.SetController(self.Controler) |
457 self.LibraryPanel.SetController(self.Controler) |
458 self.ProjectTree.Enable(True) |
458 self.ProjectTree.Enable(True) |
459 self.PouInstanceVariablesPanel.SetController(self.Controler) |
459 self.PouInstanceVariablesPanel.SetController(self.Controler) |
460 self.RefreshConfigRecentProjects(os.path.abspath(projectOpen)) |
460 self.RefreshConfigRecentProjects(os.path.abspath(projectOpen)) |
556 |
556 |
557 def SearchLineForError(self, line): |
557 def SearchLineForError(self, line): |
558 if self.CTR is not None: |
558 if self.CTR is not None: |
559 result = MATIEC_ERROR_MODEL.match(line) |
559 result = MATIEC_ERROR_MODEL.match(line) |
560 if result is not None: |
560 if result is not None: |
561 first_line, first_column, last_line, last_column, error = result.groups() |
561 first_line, first_column, last_line, last_column, _error = result.groups() |
562 self.CTR.ShowError(self.Log, |
562 self.CTR.ShowError(self.Log, |
563 (int(first_line), int(first_column)), |
563 (int(first_line), int(first_column)), |
564 (int(last_line), int(last_column))) |
564 (int(last_line), int(last_column))) |
565 |
565 |
566 def CheckSaveBeforeClosing(self, title=_("Close Project")): |
566 def CheckSaveBeforeClosing(self, title=_("Close Project")): |
727 self.GenerateMenuRecursive(kind, submenu) |
727 self.GenerateMenuRecursive(kind, submenu) |
728 menu.AppendMenu(id, text, submenu) |
728 menu.AppendMenu(id, text, submenu) |
729 elif kind == wx.ITEM_SEPARATOR: |
729 elif kind == wx.ITEM_SEPARATOR: |
730 menu.AppendSeparator() |
730 menu.AppendSeparator() |
731 else: |
731 else: |
732 text, id, help, callback = infos |
732 text, id, _help, callback = infos |
733 AppendMenu(menu, help='', id=id, kind=kind, text=text) |
733 AppendMenu(menu, help='', id=id, kind=kind, text=text) |
734 if callback is not None: |
734 if callback is not None: |
735 self.Bind(wx.EVT_MENU, callback, id=id) |
735 self.Bind(wx.EVT_MENU, callback, id=id) |
736 |
736 |
737 def RefreshEditorToolBar(self): |
737 def RefreshEditorToolBar(self): |