# HG changeset patch # User Edouard Tisserant # Date 1341601243 -7200 # Node ID f49875b9e946420de2ca1f25db0048df23706411 # Parent 7499535588e6cd3c1af39cd3364a9d314d174f4c# Parent aaacf208beb94b79fdc06117951fc3f7b0245edb merge diff -r 7499535588e6 -r f49875b9e946 Beremiz.py --- a/Beremiz.py Tue Jun 19 21:59:34 2012 +0200 +++ b/Beremiz.py Fri Jul 06 21:00:43 2012 +0200 @@ -85,7 +85,7 @@ wx.InitAllImageHandlers() # popup splash - bmp = wx.Image(Bpath("images","splash.png")).ConvertToBitmap() + bmp = wx.Image(Bpath("images", "splash.png")).ConvertToBitmap() #splash=AdvancedSplash(None, bitmap=bmp, style=wx.SPLASH_CENTRE_ON_SCREEN, timeout=4000) splash=AdvancedSplash(None, bitmap=bmp) wx.Yield() @@ -145,10 +145,15 @@ sys.path.append(base_folder) sys.path.append(os.path.join(base_folder, "plcopeneditor")) +from utils.BitmapLibrary import AddBitmapFolder, GetBitmap +AddBitmapFolder(os.path.join(CWD, "images")) + if __name__ == '__main__': # Load extensions for extfilename in extensions: - sys.path.append(os.path.split(os.path.realpath(extfilename))[0]) + extension_folder = os.path.split(os.path.realpath(extfilename))[0] + sys.path.append(extension_folder) + AddBitmapFolder(os.path.join(extension_folder, "images")) execfile(extfilename, locals()) import wx.lib.buttons, wx.lib.statbmp @@ -175,12 +180,8 @@ style = 0, name = "genstatbmp"): - bitmappath = Bpath( "images", bitmapname) - if os.path.isfile(bitmappath): - bitmap = wx.Bitmap(bitmappath) - else: - bitmap = None - wx.lib.statbmp.GenStaticBitmap.__init__(self, parent, ID, bitmap, + wx.lib.statbmp.GenStaticBitmap.__init__(self, parent, ID, + GetBitmap(bitmapname), pos, size, style, name) @@ -335,11 +336,11 @@ self.Bind(wx.EVT_MENU, self.OnPrintMenu, id=wx.ID_PRINT) self.Bind(wx.EVT_MENU, self.OnQuitMenu, id=wx.ID_EXIT) - self.AddToMenuToolBar([(wx.ID_NEW, "new.png", _(u'New'), None), - (wx.ID_OPEN, "open.png", _(u'Open'), None), - (wx.ID_SAVE, "save.png", _(u'Save'), None), - (wx.ID_SAVEAS, "saveas.png", _(u'Save As...'), None), - (wx.ID_PRINT, "print.png", _(u'Print'), None)]) + self.AddToMenuToolBar([(wx.ID_NEW, "new", _(u'New'), None), + (wx.ID_OPEN, "open", _(u'Open'), None), + (wx.ID_SAVE, "save", _(u'Save'), None), + (wx.ID_SAVEAS, "saveas", _(u'Save As...'), None), + (wx.ID_PRINT, "print", _(u'Print'), None)]) def _init_coll_AddMenu_Items(self, parent): IDEFrame._init_coll_AddMenu_Items(self, parent, False) @@ -424,15 +425,15 @@ ("VAR_INPUT", LOCATION_VAR_INPUT), ("VAR_OUTPUT", LOCATION_VAR_OUTPUT), ("VAR_LOCAL", LOCATION_VAR_MEMORY)]: - self.LocationImageDict[itemtype]=self.LocationImageList.Add(wx.Bitmap(os.path.join(base_folder, "plcopeneditor", 'Images', '%s.png'%imgname))) + self.LocationImageDict[itemtype] = self.LocationImageList.Add(GetBitmap(imgname)) # Icons for other items for imgname, itemtype in [ ("Extension", ITEM_CONFNODE)]: - self.TreeImageDict[itemtype]=self.TreeImageList.Add(wx.Bitmap(os.path.join(CWD, 'images', '%s.png'%imgname))) + self.TreeImageDict[itemtype] = self.TreeImageList.Add(GetBitmap(imgname)) # Add beremiz's icon in top left corner of the frame - self.SetIcon(wx.Icon(Bpath( "images", "brz.ico"), wx.BITMAP_TYPE_ICO)) + self.SetIcon(wx.Icon(Bpath("images", "brz.ico"), wx.BITMAP_TYPE_ICO)) if ctr is None and projectOpen is None and self.Config.HasEntry("currenteditedproject"): projectOpen = str(self.Config.Read("currenteditedproject")) @@ -444,7 +445,7 @@ self.Controler = self.CTR result = self.CTR.LoadProject(projectOpen, buildpath) if not result: - self.LibraryPanel.SetControler(self.Controler) + self.LibraryPanel.SetController(self.Controler) self.ProjectTree.Enable(True) self.PouInstanceVariablesPanel.SetController(self.Controler) self.RefreshConfigRecentProjects(os.path.abspath(projectOpen)) @@ -456,7 +457,7 @@ self.CTR = ctr self.Controler = ctr if ctr is not None: - self.LibraryPanel.SetControler(self.Controler) + self.LibraryPanel.SetController(self.Controler) self.ProjectTree.Enable(True) self.PouInstanceVariablesPanel.SetController(self.Controler) self._Refresh(PROJECTTREE, POUINSTANCEVARIABLESPANEL, LIBRARYTREE) @@ -561,7 +562,7 @@ ResourceEditor, ConfigurationEditor, DataTypeEditor))): - return ("confnode", tab.Controler.CTNFullName()) + return ("confnode", tab.Controler.CTNFullName(), tab.GetTagName()) elif (isinstance(tab, TextViewer) and (tab.Controler is None or isinstance(tab.Controler, MiniTextControler))): return ("confnode", None, tab.GetInstancePath()) @@ -604,12 +605,14 @@ if self.CTR is not None: selected = self.TabsOpened.GetSelection() if selected >= 0: - graphic_viewer = isinstance(self.TabsOpened.GetPage(selected), Viewer) + window = self.TabsOpened.GetPage(selected) + viewer_is_modified = window.IsModified() + is_viewer = isinstance(window, Viewer) else: - graphic_viewer = False + viewer_is_modified = is_viewer = False if self.TabsOpened.GetPageCount() > 0: self.FileMenu.Enable(wx.ID_CLOSE, True) - if graphic_viewer: + if is_viewer: self.FileMenu.Enable(wx.ID_PREVIEW, True) self.FileMenu.Enable(wx.ID_PRINT, True) MenuToolBar.EnableTool(wx.ID_PRINT, True) @@ -623,7 +626,7 @@ self.FileMenu.Enable(wx.ID_PRINT, False) MenuToolBar.EnableTool(wx.ID_PRINT, False) self.FileMenu.Enable(wx.ID_PAGE_SETUP, True) - project_modified = self.CTR.ProjectTestModified() + project_modified = self.CTR.ProjectTestModified() or viewer_is_modified self.FileMenu.Enable(wx.ID_SAVE, project_modified) MenuToolBar.EnableTool(wx.ID_SAVE, project_modified) self.FileMenu.Enable(wx.ID_SAVEAS, True) @@ -697,7 +700,7 @@ if "method" in confnode_method and confnode_method.get("shown",True): id = wx.NewId() StatusToolBar.AddSimpleTool(id, - wx.Bitmap(Bpath("images", "%s.png"%confnode_method.get("bitmap", "Unknown"))), + GetBitmap(confnode_method.get("bitmap", "Unknown")), confnode_method["tooltip"]) self.Bind(wx.EVT_MENU, self.GetMenuCallBackFunction(confnode_method["method"]), id=id) @@ -721,10 +724,11 @@ if panel != self.LastPanelSelected: for i in xrange(self.EditMenuSize, self.EditMenu.GetMenuItemCount()): item = self.EditMenu.FindItemByPosition(self.EditMenuSize) - if item.IsSeparator(): - self.EditMenu.RemoveItem(item) - else: - self.EditMenu.Delete(item.GetId()) + if item is not None: + if item.IsSeparator(): + self.EditMenu.RemoveItem(item) + else: + self.EditMenu.Delete(item.GetId()) self.LastPanelSelected = panel if panel is not None: items = panel.GetConfNodeMenuItems() @@ -738,7 +742,11 @@ else: for i in xrange(self.EditMenuSize, self.EditMenu.GetMenuItemCount()): item = self.EditMenu.FindItemByPosition(i) - self.EditMenu.Delete(item.GetId()) + if item is not None: + if item.IsSeparator(): + self.EditMenu.RemoveItem(item) + else: + self.EditMenu.Delete(item.GetId()) self.LastPanelSelected = None self.MenuBar.UpdateMenus() @@ -807,7 +815,7 @@ if not result: self.CTR = ctr self.Controler = self.CTR - self.LibraryPanel.SetControler(self.Controler) + self.LibraryPanel.SetController(self.Controler) self.ProjectTree.Enable(True) self.PouInstanceVariablesPanel.SetController(self.Controler) self.RefreshConfigRecentProjects(projectpath) @@ -844,7 +852,7 @@ self.Controler = self.CTR result = self.CTR.LoadProject(projectpath) if not result: - self.LibraryPanel.SetControler(self.Controler) + self.LibraryPanel.SetController(self.Controler) self.ProjectTree.Enable(True) self.PouInstanceVariablesPanel.SetController(self.Controler) self.RefreshConfigRecentProjects(projectpath) @@ -870,13 +878,23 @@ self.RefreshAll() def OnSaveProjectMenu(self, event): + selected = self.TabsOpened.GetSelection() + if selected != -1: + window = self.TabsOpened.GetPage(selected) + window.Save() if self.CTR is not None: self.CTR.SaveProject() + self.RefreshAll() self._Refresh(TITLE, FILEMENU, EDITMENU, PAGETITLES) def OnSaveProjectAsMenu(self, event): + selected = self.TabsOpened.GetSelection() + if selected != -1: + window = self.TabsOpened.GetPage(selected) + window.SaveAs() if self.CTR is not None: self.CTR.SaveProjectAs() + self.RefreshAll() self._Refresh(TITLE, FILEMENU, EDITMENU, PAGETITLES) event.Skip() @@ -933,6 +951,17 @@ else: IDEFrame.OnProjectTreeItemActivated(self, event) + def ProjectTreeItemSelect(self, select_item): + name = self.ProjectTree.GetItemText(select_item) + item_infos = self.ProjectTree.GetPyData(select_item) + if item_infos["type"] == ITEM_CONFNODE: + item_infos["confnode"]._OpenView(onlyopened=True) + elif item_infos["type"] == ITEM_PROJECT: + self.CTR._OpenView(onlyopened=True) + else: + IDEFrame.ProjectTreeItemSelect(self, select_item) + + def SelectProjectTreeItem(self, tagname): if self.ProjectTree is not None: root = self.ProjectTree.GetRootItem() diff -r 7499535588e6 -r f49875b9e946 ConfTreeNodeEditor.py --- a/ConfTreeNodeEditor.py Tue Jun 19 21:59:34 2012 +0200 +++ b/ConfTreeNodeEditor.py Fri Jul 06 21:00:43 2012 +0200 @@ -9,9 +9,9 @@ from PLCOpenEditor import TITLE, FILEMENU, PROJECTTREE, PAGETITLES -from util.misc import opjimg from util.TextCtrlAutoComplete import TextCtrlAutoComplete from util.BrowseValuesLibraryDialog import BrowseValuesLibraryDialog +from utils.BitmapLibrary import GetBitmap if wx.Platform == '__WXMSW__': faces = { 'times': 'Times New Roman', @@ -124,12 +124,8 @@ style = 0, name = "genstatbmp"): - bitmappath = Bpath( "images", bitmapname) - if os.path.isfile(bitmappath): - bitmap = wx.Bitmap(bitmappath) - else: - bitmap = None - wx.lib.statbmp.GenStaticBitmap.__init__(self, parent, ID, bitmap, + wx.lib.statbmp.GenStaticBitmap.__init__(self, parent, ID, + GetBitmap(bitmapname), pos, size, style, name) @@ -151,15 +147,15 @@ def _init_ConfNodeEditor(self, prnt): self.ConfNodeEditor = None - def _init_Editor(self, prnt): - self.Editor = wx.SplitterWindow(id=self.ID, name='EditorSplitter', parent=prnt, - size=wx.Size(0, 0), style=wx.SUNKEN_BORDER|wx.SP_3D) + def _init_Editor(self, parent): + self.Editor = wx.SplitterWindow(parent, + style=wx.SUNKEN_BORDER|wx.SP_3D) self.SetNeedUpdating(True) self.SetMinimumPaneSize(1) if self.SHOW_PARAMS: - self.ParamsEditor = wx.ScrolledWindow(self.Editor, -1, size=wx.Size(-1, -1), - style=wx.TAB_TRAVERSAL|wx.SUNKEN_BORDER|wx.HSCROLL|wx.VSCROLL) + self.ParamsEditor = wx.ScrolledWindow(self.Editor, + style=wx.TAB_TRAVERSAL|wx.SUNKEN_BORDER|wx.HSCROLL|wx.VSCROLL) self.ParamsEditor.SetBackgroundColour(WINDOW_COLOUR) self.ParamsEditor.Bind(wx.EVT_SIZE, self.OnWindowResize) self.ParamsEditor.Bind(wx.EVT_MOUSEWHEEL, self.OnMouseWheel) @@ -175,51 +171,45 @@ self.ParamsEditor.SetSizer(self.ParamsEditorSizer) baseparamseditor_sizer = wx.BoxSizer(wx.HORIZONTAL) - self.ParamsEditorSizer.AddSizer(baseparamseditor_sizer, 0, border=5, - flag=wx.GROW|wx.LEFT|wx.RIGHT|wx.TOP) + self.ParamsEditorSizer.AddSizer(baseparamseditor_sizer, border=5, + flag=wx.GROW|wx.LEFT|wx.RIGHT|wx.TOP) self.FullIECChannel = wx.StaticText(self.ParamsEditor, -1) self.FullIECChannel.SetFont( wx.Font(faces["size"], wx.DEFAULT, wx.NORMAL, wx.BOLD, faceName = faces["helv"])) - baseparamseditor_sizer.AddWindow(self.FullIECChannel, 0, border=0, flag=wx.ALIGN_CENTER_VERTICAL) + baseparamseditor_sizer.AddWindow(self.FullIECChannel, + flag=wx.ALIGN_CENTER_VERTICAL) updownsizer = wx.BoxSizer(wx.VERTICAL) - baseparamseditor_sizer.AddSizer(updownsizer, 0, border=5, - flag=wx.LEFT|wx.ALIGN_CENTER_VERTICAL) - - ieccupbutton_id = wx.NewId() - self.IECCUpButton = wx.lib.buttons.GenBitmapTextButton( - id=ieccupbutton_id, bitmap=wx.Bitmap(opjimg('IECCDown')), - name='IECUpButton', parent=self.ParamsEditor, pos=wx.Point(0, 0), - size=wx.Size(16, 16), style=wx.NO_BORDER) + baseparamseditor_sizer.AddSizer(updownsizer, border=5, + flag=wx.LEFT|wx.ALIGN_CENTER_VERTICAL) + + self.IECCUpButton = wx.lib.buttons.GenBitmapTextButton(self.ParamsEditor, + bitmap=GetBitmap('IECCDown'), size=wx.Size(16, 16), style=wx.NO_BORDER) self.IECCUpButton.Bind(wx.EVT_BUTTON, self.GetItemChannelChangedFunction(1), - id=ieccupbutton_id) - updownsizer.AddWindow(self.IECCUpButton, 0, border=0, flag=wx.ALIGN_LEFT) - - ieccdownbutton_id = wx.NewId() - self.IECCDownButton = wx.lib.buttons.GenBitmapButton( - id=ieccdownbutton_id, bitmap=wx.Bitmap(opjimg('IECCUp')), - name='IECDownButton', parent=self.ParamsEditor, pos=wx.Point(0, 0), - size=wx.Size(16, 16), style=wx.NO_BORDER) + self.IECCUpButton) + updownsizer.AddWindow(self.IECCUpButton, flag=wx.ALIGN_LEFT) + + self.IECCDownButton = wx.lib.buttons.GenBitmapButton(self.ParamsEditor, + bitmap=GetBitmap('IECCUp'), size=wx.Size(16, 16), style=wx.NO_BORDER) self.IECCDownButton.Bind(wx.EVT_BUTTON, self.GetItemChannelChangedFunction(-1), - id=ieccdownbutton_id) - updownsizer.AddWindow(self.IECCDownButton, 0, border=0, flag=wx.ALIGN_LEFT) - - confnodename_id = wx.NewId() - self.ConfNodeName = wx.TextCtrl( - self.ParamsEditor, confnodename_id, + self.IECCDownButton) + updownsizer.AddWindow(self.IECCDownButton, flag=wx.ALIGN_LEFT) + + self.ConfNodeName = wx.TextCtrl(self.ParamsEditor, size=wx.Size(150, 25), style=wx.NO_BORDER) self.ConfNodeName.SetFont( wx.Font(faces["size"] * 0.75, wx.DEFAULT, wx.NORMAL, wx.BOLD, faceName = faces["helv"])) self.ConfNodeName.Bind(wx.EVT_TEXT, - self.GetTextCtrlCallBackFunction(self.ConfNodeName, "BaseParams.Name", True), - id=confnodename_id) - baseparamseditor_sizer.AddWindow(self.ConfNodeName, 0, border=5, flag=wx.LEFT|wx.RIGHT|wx.ALIGN_CENTER_VERTICAL) + self.GetTextCtrlCallBackFunction(self.ConfNodeName, "BaseParams.Name", True), + self.ConfNodeName) + baseparamseditor_sizer.AddWindow(self.ConfNodeName, border=5, + flag=wx.LEFT|wx.RIGHT|wx.ALIGN_CENTER_VERTICAL) buttons_sizer = self.GenerateMethodButtonSizer() - baseparamseditor_sizer.AddSizer(buttons_sizer, 0, border=0, flag=wx.ALIGN_CENTER) + baseparamseditor_sizer.AddSizer(buttons_sizer, flag=wx.ALIGN_CENTER) else: self.ParamsEditorSizer = wx.FlexGridSizer(cols=1, hgap=0, rows=1, vgap=5) @@ -227,8 +217,8 @@ self.ParamsEditorSizer.AddGrowableRow(0) self.ConfNodeParamsSizer = wx.BoxSizer(wx.VERTICAL) - self.ParamsEditorSizer.AddSizer(self.ConfNodeParamsSizer, 0, border=5, - flag=wx.LEFT|wx.RIGHT|wx.BOTTOM) + self.ParamsEditorSizer.AddSizer(self.ConfNodeParamsSizer, border=5, + flag=wx.LEFT|wx.RIGHT|wx.BOTTOM) self.RefreshConfNodeParamsSizer() else: @@ -250,11 +240,12 @@ def __init__(self, parent, controler, window, tagname=""): EditorPanel.__init__(self, parent, tagname, window, controler) - icon_path = self.Controler.GetIconPath() - if icon_path is None: - icon_path = opjimg("Extension") - self.SetIcon(wx.Bitmap(icon_path, wx.BITMAP_TYPE_PNG)) - + icon_name = self.Controler.GetIconName() + if icon_name is not None: + self.SetIcon(GetBitmap(icon_name)) + else: + self.SetIcon(GetBitmap("Extension")) + def __del__(self): self.Controler.OnCloseEditor(self) @@ -313,20 +304,15 @@ for confnode_method in self.Controler.ConfNodeMethods: if "method" in confnode_method and confnode_method.get("shown",True): - id = wx.NewId() - label = confnode_method["name"] - bitmap_path = confnode_method.get("bitmap", "Unknown") - if os.path.splitext(bitmap_path)[1] == "": - bitmap_path = Bpath("images", "%s.png" % bitmap_path) - button = GenBitmapTextButton(id=id, parent=self.ParamsEditor, - bitmap=wx.Bitmap(bitmap_path), label=label, - name=label, pos=wx.DefaultPosition, style=wx.NO_BORDER) + button = GenBitmapTextButton(self.ParamsEditor, + bitmap=GetBitmap(confnode_method.get("bitmap", "Unknown")), + label=confnode_method["name"], style=wx.NO_BORDER) button.SetFont(normal_bt_font) button.SetToolTipString(confnode_method["tooltip"]) if confnode_method.get("push", False): button.Bind(wx.EVT_LEFT_DOWN, self.GetButtonCallBackFunction(confnode_method["method"], True)) else: - button.Bind(wx.EVT_BUTTON, self.GetButtonCallBackFunction(confnode_method["method"]), id=id) + button.Bind(wx.EVT_BUTTON, self.GetButtonCallBackFunction(confnode_method["method"]), button) # a fancy underline on mouseover def setFontStyle(b, s): def fn(event): @@ -339,7 +325,7 @@ #hack to force size to mini if not confnode_method.get("enabled",True): button.Disable() - msizer.AddWindow(button, 0, border=0, flag=wx.ALIGN_CENTER) + msizer.AddWindow(button, flag=wx.ALIGN_CENTER) return msizer def GenerateSizerElements(self, sizer, elements, path, clean = True): @@ -353,57 +339,64 @@ element_path = element_infos["name"] if element_infos["type"] == "element": label = element_infos["name"] - staticbox = wx.StaticBox(id=-1, label=_(label), - name='%s_staticbox'%element_infos["name"], parent=self.ParamsEditor, - pos=wx.Point(0, 0), size=wx.Size(10, 0), style=0) + staticbox = wx.StaticBox(self.ParamsEditor, + label=_(label), size=wx.Size(10, 0)) staticboxsizer = wx.StaticBoxSizer(staticbox, wx.VERTICAL) if first: - sizer.AddSizer(staticboxsizer, 0, border=5, flag=wx.GROW|wx.TOP|wx.BOTTOM) + sizer.AddSizer(staticboxsizer, border=5, + flag=wx.GROW|wx.TOP|wx.BOTTOM) else: - sizer.AddSizer(staticboxsizer, 0, border=5, flag=wx.GROW|wx.BOTTOM) - self.GenerateSizerElements(staticboxsizer, element_infos["children"], element_path) + sizer.AddSizer(staticboxsizer, border=5, + flag=wx.GROW|wx.BOTTOM) + self.GenerateSizerElements(staticboxsizer, + element_infos["children"], + element_path) else: boxsizer = wx.FlexGridSizer(cols=3, rows=1) boxsizer.AddGrowableCol(1) if first: - sizer.AddSizer(boxsizer, 0, border=5, flag=wx.GROW|wx.ALL) + sizer.AddSizer(boxsizer, border=5, + flag=wx.GROW|wx.ALL) else: - sizer.AddSizer(boxsizer, 0, border=5, flag=wx.GROW|wx.LEFT|wx.RIGHT|wx.BOTTOM) - staticbitmap = GenStaticBitmap(ID=-1, bitmapname="%s.png"%element_infos["name"], + sizer.AddSizer(boxsizer, border=5, + flag=wx.GROW|wx.LEFT|wx.RIGHT|wx.BOTTOM) + + staticbitmap = GenStaticBitmap(ID=-1, bitmapname=element_infos["name"], name="%s_bitmap"%element_infos["name"], parent=self.ParamsEditor, pos=wx.Point(0, 0), size=wx.Size(24, 24), style=0) - boxsizer.AddWindow(staticbitmap, 0, border=5, flag=wx.RIGHT) - label = element_infos["name"] - statictext = wx.StaticText(id=-1, label="%s:"%_(label), - name="%s_label"%element_infos["name"], parent=self.ParamsEditor, - pos=wx.Point(0, 0), size=wx.DefaultSize, style=0) - boxsizer.AddWindow(statictext, 0, border=5, flag=wx.ALIGN_CENTER_VERTICAL|wx.RIGHT) - id = wx.NewId() + boxsizer.AddWindow(staticbitmap, border=5, flag=wx.RIGHT) + + statictext = wx.StaticText(self.ParamsEditor, + label="%s:"%_(element_infos["name"])) + boxsizer.AddWindow(statictext, border=5, + flag=wx.ALIGN_CENTER_VERTICAL|wx.RIGHT) + if isinstance(element_infos["type"], types.ListType): if isinstance(element_infos["value"], types.TupleType): browse_boxsizer = wx.BoxSizer(wx.HORIZONTAL) - boxsizer.AddSizer(browse_boxsizer, 0, border=0, flag=0) + boxsizer.AddSizer(browse_boxsizer) - textctrl = wx.TextCtrl(id=id, name=element_infos["name"], parent=self.ParamsEditor, - pos=wx.Point(0, 0), size=wx.Size(275, 25), style=wx.TE_READONLY) + textctrl = wx.TextCtrl(self.ParamsEditor, + size=wx.Size(275, 25), style=wx.TE_READONLY) if element_infos["value"] is not None: textctrl.SetValue(element_infos["value"][0]) value_infos = element_infos["value"][1] else: value_infos = None - browse_boxsizer.AddWindow(textctrl, 0, border=0, flag=0) - button_id = wx.NewId() - button = wx.Button(id=button_id, name="browse_%s" % element_infos["name"], parent=self.ParamsEditor, - label="...", pos=wx.Point(0, 0), size=wx.Size(25, 25)) - browse_boxsizer.AddWindow(button, 0, border=0, flag=0) + browse_boxsizer.AddWindow(textctrl) + + button = wx.Button(self.ParamsEditor, + label="...", size=wx.Size(25, 25)) + browse_boxsizer.AddWindow(button) button.Bind(wx.EVT_BUTTON, self.GetBrowseCallBackFunction(element_infos["name"], textctrl, element_infos["type"], value_infos, element_path), - id=button_id) + button) else: - combobox = wx.ComboBox(id=id, name=element_infos["name"], parent=self.ParamsEditor, - pos=wx.Point(0, 0), size=wx.Size(300, 28), style=wx.CB_READONLY) - boxsizer.AddWindow(combobox, 0, border=0, flag=0) + combobox = wx.ComboBox(self.ParamsEditor, + size=wx.Size(300, 28), style=wx.CB_READONLY) + boxsizer.AddWindow(combobox) + if element_infos["use"] == "optional": combobox.Append("") if len(element_infos["type"]) > 0 and isinstance(element_infos["type"][0], types.TupleType): @@ -411,11 +404,11 @@ combobox.Append(choice) name = element_infos["name"] value = element_infos["value"] - staticbox = wx.StaticBox(id=-1, label="%s - %s"%(_(name), _(value)), - name='%s_staticbox'%element_infos["name"], parent=self.ParamsEditor, - pos=wx.Point(0, 0), size=wx.Size(10, 0), style=0) + + staticbox = wx.StaticBox(self.ParamsEditor, + label="%s - %s"%(_(name), _(value)), size=wx.Size(10, 0)) staticboxsizer = wx.StaticBoxSizer(staticbox, wx.VERTICAL) - sizer.AddSizer(staticboxsizer, 0, border=5, flag=wx.GROW|wx.BOTTOM) + sizer.AddSizer(staticboxsizer, border=5, flag=wx.GROW|wx.BOTTOM) self.GenerateSizerElements(staticboxsizer, element_infos["children"], element_path) callback = self.GetChoiceContentCallBackFunction(combobox, staticboxsizer, element_path) else: @@ -426,7 +419,8 @@ combobox.SetStringSelection("") else: combobox.SetStringSelection(element_infos["value"]) - combobox.Bind(wx.EVT_COMBOBOX, callback, id=id) + combobox.Bind(wx.EVT_COMBOBOX, callback, combobox) + elif isinstance(element_infos["type"], types.DictType): scmin = -(2**31) scmax = 2**31-1 @@ -434,47 +428,52 @@ scmin = element_infos["type"]["min"] if "max" in element_infos["type"]: scmax = element_infos["type"]["max"] - spinctrl = wx.SpinCtrl(id=id, name=element_infos["name"], parent=self.ParamsEditor, - pos=wx.Point(0, 0), size=wx.Size(300, 25), style=wx.SP_ARROW_KEYS|wx.ALIGN_RIGHT) - spinctrl.SetRange(scmin,scmax) - boxsizer.AddWindow(spinctrl, 0, border=0, flag=0) + spinctrl = wx.SpinCtrl(self.ParamsEditor, + size=wx.Size(300, 25), style=wx.SP_ARROW_KEYS|wx.ALIGN_RIGHT) + spinctrl.SetRange(scmin, scmax) + boxsizer.AddWindow(spinctrl) if element_infos["value"] is not None: spinctrl.SetValue(element_infos["value"]) - spinctrl.Bind(wx.EVT_SPINCTRL, self.GetTextCtrlCallBackFunction(spinctrl, element_path), id=id) + spinctrl.Bind(wx.EVT_SPINCTRL, + self.GetTextCtrlCallBackFunction(spinctrl, element_path), + spinctrl) + else: if element_infos["type"] == "boolean": - checkbox = wx.CheckBox(id=id, name=element_infos["name"], parent=self.ParamsEditor, - pos=wx.Point(0, 0), size=wx.Size(17, 25), style=0) - boxsizer.AddWindow(checkbox, 0, border=0, flag=0) + checkbox = wx.CheckBox(self.ParamsEditor, size=wx.Size(17, 25)) + boxsizer.AddWindow(checkbox) if element_infos["value"] is not None: checkbox.SetValue(element_infos["value"]) - checkbox.Bind(wx.EVT_CHECKBOX, self.GetCheckBoxCallBackFunction(checkbox, element_path), id=id) + checkbox.Bind(wx.EVT_CHECKBOX, + self.GetCheckBoxCallBackFunction(checkbox, element_path), + checkbox) + elif element_infos["type"] in ["unsignedLong", "long","integer"]: if element_infos["type"].startswith("unsigned"): scmin = 0 else: scmin = -(2**31) scmax = 2**31-1 - spinctrl = wx.SpinCtrl(id=id, name=element_infos["name"], parent=self.ParamsEditor, - pos=wx.Point(0, 0), size=wx.Size(300, 25), style=wx.SP_ARROW_KEYS|wx.ALIGN_RIGHT) + spinctrl = wx.SpinCtrl(self.ParamsEditor, + size=wx.Size(300, 25), style=wx.SP_ARROW_KEYS|wx.ALIGN_RIGHT) spinctrl.SetRange(scmin, scmax) - boxsizer.AddWindow(spinctrl, 0, border=0, flag=0) + boxsizer.AddWindow(spinctrl) if element_infos["value"] is not None: spinctrl.SetValue(element_infos["value"]) - spinctrl.Bind(wx.EVT_SPINCTRL, self.GetTextCtrlCallBackFunction(spinctrl, element_path), id=id) + spinctrl.Bind(wx.EVT_SPINCTRL, + self.GetTextCtrlCallBackFunction(spinctrl, element_path), + spinctrl) + else: choices = self.ParentWindow.GetConfigEntry(element_path, [""]) - textctrl = TextCtrlAutoComplete(id=id, - name=element_infos["name"], - parent=self.ParamsEditor, - appframe=self, - choices=choices, - element_path=element_path, - pos=wx.Point(0, 0), - size=wx.Size(300, 25), - style=0) + textctrl = TextCtrlAutoComplete(name=element_infos["name"], + parent=self.ParamsEditor, + appframe=self, + choices=choices, + element_path=element_path, + size=wx.Size(300, 25)) - boxsizer.AddWindow(textctrl, 0, border=0, flag=0) + boxsizer.AddWindow(textctrl) if element_infos["value"] is not None: textctrl.ChangeValue(str(element_infos["value"])) textctrl.Bind(wx.EVT_TEXT, self.GetTextCtrlCallBackFunction(textctrl, element_path)) diff -r 7499535588e6 -r f49875b9e946 ConfigTreeNode.py --- a/ConfigTreeNode.py Tue Jun 19 21:59:34 2012 +0200 +++ b/ConfigTreeNode.py Fri Jul 06 21:00:43 2012 +0200 @@ -91,7 +91,7 @@ return parent + "." + self.CTNName() return self.BaseParams.getName() - def GetIconPath(self): + def GetIconName(self): return None def CTNTestModified(self): @@ -405,15 +405,18 @@ self.BaseParams.setIEC_Channel(res) return res - def _OpenView(self, name=None): + def _OpenView(self, name=None, onlyopened=False): if self.EditorType is not None: - if self._View is None: - app_frame = self.GetCTRoot().AppFrame + app_frame = self.GetCTRoot().AppFrame + if self._View is None and not onlyopened: self._View = self.EditorType(app_frame.TabsOpened, self, app_frame) - - app_frame.EditProjectElement(self._View, self.CTNName()) - + + if self._View is not None: + if name is None: + name = self.CTNFullName() + app_frame.EditProjectElement(self._View, name) + return self._View return None @@ -428,7 +431,7 @@ def OnCTNClose(self): if self._View is not None: - self._CloseView(self.View) + self._CloseView(self._View) self._View = None return True diff -r 7499535588e6 -r f49875b9e946 ProjectController.py --- a/ProjectController.py Tue Jun 19 21:59:34 2012 +0200 +++ b/ProjectController.py Fri Jul 06 21:00:43 2012 +0200 @@ -14,17 +14,18 @@ import targets import connectors -from util.misc import opjimg, CheckPathPerm, GetClassImporter +from util.misc import CheckPathPerm, GetClassImporter from util.MiniTextControler import MiniTextControler from util.ProcessLogger import ProcessLogger +from util.FileManagementPanel import FileManagementPanel from PLCControler import PLCControler -from PLCOpenEditor import CWD from TextViewer import TextViewer from plcopen.structures import IEC_KEYWORDS from targets.typemapping import DebugTypesSize from util.discovery import DiscoveryDialog from ConfigTreeNode import ConfigTreeNode from ProjectNodeEditor import ProjectNodeEditor +from utils.BitmapLibrary import GetBitmap base_folder = os.path.split(sys.path[0])[0] @@ -182,8 +183,8 @@ def GetProjectName(self): return os.path.split(self.ProjectPath)[1] - def GetIconPath(self): - return os.path.join(CWD, "Images", "PROJECT.png") + def GetIconName(self): + return "PROJECT" def GetDefaultTargetName(self): if wx.Platform == '__WXMSW__': @@ -315,7 +316,7 @@ CTNChild.CTNName()), "type": ITEM_CONFNODE, "confnode": CTNChild, - "icon": CTNChild.GetIconPath(), + "icon": CTNChild.GetIconName(), "values": self.RecursiveConfNodeInfos(CTNChild)}) return values @@ -933,14 +934,22 @@ _IECRawCodeView = None def _editIECrawcode(self): self._OpenView("IEC raw code") - - def _OpenView(self, name=None): + + _ProjectFilesView = None + def _OpenProjectFiles(self): + self._OpenView("Project files") + + _FileEditors = {} + def _OpenFileEditor(self, filepath): + self._OpenView(filepath) + + def _OpenView(self, name=None, onlyopened=False): if name == "IEC code": - if self._IEC_code_viewer is None: + if self._IECCodeView is None: plc_file = self._getIECcodepath() self._IECCodeView = TextViewer(self.AppFrame.TabsOpened, "", None, None, instancepath=name) - #self._IECCodeViewr.Enable(False) + #self._IECCodeView.Enable(False) self._IECCodeView.SetTextSyntax("ALL") self._IECCodeView.SetKeywords(IEC_KEYWORDS) try: @@ -948,29 +957,75 @@ except: text = '(* No IEC code have been generated at that time ! *)' self._IECCodeView.SetText(text = text) - self._IECCodeView.SetIcon(self.AppFrame.GenerateBitmap("ST")) - + self._IECCodeView.SetIcon(GetBitmap("ST")) + + if self._IECCodeView is not None: self.AppFrame.EditProjectElement(self._IECCodeView, name) - + return self._IECCodeView elif name == "IEC raw code": - if self.IEC_raw_code_viewer is None: + if self._IECRawCodeView is None: controler = MiniTextControler(self._getIECrawcodepath()) - self.IEC_raw_code_viewer = TextViewer(self.AppFrame.TabsOpened, "", None, controler, instancepath=name) - #self.IEC_raw_code_viewer.Enable(False) - self.IEC_raw_code_viewer.SetTextSyntax("ALL") - self.IEC_raw_code_viewer.SetKeywords(IEC_KEYWORDS) - self.IEC_raw_code_viewer.RefreshView() - self.IEC_raw_code_viewer.SetIcon(self.AppFrame.GenerateBitmap("ST")) + self._IECRawCodeView = TextViewer(self.AppFrame.TabsOpened, "", None, controler, instancepath=name) + #self._IECRawCodeView.Enable(False) + self._IECRawCodeView.SetTextSyntax("ALL") + self._IECRawCodeView.SetKeywords(IEC_KEYWORDS) + self._IECRawCodeView.RefreshView() + self._IECRawCodeView.SetIcon(GetBitmap("ST")) + + if self._IECRawCodeView is not None: + self.AppFrame.EditProjectElement(self._IECRawCodeView, name) + + return self._IECRawCodeView + + elif name == "Project files": + if self._ProjectFilesView is None: + self._ProjectFilesView = FileManagementPanel(self.AppFrame.TabsOpened, self, name, self._getProjectFilesPath(), True) + + extensions = [] + for extension, name, editor in features.file_editors: + if extension not in extensions: + extensions.append(extension) + self._ProjectFilesView.SetEditableFileExtensions(extensions) + + if self._ProjectFilesView is not None: + self.AppFrame.EditProjectElement(self._ProjectFilesView, name) + + return self._ProjectFilesView + + elif name is not None and os.path.isfile(name): + if not self._FileEditors.has_key(name): + file_extension = os.path.splitext(name)[1] + + editors = dict([(editor_name, editor) + for extension, editor_name, editor in features.file_editors + if extension == file_extension]) + + editor_name = None + if len(editors) == 1: + editor_name = editors.keys()[0] + elif len(editors) > 0: + names = editors.keys() + dialog = wx.SingleChoiceDialog(self.ParentWindow, + _("Select an editor:"), _("Editor selection"), + names, wx.OK|wx.CANCEL) + if dialog.ShowModal() == wx.ID_OK: + editor_name = names[dialog.GetSelection()] + dialog.Destroy() + + if editor_name is not None: + editor = editors[editor_name]() + self._FileEditors[name] = editor(self.AppFrame.TabsOpened, self, name, self.AppFrame) + self._FileEditors[name].SetIcon(GetBitmap("FILE")) - self.AppFrame.EditProjectElement(self.IEC_raw_code_viewer, name) - - return self.IEC_raw_code_viewer - + if self._FileEditors.has_key(name): + self.AppFrame.EditProjectElement(self._FileEditors[name], name) + + return self._FileEditors[name] else: - return ConfigTreeNode._OpenView(self, name) + return ConfigTreeNode._OpenView(self, self.CTNName(), onlyopened) def OnCloseEditor(self, view): ConfigTreeNode.OnCloseEditor(self, view) @@ -978,6 +1033,10 @@ self._IECCodeView = None if self._IECRawCodeView == view: self._IECRawCodeView = None + if self._ProjectFilesView == view: + self._ProjectFilesView = None + if view in self._FileEditors.values(): + self._FileEditors.pop(view.GetTagName()) def _Clean(self): self._CloseView(self._IECCodeView) @@ -1415,16 +1474,6 @@ wx.CallAfter(self.UpdateMethodsFromPLCStatus) - def _ImportProjectFile(self): - dialog = wx.FileDialog(self.AppFrame, _("Choose a file"), os.getcwd(), "", _("All files|*.*"), wx.OPEN) - if dialog.ShowModal() == wx.ID_OK: - filepath = dialog.GetPath() - if os.path.isfile(filepath): - shutil.copy(filepath, self._getProjectFilesPath()) - else: - self.logger.write_error(_("No such file: %s\n") % filepath) - dialog.Destroy() - StatusMethods = [ {"bitmap" : "Build", "name" : _("Build"), @@ -1471,10 +1520,10 @@ "name" : _("Raw IEC code"), "tooltip" : _("Edit raw IEC code added to code generated by PLCGenerator"), "method" : "_editIECrawcode"}, - {"bitmap" : "ImportFile", - "name" : _("Import file"), - "tooltip" : _("Import into project a file to be transfered with PLC"), - "method" : "_ImportProjectFile"}, + {"bitmap" : "ManageFolder", + "name" : _("Project Files"), + "tooltip" : _("Open a file explorer to manage project files"), + "method" : "_OpenProjectFiles"}, ] diff -r 7499535588e6 -r f49875b9e946 c_ext/CFileEditor.py --- a/c_ext/CFileEditor.py Tue Jun 19 21:59:34 2012 +0200 +++ b/c_ext/CFileEditor.py Fri Jul 06 21:00:43 2012 +0200 @@ -4,10 +4,10 @@ import wx.grid import wx.stc as stc import wx.lib.buttons -from util.misc import opjimg from controls import CustomGrid, CustomTable from ConfTreeNodeEditor import ConfTreeNodeEditor +from utils.BitmapLibrary import GetBitmap if wx.Platform == '__WXMSW__': faces = { 'times': 'Times New Roman', @@ -790,10 +790,10 @@ for idx, (name, panel_class) in enumerate(CFILE_PARTS): button_id = wx.NewId() button = FoldPanelCaption(id=button_id, name='FoldPanelCaption_%s' % name, - label=name, bitmap=wx.Bitmap(opjimg("CollapsedIconData")), + label=name, bitmap=GetBitmap("CollapsedIconData"), parent=self.ConfNodeEditor, pos=wx.Point(0, 0), size=wx.Size(0, 20), style=wx.NO_BORDER|wx.ALIGN_LEFT) - button.SetBitmapSelected(wx.Bitmap(opjimg("ExpandedIconData"))) + button.SetBitmapSelected(GetBitmap("ExpandedIconData")) button.Bind(wx.EVT_BUTTON, self.GenPanelButtonCallback(name), id=button_id) self.MainSizer.AddWindow(button, 0, border=0, flag=wx.TOP|wx.GROW) diff -r 7499535588e6 -r f49875b9e946 c_ext/c_ext.py --- a/c_ext/c_ext.py Tue Jun 19 21:59:34 2012 +0200 +++ b/c_ext/c_ext.py Fri Jul 06 21:00:43 2012 +0200 @@ -4,7 +4,6 @@ from xmlclass import * -from util.misc import opjimg from CFileEditor import CFileEditor from PLCControler import UndoBuffer, LOCATION_CONFNODE, LOCATION_VAR_INPUT, LOCATION_VAR_OUTPUT @@ -44,8 +43,8 @@ self.CreateCFileBuffer(False) self.OnCTNSave() - def GetIconPath(self): - return opjimg("Cfile") + def GetIconName(self): + return "Cfile" def CFileName(self): return os.path.join(self.CTNPath(), "cfile.xml") diff -r 7499535588e6 -r f49875b9e946 canfestival/canfestival.py --- a/canfestival/canfestival.py Tue Jun 19 21:59:34 2012 +0200 +++ b/canfestival/canfestival.py Fri Jul 06 21:00:43 2012 +0200 @@ -108,8 +108,8 @@ def GetCanDevice(self): return self.CanFestivalSlaveNode.getCan_Device() - def _OpenView(self): - ConfigTreeNode._OpenView(self) + def _OpenView(self, name=None, onlyopened=False): + ConfigTreeNode._OpenView(self, name, onlyopened) if self._View is not None: self._View.SetBusId(self.GetCurrentLocation()) return self._View @@ -197,7 +197,7 @@ self.Parent = parent self.Fullname = fullname - def GetIconPath(self): + def GetIconName(self): return None def OnCloseEditor(self, view): @@ -255,8 +255,9 @@ def _ShowGeneratedMaster(self): self._OpenView("Generated master") - def _OpenView(self, name=None): + def _OpenView(self, name=None, onlyopened=False): if name == "Generated master": + app_frame = self.GetCTRoot().AppFrame if self._GeneratedMasterView is None: buildpath = self._getBuildPath() # Eventually create build dir @@ -269,16 +270,15 @@ self.GetCTRoot().logger.write_error(_("Error: No Master generated\n")) return - app_frame = self.GetCTRoot().AppFrame - manager = MiniNodeManager(self, masterpath, self.CTNFullName() + ".generated_master") self._GeneratedMasterView = MasterViewer(app_frame.TabsOpened, manager, app_frame) - app_frame.EditProjectElement(self._GeneratedMasterView, name) + if self._GeneratedMasterView is not None: + app_frame.EditProjectElement(self._IECCodeView, name) return self._GeneratedMasterView else: - ConfigTreeNode._OpenView(self) + ConfigTreeNode._OpenView(self, name, onlyopened) if self._View is not None: self._View.SetBusId(self.GetCurrentLocation()) return self._View diff -r 7499535588e6 -r f49875b9e946 features.py --- a/features.py Tue Jun 19 21:59:34 2012 +0200 +++ b/features.py Fri Jul 06 21:00:43 2012 +0200 @@ -1,5 +1,6 @@ -libraries = [('Python','py_ext.PythonLibrary'), - ('SVGUI','svgui.SVGUILibrary')] +libraries = [ + ('Python', 'py_ext.PythonLibrary'), + ('SVGUI', 'svgui.SVGUILibrary')] catalog = [ ('canfestival', _('CANopen support'), _('Map located variables over CANopen'), 'canfestival.canfestival.RootClass'), @@ -8,3 +9,4 @@ ('wxglade_hmi', _('WxGlade GUI'), _('Add a simple WxGlade based GUI.'), 'wxglade_hmi.WxGladeHMI'), ('svgui', _('SVGUI'), _('Experimental web based HMI'), 'svgui.SVGUI')] +file_editors = [] diff -r 7499535588e6 -r f49875b9e946 images/FILE.png Binary file images/FILE.png has changed diff -r 7499535588e6 -r f49875b9e946 images/FOLDER.png Binary file images/FOLDER.png has changed diff -r 7499535588e6 -r f49875b9e946 images/LeftCopy.png Binary file images/LeftCopy.png has changed diff -r 7499535588e6 -r f49875b9e946 images/ManageFolder.png Binary file images/ManageFolder.png has changed diff -r 7499535588e6 -r f49875b9e946 images/RightCopy.png Binary file images/RightCopy.png has changed diff -r 7499535588e6 -r f49875b9e946 images/icons.svg --- a/images/icons.svg Tue Jun 19 21:59:34 2012 +0200 +++ b/images/icons.svg Fri Jul 06 21:00:43 2012 +0200 @@ -43,9 +43,9 @@ pagecolor="#ffffff" id="base" showgrid="false" - inkscape:zoom="2.5600001" - inkscape:cx="643.14253" - inkscape:cy="778.71873" + inkscape:zoom="28.963095" + inkscape:cx="519.38634" + inkscape:cy="721.386" inkscape:window-x="0" inkscape:window-y="24" inkscape:current-layer="svg2" @@ -85902,6 +85902,2133 @@ y1="198.01724" x2="131.52188" y2="41.586746" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + %% Build Clean editPLC HMIEditor ImportFile ImportDEF ImportSVG NetworkEdit ShowMaster ExportSlave Run ShowIECcode Stop Unknown %% + sodipodi:role="line">%% Build Clean editPLC HMIEditor ImportFile ManageFolder ImportDEF ImportSVG NetworkEdit ShowMaster ExportSlave Run ShowIECcode Stop Unknown %% @@ -86290,7 +88417,7 @@ inkscape:connector-curvature="0" /> @@ -86567,7 +88694,7 @@ + transform="translate(1922.9892,-430.1329)"> ST @@ -86777,7 +88904,7 @@ id="g1161" transform="matrix(0.5724346,-0.3079575,0.3079575,0.5724346,131.42904,887.47867)" /> %% Add Delete Disabled Enabled HideVars IECCDown IECCUp Maximize Minimize minus plus ShowVars %% + sodipodi:role="line">%% Add Delete Disabled Enabled HideVars IECCDown IECCUp Maximize Minimize minus plus ShowVars LeftCopy RightCopy%% @@ -89490,7 +91617,7 @@ + transform="translate(1727.0897,-400.03854)"> %% Extension Cfile Pyfile wxGlade SVGUI %% + sodipodi:role="line">%% Extension Cfile Pyfile wxGlade SVGUI FOLDER FILE %% + transform="translate(1807.0897,-400.03854)"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Tree icons + %% tree_drive tree_folder tree_file %% + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 7499535588e6 -r f49875b9e946 images/tree_drive.png Binary file images/tree_drive.png has changed diff -r 7499535588e6 -r f49875b9e946 images/tree_file.png Binary file images/tree_file.png has changed diff -r 7499535588e6 -r f49875b9e946 images/tree_folder.png Binary file images/tree_folder.png has changed diff -r 7499535588e6 -r f49875b9e946 py_ext/py_ext.py --- a/py_ext/py_ext.py Tue Jun 19 21:59:34 2012 +0200 +++ b/py_ext/py_ext.py Fri Jul 06 21:00:43 2012 +0200 @@ -1,7 +1,6 @@ import os from POULibrary import POULibrary from PythonFileCTNMixin import PythonFileCTNMixin -from util.misc import opjimg class PythonLibrary(POULibrary): def GetLibraryPath(self): @@ -31,8 +30,8 @@ class PythonFile(PythonFileCTNMixin): - def GetIconPath(self): - return opjimg("Pyfile") + def GetIconName(self): + return "Pyfile" def CTNGenerate_C(self, buildpath, locations): current_location = self.GetCurrentLocation() diff -r 7499535588e6 -r f49875b9e946 util/FileManagementPanel.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/util/FileManagementPanel.py Fri Jul 06 21:00:43 2012 +0200 @@ -0,0 +1,420 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- + +#This file is part of Beremiz, a Integrated Development Environment for +#programming IEC 61131-3 automates supporting plcopen standard and CanFestival. +# +#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD +# +#See COPYING file for copyrights details. +# +#This library is free software; you can redistribute it and/or +#modify it under the terms of the GNU General Public +#License as published by the Free Software Foundation; either +#version 2.1 of the License, or (at your option) any later version. +# +#This library is distributed in the hope that it will be useful, +#but WITHOUT ANY WARRANTY; without even the implied warranty of +#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +#General Public License for more details. +# +#You should have received a copy of the GNU General Public +#License along with this library; if not, write to the Free Software +#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +import os +import shutil + +import wx + +from controls import EditorPanel +from utils.BitmapLibrary import GetBitmap + +DRIVE, FOLDER, FILE = range(3) + +FILTER = _("All files (*.*)|*.*|CSV files (*.csv)|*.csv") + +def sort_folder(x, y): + if x[1] == y[1]: + return cmp(x[0], y[0]) + elif x[1] != FILE: + return -1 + else: + return 1 + +def splitpath(path): + head, tail = os.path.split(path) + if head == "": + return [tail] + elif tail == "": + return splitpath(head) + return splitpath(head) + [tail] + +class FolderTree(wx.Panel): + + def __init__(self, parent, folder, filter, editable=True): + wx.Panel.__init__(self, parent, style=wx.TAB_TRAVERSAL) + + main_sizer = wx.BoxSizer(wx.VERTICAL) + + self.Tree = wx.TreeCtrl(self, + style=wx.TR_HAS_BUTTONS| + wx.TR_SINGLE| + wx.SUNKEN_BORDER| + wx.TR_HIDE_ROOT| + wx.TR_LINES_AT_ROOT| + wx.TR_EDIT_LABELS) + if wx.Platform == '__WXMSW__': + self.Bind(wx.EVT_TREE_ITEM_ACTIVATED, self.OnTreeItemExpanded, self.Tree) + self.Tree.Bind(wx.EVT_LEFT_DOWN, self.OnTreeLeftDown) + else: + self.Bind(wx.EVT_TREE_ITEM_EXPANDED, self.OnTreeItemExpanded, self.Tree) + self.Bind(wx.EVT_TREE_ITEM_COLLAPSED, self.OnTreeItemCollapsed, self.Tree) + self.Bind(wx.EVT_TREE_BEGIN_LABEL_EDIT, self.OnTreeBeginLabelEdit, self.Tree) + self.Bind(wx.EVT_TREE_END_LABEL_EDIT, self.OnTreeEndLabelEdit, self.Tree) + main_sizer.AddWindow(self.Tree, 1, flag=wx.GROW) + + self.Filter = wx.ComboBox(self, style=wx.CB_READONLY) + self.Bind(wx.EVT_COMBOBOX, self.OnFilterChanged, self.Filter) + main_sizer.AddWindow(self.Filter, flag=wx.GROW) + + self.SetSizer(main_sizer) + + self.Folder = folder + self.Editable = editable + + self.TreeImageList = wx.ImageList(16, 16) + self.TreeImageDict = {} + for item_type, bitmap in [(DRIVE, "tree_drive"), + (FOLDER, "tree_folder"), + (FILE, "tree_file")]: + self.TreeImageDict[item_type] = self.TreeImageList.Add(GetBitmap(bitmap)) + self.Tree.SetImageList(self.TreeImageList) + + self.Filters = {} + filter_parts = filter.split("|") + for idx in xrange(0, len(filter_parts), 2): + if filter_parts[idx + 1] == "*.*": + self.Filters[filter_parts[idx]] = "" + else: + self.Filters[filter_parts[idx]] = filter_parts[idx + 1].replace("*", "") + self.Filter.Append(filter_parts[idx]) + if idx == 0: + self.Filter.SetStringSelection(filter_parts[idx]) + + self.CurrentFilter = self.Filters[self.Filter.GetStringSelection()] + + def _GetFolderChildren(self, folderpath, recursive=True): + items = [] + if wx.Platform == '__WXMSW__' and folderpath == "/": + for c in xrange(ord('a'), ord('z')): + drive = os.path.join("%s:\\" % chr(c)) + if os.path.exists(drive): + items.append((drive, DRIVE, self._GetFolderChildren(drive, False))) + else: + try: + files = os.listdir(folderpath) + except: + return [] + for filename in files: + if not filename.startswith("."): + filepath = os.path.join(folderpath, filename) + if os.path.isdir(filepath): + if recursive: + children = len(self._GetFolderChildren(filepath, False)) + else: + children = 0 + items.append((filename, FOLDER, children)) + elif (self.CurrentFilter == "" or + os.path.splitext(filename)[1] == self.CurrentFilter): + items.append((filename, FILE, None)) + if recursive: + items.sort(sort_folder) + return items + + def GetTreeCtrl(self): + return self.Tree + + def RefreshTree(self): + root = self.Tree.GetRootItem() + if not root.IsOk(): + root = self.Tree.AddRoot("") + self.GenerateTreeBranch(root, self.Folder) + + def GenerateTreeBranch(self, root, folderpath): + item, item_cookie = self.Tree.GetFirstChild(root) + for idx, (filename, item_type, children) in enumerate(self._GetFolderChildren(folderpath)): + if not item.IsOk(): + item = self.Tree.AppendItem(root, filename, self.TreeImageDict[item_type]) + if wx.Platform != '__WXMSW__': + item, item_cookie = self.Tree.GetNextChild(root, item_cookie) + elif self.Tree.GetItemText(item) != filename: + item = self.Tree.InsertItemBefore(root, idx, filename, self.TreeImageDict[item_type]) + filepath = os.path.join(folderpath, filename) + if item_type != FILE: + if self.Tree.IsExpanded(item): + self.GenerateTreeBranch(item, filepath) + elif children > 0: + self.Tree.SetItemHasChildren(item) + item, item_cookie = self.Tree.GetNextChild(root, item_cookie) + to_delete = [] + while item.IsOk(): + to_delete.append(item) + item, item_cookie = self.Tree.GetNextChild(root, item_cookie) + for item in to_delete: + self.Tree.Delete(item) + + def ExpandItem(self, item): + self.GenerateTreeBranch(item, self.GetPath(item)) + self.Tree.Expand(item) + + def OnTreeItemActivated(self, event): + self.ExpandItem(event.GetItem()) + event.Skip() + + def OnTreeLeftDown(self, event): + item, flags = self.Tree.HitTest(event.GetPosition()) + if flags & wx.TREE_HITTEST_ONITEMBUTTON and not self.Tree.IsExpanded(item): + self.ExpandItem(item) + else: + event.Skip() + + def OnTreeItemExpanded(self, event): + item = event.GetItem() + self.GenerateTreeBranch(item, self.GetPath(item)) + event.Skip() + + def OnTreeItemCollapsed(self, event): + item = event.GetItem() + self.Tree.DeleteChildren(item) + self.Tree.SetItemHasChildren(item) + event.Skip() + + def OnTreeBeginLabelEdit(self, event): + item = event.GetItem() + if self.Editable and not self.Tree.ItemHasChildren(item): + event.Skip() + else: + event.Veto() + + def OnTreeEndLabelEdit(self, event): + event.Veto() + + def OnFilterChanged(self, event): + self.CurrentFilter = self.Filters[self.Filter.GetStringSelection()] + self.RefreshTree() + event.Skip() + + def _SelectItem(self, root, parts): + if len(parts) == 0: + self.Tree.SelectItem(root) + else: + item, item_cookie = self.Tree.GetFirstChild(root) + while item.IsOk(): + if self.Tree.GetItemText(item) == parts[0]: + if (self.Tree.ItemHasChildren(item) and + not self.Tree.IsExpanded(item)): + self.Tree.Expand(item) + wx.CallAfter(self._SelectItem, item, parts[1:]) + else: + self._SelectItem(item, parts[1:]) + return + item, item_cookie = self.Tree.GetNextChild(root, item_cookie) + + def SetPath(self, path): + if path.startswith(self.Folder): + root = self.Tree.GetRootItem() + if root.IsOk(): + relative_path = path.replace(os.path.join(self.Folder, ""), "") + self._SelectItem(root, splitpath(relative_path)) + + def GetPath(self, item=None): + if item is None: + item = self.Tree.GetSelection() + if item.IsOk(): + filepath = self.Tree.GetItemText(item) + parent = self.Tree.GetItemParent(item) + while parent.IsOk() and parent != self.Tree.GetRootItem(): + filepath = os.path.join(self.Tree.GetItemText(parent), filepath) + parent = self.Tree.GetItemParent(parent) + return os.path.join(self.Folder, filepath) + return self.Folder + +class FileManagementPanel(EditorPanel): + + def _init_Editor(self, parent): + self.Editor = wx.Panel(parent) + + main_sizer = wx.BoxSizer(wx.HORIZONTAL) + + left_sizer = wx.BoxSizer(wx.VERTICAL) + main_sizer.AddSizer(left_sizer, 1, border=5, flag=wx.GROW|wx.ALL) + + managed_dir_label = wx.StaticText(self.Editor, label=self.TagName + ":") + left_sizer.AddWindow(managed_dir_label, border=5, flag=wx.GROW|wx.BOTTOM) + + self.ManagedDir = FolderTree(self.Editor, self.Folder, FILTER) + left_sizer.AddWindow(self.ManagedDir, 1, flag=wx.GROW) + + managed_treectrl = self.ManagedDir.GetTreeCtrl() + self.Bind(wx.EVT_TREE_SEL_CHANGED, self.OnTreeItemChanged, managed_treectrl) + if self.EnableDragNDrop: + self.Bind(wx.EVT_TREE_BEGIN_DRAG, self.OnTreeBeginDrag, managed_treectrl) + + button_sizer = wx.BoxSizer(wx.VERTICAL) + main_sizer.AddSizer(button_sizer, border=5, + flag=wx.ALL|wx.ALIGN_CENTER_VERTICAL) + + for idx, (name, bitmap, help) in enumerate([ + ("DeleteButton", "remove_element", _("Remove file from left folder")), + ("LeftCopyButton", "LeftCopy", _("Copy file from right folder to left")), + ("RightCopyButton", "RightCopy", _("copy file from left folder to right")), + ("EditButton", "edit", _("Edit file"))]): + button = wx.lib.buttons.GenBitmapButton(self.Editor, + bitmap=GetBitmap(bitmap), + size=wx.Size(28, 28), style=wx.NO_BORDER) + button.SetToolTipString(help) + setattr(self, name, button) + if idx > 0: + flag = wx.TOP + else: + flag = 0 + self.Bind(wx.EVT_BUTTON, getattr(self, "On" + name), button) + button_sizer.AddWindow(button, border=20, flag=flag) + + right_sizer = wx.BoxSizer(wx.VERTICAL) + main_sizer.AddSizer(right_sizer, 1, border=5, flag=wx.GROW|wx.ALL) + + if wx.Platform == '__WXMSW__': + system_dir_label = wx.StaticText(self.Editor, label=_("My Computer:")) + else: + system_dir_label = wx.StaticText(self.Editor, label=_("Home Directory:")) + right_sizer.AddWindow(system_dir_label, border=5, flag=wx.GROW|wx.BOTTOM) + + self.SystemDir = FolderTree(self.Editor, self.HomeDirectory, FILTER, False) + right_sizer.AddWindow(self.SystemDir, 1, flag=wx.GROW) + + system_treectrl = self.SystemDir.GetTreeCtrl() + self.Bind(wx.EVT_TREE_SEL_CHANGED, self.OnTreeItemChanged, system_treectrl) + + self.Editor.SetSizer(main_sizer) + + def __init__(self, parent, controler, name, folder, enable_dragndrop=False): + self.Folder = os.path.realpath(folder) + self.EnableDragNDrop = enable_dragndrop + + if wx.Platform == '__WXMSW__': + self.HomeDirectory = "/" + else: + self.HomeDirectory = os.path.expanduser("~") + + EditorPanel.__init__(self, parent, name, None, None) + + self.Controler = controler + + self.EditableFileExtensions = [] + self.EditButton.Hide() + + self.SetIcon(GetBitmap("FOLDER")) + + def __del__(self): + self.Controler.OnCloseEditor(self) + + def GetTitle(self): + return self.TagName + + def SetEditableFileExtensions(self, extensions): + self.EditableFileExtensions = extensions + if len(self.EditableFileExtensions) > 0: + self.EditButton.Show() + + def RefreshView(self): + self.ManagedDir.RefreshTree() + self.SystemDir.RefreshTree() + self.RefreshButtonsState() + + def RefreshButtonsState(self): + managed_filepath = self.ManagedDir.GetPath() + system_filepath = self.SystemDir.GetPath() + + self.DeleteButton.Enable(os.path.isfile(managed_filepath)) + self.LeftCopyButton.Enable(os.path.isfile(system_filepath)) + self.RightCopyButton.Enable(os.path.isfile(managed_filepath)) + if len(self.EditableFileExtensions) > 0: + self.EditButton.Enable( + os.path.isfile(managed_filepath) and + os.path.splitext(managed_filepath)[1] in self.EditableFileExtensions) + + def OnTreeItemChanged(self, event): + self.RefreshButtonsState() + event.Skip() + + def OnDeleteButton(self, event): + filepath = self.ManagedDir.GetPath() + if os.path.isfile(filepath): + folder, filename = os.path.split(filepath) + + dialog = wx.MessageDialog(self, + _("Do you really want to delete the file '%s'?") % filename, + _("Delete File"), wx.YES_NO|wx.ICON_QUESTION) + remove = dialog.ShowModal() == wx.ID_YES + dialog.Destroy() + + if remove: + os.remove(filepath) + self.ManagedDir.RefreshTree() + event.Skip() + + def OnEditButton(self, event): + filepath = self.ManagedDir.GetPath() + if (os.path.isfile(filepath) and + os.path.splitext(filepath)[1] in self.EditableFileExtensions): + self.Controler._OpenView(filepath) + event.Skip() + + def CopyFile(self, src, dst): + if os.path.isfile(src): + src_folder, src_filename = os.path.split(src) + if os.path.isfile(dst): + dst_folder, dst_filename = os.path.split(dst) + else: + dst_folder = dst + + dst_filepath = os.path.join(dst_folder, src_filename) + if os.path.isfile(dst_filepath): + dialog = wx.MessageDialog(self, + _("The file '%s' already exist.\nDo you want to replace it?") % src_filename, + _("Replace File"), wx.YES_NO|wx.ICON_QUESTION) + copy = dialog.ShowModal() == wx.ID_YES + dialog.Destroy() + else: + copy = True + + if copy: + shutil.copyfile(src, dst_filepath) + return dst_filepath + return None + + def OnLeftCopyButton(self, event): + filepath = self.CopyFile(self.SystemDir.GetPath(), self.ManagedDir.GetPath()) + if filepath is not None: + self.ManagedDir.RefreshTree() + self.ManagedDir.SetPath(filepath) + event.Skip() + + def OnRightCopyButton(self, event): + filepath = self.CopyFile(self.ManagedDir.GetPath(), self.SystemDir.GetPath()) + if filepath is not None: + self.SystemDir.RefreshTree() + self.SystemDir.SetPath(filepath) + event.Skip() + + def OnTreeBeginDrag(self, event): + filepath = self.ManagedDir.GetPath() + if os.path.isfile(filepath): + relative_filepath = filepath.replace(os.path.join(self.Folder, ""), "") + data = wx.TextDataObject(str(("'%s'" % relative_filepath, "Constant"))) + dragSource = wx.DropSource(self) + dragSource.SetData(data) + dragSource.DoDragDrop() + \ No newline at end of file diff -r 7499535588e6 -r f49875b9e946 util/misc.py --- a/util/misc.py Tue Jun 19 21:59:34 2012 +0200 +++ b/util/misc.py Fri Jul 06 21:00:43 2012 +0200 @@ -3,10 +3,6 @@ """ import os,sys - -# helper func to get path to images -def opjimg(imgname): - return os.path.join(sys.path[0], "images", imgname+".png") # helper func to check path write permission def CheckPathPerm(path):