X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/64b9ac752375b80718e494233ef9cc3cb680ab50..bd118d35c67a840f94e7c369a4096f978054154c:/wxPython/wx/tools/XRCed/tree.py diff --git a/wxPython/wx/tools/XRCed/tree.py b/wxPython/wx/tools/XRCed/tree.py index 0a4d4d0638..55bbca94b5 100644 --- a/wxPython/wx/tools/XRCed/tree.py +++ b/wxPython/wx/tools/XRCed/tree.py @@ -117,6 +117,8 @@ class ID_NEW: HELP_BUTTON = wxNewId() CONTEXT_HELP_BUTTON = wxNewId() + REF = wxNewId() + LAST = wxNewId() @@ -363,7 +365,7 @@ def SetMenu(m, list, shift=False): apply(m.Append, l) elif type(l) == types.ListType: subMenu = wxMenu() - SetMenu(subMenu, l[2:]) + SetMenu(subMenu, l[2:], shift) m.AppendMenu(wxNewId(), l[0], subMenu, l[1]) else: # separator m.AppendSeparator() @@ -403,7 +405,7 @@ class HighLightBox: class XML_Tree(wxTreeCtrl): def __init__(self, parent, id): - wxTreeCtrl.__init__(self, parent, id, style = wxTR_HAS_BUTTONS) + wxTreeCtrl.__init__(self, parent, id, style = wxTR_HAS_BUTTONS | wxTR_MULTIPLE) self.SetBackgroundColour(wxColour(224, 248, 224)) # Register events EVT_TREE_SEL_CHANGED(self, self.GetId(), self.OnSelChanged) @@ -417,6 +419,7 @@ class XML_Tree(wxTreeCtrl): EVT_TREE_ITEM_COLLAPSED(self, self.GetId(), self.OnItemExpandedCollapsed) self.selection = None + self.selectionChanging = False self.needUpdate = False self.pendingHighLight = None self.ctrl = self.shift = False @@ -449,11 +452,6 @@ class XML_Tree(wxTreeCtrl): EVT_ENTER_WINDOW(self, g.tools.OnMouse) EVT_LEAVE_WINDOW(self, g.tools.OnMouse) - def Unselect(self): - self.selection = None - wxTreeCtrl.Unselect(self) - g.tools.UpdateUI() - def ExpandAll(self, item): if self.ItemHasChildren(item): self.Expand(item) @@ -477,6 +475,8 @@ class XML_Tree(wxTreeCtrl): # Clear tree def Clear(self): + self.selection = None + self.UnselectAll() self.DeleteAllItems() # Add minimal structure if self.dom: self.dom.unlink() @@ -489,11 +489,12 @@ class XML_Tree(wxTreeCtrl): self.root = self.AddRoot('XML tree', self.rootImage, data=wxTreeItemData(self.rootObj)) self.SetItemHasChildren(self.root) - self.Unselect() self.Expand(self.root) # Clear old data and set new def SetData(self, dom): + self.selection = None + self.UnselectAll() self.DeleteAllItems() # Add minimal structure if self.dom: self.dom.unlink() @@ -513,10 +514,9 @@ class XML_Tree(wxTreeCtrl): self.mainNode.removeChild(node) node.unlink() self.Expand(self.root) - self.Unselect() # Add tree item for given parent item if node is DOM element node with - # 'object' tag. xxxParent is parent xxx object + # object/object_ref tag. xxxParent is parent xxx object def AddNode(self, itemParent, xxxParent, node): # Set item data to current node try: @@ -529,6 +529,9 @@ class XML_Tree(wxTreeCtrl): item = self.AppendItem(itemParent, treeObj.treeName(), image=treeObj.treeImage(), data=wxTreeItemData(xxx)) + # Different color for references + if treeObj.ref: + self.SetItemTextColour(item, 'DarkGreen') # Try to find children objects if treeObj.hasChildren: nodes = treeObj.element.childNodes[:] @@ -556,6 +559,8 @@ class XML_Tree(wxTreeCtrl): parent.element.appendChild(elem) newItem = self.AppendItem(itemParent, xxx.treeName(), image=xxx.treeImage(), data=wxTreeItemData(xxx)) + # Different color for references + if xxx.treeObject().ref: self.SetItemTextColour(newItem, 'DarkGreen') # Add children items if xxx.hasChildren: treeObj = xxx.treeObject() @@ -619,7 +624,7 @@ class XML_Tree(wxTreeCtrl): return parentWin.GetSizer() elif isinstance(xxx.parent, xxxToolBar): # How to get tool from toolbar? - return parentWin.GetChildren()[0] + return parentWin elif isinstance(xxx.parent, xxxStdDialogButtonSizer): # This sizer returns non-existing children for ch in parentWin.GetChildren(): @@ -639,7 +644,11 @@ class XML_Tree(wxTreeCtrl): return child def OnSelChanged(self, evt): - self.ChangeSelection(evt.GetItem()) + if self.selectionChanging: return + self.selectionChanging = True + self.UnselectAll() + self.SelectItem(evt.GetItem()) + self.selectionChanging = False def ChangeSelection(self, item): # Apply changes @@ -759,7 +768,6 @@ class XML_Tree(wxTreeCtrl): # return wxBeginBusyCursor() - wxYield() # Close old window, remember where it was highLight = None if testWin: @@ -784,13 +792,7 @@ class XML_Tree(wxTreeCtrl): pos = g.testWinPos # Save in memory FS memFile = MemoryFile('xxx.xrc') - # Create partial XML file - faster for big files - - dom = MyDocument() - mainNode = dom.createElement('resource') - dom.appendChild(mainNode) - - # Remove temporarily from old parent + # Create memory XML file elem = xxx.element # Change window id to _XRCED_T_W. This gives some name for # unnamed windows, and for named gives the possibility to @@ -806,14 +808,11 @@ class XML_Tree(wxTreeCtrl): elem.setAttribute('class', 'wxPanel') parent = elem.parentNode next = elem.nextSibling - parent.replaceChild(self.dummyNode, elem) - # Append to new DOM, write it - mainNode.appendChild(elem) - dom.writexml(memFile, encoding=self.rootObj.params['encoding'].value()) + encd = self.rootObj.params['encoding'].value() + if not encd: encd = None + self.dom.writexml(open('ttt.xrc','w'), encoding=encd) + self.dom.writexml(memFile, encoding=encd) # Put back in place - mainNode.removeChild(elem) - dom.unlink() - parent.replaceChild(elem, self.dummyNode) # Remove temporary name or restore changed if not xxx.name: elem.removeAttribute('name') @@ -972,6 +971,14 @@ class XML_Tree(wxTreeCtrl): return False return not (self.IsExpanded(item) and self.GetChildrenCount(item, False)) + # Override to use like single-selection tree + def GetSelection(self): + return self.selection + def SelectItem(self, item): + self.UnselectAll() + self.ChangeSelection(item) + wxTreeCtrl.SelectItem(self, item) + # Pull-down def OnRightDown(self, evt): pullDownMenu = g.pullDownMenu @@ -998,6 +1005,8 @@ class XML_Tree(wxTreeCtrl): needInsert = self.NeedInsert(item) if item == self.root or needInsert and self.GetItemParent(item) == self.root: SetMenu(m, pullDownMenu.topLevel) + m.AppendSeparator() + m.Append(ID_NEW.REF, 'reference...', 'Create object_ref node') else: xxx = self.GetPyData(item).treeObject() # Check parent for possible child nodes if inserting sibling @@ -1017,6 +1026,8 @@ class XML_Tree(wxTreeCtrl): m.Enable(m.FindItem('sizer'), False) elif not (xxx.isSizer or xxx.parent and xxx.parent.isSizer): m.Enable(ID_NEW.SPACER, False) + m.AppendSeparator() + m.Append(ID_NEW.REF, 'reference...', 'Create object_ref node') # Select correct label for create menu if not needInsert: if self.shift: @@ -1056,7 +1067,7 @@ class XML_Tree(wxTreeCtrl): menu.AppendMenu(id, 'Replace With', m) if not m.GetMenuItemCount(): menu.Enable(id, False) menu.Append(pullDownMenu.ID_SUBCLASS, 'Subclass...', - 'Set subclass property') + 'Set "subclass" property') menu.AppendSeparator() # Not using standart IDs because we don't want to show shortcuts menu.Append(wxID_CUT, 'Cut', 'Cut to the clipboard') @@ -1089,5 +1100,5 @@ class XML_Tree(wxTreeCtrl): if isinstance(xxx, xxxBoxSizer): self.SetItemImage(item, xxx.treeImage()) # Set global modified state - g.frame.modified = True + g.frame.SetModified()