plcopeneditor_history: comparison PLCOpenEditor.py

equal deleted inserted replaced

-:a32548167224
+:361389f3ad2b
 NOTEBOOK_BORDER = 6
 else:
 TAB_BORDER = 7
 NOTEBOOK_BORDER = 2
-def SimplifyTabOrganization(tabs, rect):
+def SimplifyTabLayout(tabs, rect):
 for tab in tabs:
 if tab["pos"][0] == rect.x:
 others = [t for t in tabs if t != tab]
 others.sort(lambda x,y: cmp(x["pos"][0], y["pos"][0]))
 for other in others:
 if tab["size"][1] == rect.height:
 return True
 return False
-def ComputeTabsOrganization(tabs, rect):
+def ComputeTabsLayout(tabs, rect):
 if len(tabs) == 0:
 return tabs
 if len(tabs) == 1:
 return tabs[0]
 split = None
 break
 if split != None:
 split_tab = tabs.pop(idx)
 return {"split": split,
 "tab": split_tab,
-"others": ComputeTabsOrganization(tabs, split_rect)}
+"others": ComputeTabsLayout(tabs, split_rect)}
 else:
-if SimplifyTabOrganization(tabs, rect):
+if SimplifyTabLayout(tabs, rect):
-return ComputeTabsOrganization(tabs, rect)
+return ComputeTabsLayout(tabs, rect)
 return tabs
 #-------------------------------------------------------------------------------
 #                              IDEFrame Base Class
 #-------------------------------------------------------------------------------
 #                Saving and restoring frame organization functions
 #-------------------------------------------------------------------------------
 def OnResize(self, event):
 if self.Starting:
-self.RestoreLastOrganization()
+self.RestoreLastLayout()
 if wx.Platform == '__WXMSW__':
 wx.CallAfter(self.ResetStarting)
 else:
 self.ResetStarting()
 wx.CallAfter(self.RefreshEditor)
 for page_name, (page_ref, page_title) in self.MainTabs.iteritems():
 if page_ref == tab:
 return ("main", page_name)
 return None
-def SaveTabOrganization(self, notebook):
+def SaveTabLayout(self, notebook):
 tabs = []
 for child in notebook.GetChildren():
 if isinstance(child, wx.aui.AuiTabCtrl):
 pos = child.GetPosition()
 tab = {"pos": (pos.x, pos.y), "pages": []}
 if tab_infos is not None:
 tab["pages"].append((tab_infos, page_idx == child.GetActivePage()))
 tabs.append(tab)
 tabs.sort(lambda x, y: cmp(x["pos"], y["pos"]))
 size = notebook.GetSize()
-return ComputeTabsOrganization(tabs, wx.Rect(1, 1, size[0] - NOTEBOOK_BORDER, size[1] - NOTEBOOK_BORDER))
+return ComputeTabsLayout(tabs, wx.Rect(1, 1, size[0] - NOTEBOOK_BORDER, size[1] - NOTEBOOK_BORDER))
 def LoadTab(self, notebook, page_infos):
 if page_infos[0] == "main":
 infos = self.MainTabs.get(page_infos[1])
 if infos is not None:
 instance_infos = self.Controler.GetInstanceInfos(instance_path, self.EnableDebug)
 if instance_infos is not None:
 return notebook.GetPageIndex(self.OpenDebugViewer(instance_infos["class"], instance_path, instance_infos["type"]))
 return None
-def LoadTabOrganization(self, notebook, tabs, mode="all", first_index=None):
+def LoadTabLayout(self, notebook, tabs, mode="all", first_index=None):
 if isinstance(tabs, ListType):
 if len(tabs) == 0:
 return
 raise ValueError, "Not supported"
 if tabs.has_key("split"):
-self.LoadTabOrganization(notebook, tabs["others"])
+self.LoadTabLayout(notebook, tabs["others"])
 split_dir, split_ratio = tabs["split"]
-first_index = self.LoadTabOrganization(notebook, tabs["tab"], mode="first")
+first_index = self.LoadTabLayout(notebook, tabs["tab"], mode="first")
 notebook.Split(first_index, split_dir)
-self.LoadTabOrganization(notebook, tabs["tab"], mode="others", first_index=first_index)
+self.LoadTabLayout(notebook, tabs["tab"], mode="others", first_index=first_index)
 elif mode == "first":
 return self.LoadTab(notebook, tabs["pages"][0][0])
 else:
 selected = first_index
 notebooks = self.DefaultPerspective["notebooks"]
 for notebook, entry_name in [(self.LeftNoteBook, "leftnotebook"),
 (self.BottomNoteBook, "bottomnotebook"),
 (self.RightNoteBook, "rightnotebook")]:
-self.LoadTabOrganization(notebook, notebooks.get(entry_name))
+self.LoadTabLayout(notebook, notebooks.get(entry_name))
 def RestoreLastState(self):
 frame_size = None
 if self.Config.HasEntry("framesize"):
 frame_size = cPickle.loads(str(self.Config.Read("framesize")))
 if frame_size is None:
 self.Maximize()
 else:
 self.SetClientSize(frame_size)
-def RestoreLastOrganization(self):
+def RestoreLastLayout(self):
 notebooks = {}
 for notebook, entry_name in [(self.LeftNoteBook, "leftnotebook"),
 (self.BottomNoteBook, "bottomnotebook"),
 (self.RightNoteBook, "rightnotebook")]:
-notebooks[entry_name] = self.SaveTabOrganization(notebook)
+notebooks[entry_name] = self.SaveTabLayout(notebook)
 self.DefaultPerspective = {
 "perspective": self.AUIManager.SavePerspective(),
 "notebooks": notebooks,
 }
 notebook.RemovePage(0)
 for notebook, entry_name in [(self.LeftNoteBook, "leftnotebook"),
 (self.BottomNoteBook, "bottomnotebook"),
 (self.RightNoteBook, "rightnotebook")]:
-self.LoadTabOrganization(notebook, notebooks.get(entry_name))
+self.LoadTabLayout(notebook, notebooks.get(entry_name))
 except:
 self.ResetPerspective()
-self.LoadProjectOrganization()
+self.LoadProjectLayout()
 def SaveLastState(self):
 if not self.IsMaximized():
 self.Config.Write("framesize", cPickle.dumps(self.GetClientSize()))
 elif self.Config.HasEntry("framesize"):
 notebooks = {}
 for notebook, entry_name in [(self.LeftNoteBook, "leftnotebook"),
 (self.BottomNoteBook, "bottomnotebook"),
 (self.RightNoteBook, "rightnotebook")]:
-notebooks[entry_name] = self.SaveTabOrganization(notebook)
+notebooks[entry_name] = self.SaveTabLayout(notebook)
 self.Config.Write("notebooks", cPickle.dumps(notebooks))
 self.Config.Write("perspective", self.AUIManager.SavePerspective())
-self.SaveProjectOrganization()
+self.SaveProjectLayout()
 for i in xrange(self.TabsOpened.GetPageCount()):
 self.SavePageState(self.TabsOpened.GetPage(i))
 self.Config.Flush()
-def SaveProjectOrganization(self):
+def SaveProjectLayout(self):
 if self.Controler is not None:
 tabs = []
 projects = {}
 try:
 	projects = cPickle.loads(str(self.Config.Read("projects")))
 except:
 	pass
 project_infos = projects.setdefault(os.path.realpath(self.Controler.GetFilePath()), {})
-project_infos["tabs"] = self.SaveTabOrganization(self.TabsOpened)
+project_infos["tabs"] = self.SaveTabLayout(self.TabsOpened)
 if self.EnableDebug:
 project_infos["debug_vars"] = self.DebugVariablePanel.GetDebugVariables()
 self.Config.Write("projects", cPickle.dumps(projects))
 self.Config.Flush()
-def LoadProjectOrganization(self):
+def LoadProjectLayout(self):
 if self.Controler is not None:
 project = self.GetProjectConfiguration()
 try:
 if project.has_key("tabs"):
-self.LoadTabOrganization(self.TabsOpened, project["tabs"])
+self.LoadTabLayout(self.TabsOpened, project["tabs"])
 except:
 	self.DeleteAllPages()
 if self.EnableDebug:
 	try:
 if result is None:
 self.Controler = controler
 self.LibraryPanel.SetControler(controler)
 self.ProjectTree.Enable(True)
 self.PouInstanceVariablesPanel.SetController(controler)
-self.LoadProjectOrganization()
+self.LoadProjectLayout()
 self._Refresh(PROJECTTREE, LIBRARYTREE)
 self._Refresh(TITLE, EDITORTOOLBAR, FILEMENU, EDITMENU)
 dialog.Destroy()
 if result is not None:
 self.ShowErrorMessage(result)
 def OnCloseProjectMenu(self, event):
 if not self.CheckSaveBeforeClosing():
 return
-self.SaveProjectOrganization()
+self.SaveProjectLayout()
 self.ResetView()
 self._Refresh(TITLE, EDITORTOOLBAR, FILEMENU, EDITMENU)
 def OnSaveProjectMenu(self, event):
 self.SaveProject()

changeset 691	361389f3ad2b
parent 690	a32548167224
child 695	8848ffb7ae2a