X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/00d153468c7d1be2093de839bcf70b6a45aa388f..d1b736b7968ceea4233f3fceecdb01173f68a9a3:/wxPython/wx/tools/XRCed/tree.py?ds=inline diff --git a/wxPython/wx/tools/XRCed/tree.py b/wxPython/wx/tools/XRCed/tree.py index ad64a5a709..363093ef49 100644 --- a/wxPython/wx/tools/XRCed/tree.py +++ b/wxPython/wx/tools/XRCed/tree.py @@ -128,6 +128,9 @@ class ID_NEW: REF = wx.NewId() COMMENT = wx.NewId() + CUSTOM = wx.NewId() + for i in range(99): wx.NewId() # reserve IDs for custom controls + LAST = wx.NewId() @@ -377,7 +380,13 @@ class PullDownMenu: ID_NEW.HELP_BUTTON: ('wxID_HELP', '&Help'), ID_NEW.CONTEXT_HELP_BUTTON: ('wxID_CONTEXT_HELP', '&Help'), } - + self.custom = ['custom', 'User-defined controls'] + self.customMap = {} + + def addCustom(self, klass): + n = len(self.custom)-2 + self.custom.append((ID_NEW.CUSTOM + n, klass)) + self.customMap[ID_NEW.CUSTOM + n] = klass ################################################################################ @@ -403,19 +412,32 @@ def SetMenu(m, list, shift=False): ################################################################################ class HighLightBox: + colour = None def __init__(self, pos, size): + colour = g.tree.COLOUR_HL if size.width == -1: size.width = 0 if size.height == -1: size.height = 0 w = g.testWin.panel l1 = wx.Window(w, -1, pos, wx.Size(size.width, 2)) - l1.SetBackgroundColour(wx.RED) + l1.SetBackgroundColour(colour) l2 = wx.Window(w, -1, pos, wx.Size(2, size.height)) - l2.SetBackgroundColour(wx.RED) + l2.SetBackgroundColour(colour) l3 = wx.Window(w, -1, wx.Point(pos.x + size.width - 2, pos.y), wx.Size(2, size.height)) - l3.SetBackgroundColour(wx.RED) + l3.SetBackgroundColour(colour) l4 = wx.Window(w, -1, wx.Point(pos.x, pos.y + size.height - 2), wx.Size(size.width, 2)) - l4.SetBackgroundColour(wx.RED) + l4.SetBackgroundColour(colour) self.lines = [l1, l2, l3, l4] + if wx.Platform == '__WXMSW__': + for l in self.lines: + l.Bind(wx.EVT_PAINT, self.OnPaint) + g.testWin.highLight = self + self.size = size + # Repainting is not always done for these windows on Windows + def OnPaint(self, evt): + w = evt.GetEventObject() + dc = wx.PaintDC(w) + w.ClearBackground() + dc.Destroy() # Move highlight to a new position def Replace(self, pos, size): if size.width == -1: size.width = 0 @@ -424,17 +446,60 @@ class HighLightBox: self.lines[1].SetDimensions(pos.x, pos.y, 2, size.height) self.lines[2].SetDimensions(pos.x + size.width - 2, pos.y, 2, size.height) self.lines[3].SetDimensions(pos.x, pos.y + size.height - 2, size.width, 2) - # Remove it + self.size = size def Remove(self): map(wx.Window.Destroy, self.lines) g.testWin.highLight = None def Refresh(self): map(wx.Window.Refresh, self.lines) +# Same for drop target +class HighLightDTBox(HighLightBox): + colour = None + def __init__(self, pos, size): + colour = g.tree.COLOUR_DT + if size.width == -1: size.width = 0 + if size.height == -1: size.height = 0 + w = g.testWin.panel + l1 = wx.Window(w, -1, pos, wx.Size(size.width, 2)) + l1.SetBackgroundColour(colour) + l2 = wx.Window(w, -1, pos, wx.Size(2, size.height)) + l2.SetBackgroundColour(colour) + l3 = wx.Window(w, -1, wx.Point(pos.x + size.width - 2, pos.y), wx.Size(2, size.height)) + l3.SetBackgroundColour(colour) + l4 = wx.Window(w, -1, wx.Point(pos.x, pos.y + size.height - 2), wx.Size(size.width, 2)) + l4.SetBackgroundColour(colour) + self.lines = [l1, l2, l3, l4] + self.item = None + self.size = size + # Remove it + def Remove(self): + map(wx.Window.Destroy, self.lines) + g.testWin.highLightDT = None + +def updateHL(hl, hlClass, pos, size): + # Need to recreate window if size did not change to force update + if hl and hl.size == size: + hl.Remove() + hl = None + if hl: + hl.Replace(pos, size) + else: + hl = hlClass(pos, size) + hl.Refresh() + return hl + ################################################################################ class XML_Tree(wx.TreeCtrl): def __init__(self, parent, id): + # Item colour + self.COLOUR_COMMENT = wx.Colour(0, 0, 255) + self.COLOUR_REF = wx.Colour(0, 0, 128) + self.COLOUR_HIDDEN = wx.Colour(128, 128, 128) + self.COLOUR_HL = wx.Colour(255, 0, 0) + self.COLOUR_DT = wx.Colour(0, 64, 0) + wx.TreeCtrl.__init__(self, parent, id, style = wx.TR_HAS_BUTTONS | wx.TR_MULTIPLE | wx.TR_EDIT_LABELS) self.SetBackgroundColour(wx.Colour(224, 248, 224)) @@ -444,7 +509,7 @@ class XML_Tree(wx.TreeCtrl): # Register events wx.EVT_TREE_SEL_CHANGED(self, self.GetId(), self.OnSelChanged) # One works on Linux, another on Windows - if wx.Platform == '__WXGTK__': + if wx.Platform == '__WXGTK__': # !!! MAC too? wx.EVT_TREE_ITEM_ACTIVATED(self, self.GetId(), self.OnItemActivated) else: wx.EVT_LEFT_DCLICK(self, self.OnDClick) @@ -512,7 +577,6 @@ class XML_Tree(wx.TreeCtrl): # Clear tree def Clear(self): - self.selection = None self.UnselectAll() self.DeleteAllItems() # Add minimal structure @@ -525,6 +589,7 @@ class XML_Tree(wx.TreeCtrl): self.rootObj = xxxMainNode(self.dom) self.root = self.AddRoot('XML tree', self.rootImage, data=wx.TreeItemData(self.rootObj)) + self.itemColour = self.GetItemTextColour(self.root) self.SetItemHasChildren(self.root) self.testElem = self.dom.createElement('dummy') self.mainNode.appendChild(self.testElem) @@ -532,7 +597,6 @@ class XML_Tree(wx.TreeCtrl): # Clear old data and set new def SetData(self, dom): - self.selection = None self.UnselectAll() self.DeleteAllItems() # Add minimal structure @@ -576,12 +640,12 @@ class XML_Tree(wx.TreeCtrl): data=wx.TreeItemData(xxx)) # Different color for comments and references if xxx.className == 'comment': - self.SetItemTextColour(item, 'Blue') + self.SetItemTextColour(item, self.COLOUR_COMMENT) self.SetItemFont(item, self.fontComment) elif treeObj.ref: - self.SetItemTextColour(item, 'DarkGreen') + self.SetItemTextColour(item, self.COLOUR_REF) elif treeObj.hasStyle and treeObj.params.get('hidden', False): - self.SetItemTextColour(item, 'Grey') + self.SetItemTextColour(item, self.COLOUR_HIDDEN) # Try to find children objects if treeObj.hasChildren: nodes = treeObj.node.childNodes[:] @@ -612,12 +676,12 @@ class XML_Tree(wx.TreeCtrl): treeObj = xxx.treeObject() # Different color for references and comments if xxx.className == 'comment': - self.SetItemTextColour(newItem, 'Blue') + self.SetItemTextColour(newItem, self.COLOUR_COMMENT) self.SetItemFont(newItem, self.fontComment) elif treeObj.ref: - self.SetItemTextColour(newItem, 'DarkGreen') + self.SetItemTextColour(newItem, self.COLOUR_REF) elif treeObj.hasStyle and treeObj.params.get('hidden', False): - self.SetItemTextColour(newItem, 'Grey') + self.SetItemTextColour(newItem, self.COLOUR_HIDDEN) # Add children items if xxx.hasChildren: treeObj = xxx.treeObject() @@ -633,8 +697,6 @@ class XML_Tree(wx.TreeCtrl): parent = node.parentNode parent.removeChild(node) self.Delete(leaf) - # Reset selection object - self.selection = None return node # Find position relative to the top-level window @@ -710,9 +772,27 @@ class XML_Tree(wx.TreeCtrl): def OnSelChanged(self, evt): if self.selectionChanging: return self.selectionChanging = True - self.UnselectAll() - self.SelectItem(evt.GetItem()) + wx.TreeCtrl.UnselectAll(self) + self.ChangeSelection(evt.GetItem()) + wx.TreeCtrl.SelectItem(self, evt.GetItem()) self.selectionChanging = False + g.frame.SetStatusText('') + evt.Skip() + + # Override to use like single-selection tree + def GetSelection(self): + return self.selection + + def SelectItem(self, item): + self.UnselectAll() + self.ChangeSelection(item) + wx.TreeCtrl.SelectItem(self, item) + + def UnselectAll(self): + self.selection = None + g.tools.UpdateUI() + wx.TreeCtrl.UnselectAll(self) + #wx.Yield() def ChangeSelection(self, item): # Apply changes @@ -720,8 +800,7 @@ class XML_Tree(wx.TreeCtrl): #oldItem = evt.GetOldItem() status = '' oldItem = self.selection - # use GetItemParent as a way to determine if the itemId is still valid - if oldItem and self.GetItemParent(oldItem): + if oldItem: xxx = self.GetPyData(oldItem) # If some data was modified, apply changes if g.panel.IsModified(): @@ -731,13 +810,14 @@ class XML_Tree(wx.TreeCtrl): g.testWin.highLight.Remove() self.needUpdate = True status = 'Changes were applied' - g.frame.SetStatusText(status) + if status: g.frame.SetStatusText(status) # Generate view - self.selection = item - if not self.selection.IsOk(): + if not item: self.selection = None return - xxx = self.GetPyData(self.selection) + else: + self.selection = item + xxx = self.GetPyData(item) # Update panel g.panel.SetData(xxx) # Update tools @@ -772,16 +852,15 @@ class XML_Tree(wx.TreeCtrl): if not obj or xxx.hasStyle and xxx.params.get('hidden', False): if g.testWin.highLight: g.testWin.highLight.Remove() return - pos = self.FindNodePos(item, obj) + pos = self.FindNodePos(item, obj) size = obj.GetSize() # Highlight # Negative positions are not working quite well - if g.testWin.highLight: - g.testWin.highLight.Replace(pos, size) - else: - g.testWin.highLight = HighLightBox(pos, size) - g.testWin.highLight.Refresh() + # If highlight object has the same size SetDimension does not repaint it + # so we must remove the old HL window + g.testWin.highLight = updateHL(g.testWin.highLight, HighLightBox, pos, size) g.testWin.highLight.item = item + g.testWin.highLight.obj = obj def ShowTestWindow(self, item): xxx = self.GetPyData(item) @@ -835,19 +914,6 @@ class XML_Tree(wx.TreeCtrl): testWin = g.testWin # Create a window with this resource xxx = self.GetPyData(item).treeObject() - - # If frame -# if xxx.__class__ == xxxFrame: - # Frame can't have many children, - # but it's first child possibly can... -# child = self.GetFirstChild(item)[0] -# if child.IsOk() and self.GetPyData(child).__class__ == xxxPanel: -# # Clean-up before recursive call or error -# wx.MemoryFSHandler.RemoveFile('xxx.xrc') -# wx.EndBusyCursor() -# self.CreateTestWin(child) -# return - # Close old window, remember where it was highLight = None if testWin: @@ -902,18 +968,11 @@ class XML_Tree(wx.TreeCtrl): if not g.currentEncoding: xmlFlags != xrc.XRC_USE_LOCALE res = xrc.XmlResource('', xmlFlags) + res.InitAllHandlers() xrc.XmlResource.Set(res) # set as global # Register handlers - addHandlers(res) - # Test Test.py - #import Test - #res.InsertHandler(Test.TestXmlHandler()) - # Test test.so - import ctypes - test = ctypes.CDLL('test.so') - addr = int(str(res.this).split('_')[1], 16) - #test._Z17AddTestXmlHandlerP13wxXmlResource(ctypes.c_void_p(addr)) - #test.AddTestXmlHandler(ctypes.c_void_p(addr)) + addHandlers() + # Same module list res.Load('memory:xxx.xrc') try: if xxx.__class__ == xxxFrame: @@ -939,9 +998,10 @@ class XML_Tree(wx.TreeCtrl): # Create new frame if not testWin: testWin = g.testWin = wx.Frame(g.frame, -1, 'Panel: ' + name, - pos=pos, name=STD_NAME) + pos=pos, name=STD_NAME) testWin.panel = res.LoadPanel(testWin, STD_NAME) - testWin.SetClientSize(testWin.GetBestSize()) + testWin.panel.SetSize(testWin.GetClientSize()) + #testWin.SetClientSize(testWin.GetSize()) testWin.Show(True) elif xxx.__class__ == xxxDialog: testWin = g.testWin = res.LoadDialog(g.frame, STD_NAME) @@ -1001,7 +1061,13 @@ class XML_Tree(wx.TreeCtrl): testWin.item = item wx.EVT_CLOSE(testWin, self.OnCloseTestWin) wx.EVT_SIZE(testWin, self.OnSizeTestWin) - testWin.highLight = None + # Add drop target + if testWin.panel: + testWin.panel.SetDropTarget(DropTarget()) + else: + testWin.SetDropTarget(DropTarget()) + # Reset highlights + testWin.highLight = testWin.highLightDT = None if highLight and not self.pendingHighLight: self.HighLight(highLight) except: @@ -1013,6 +1079,9 @@ class XML_Tree(wx.TreeCtrl): inf = sys.exc_info() wx.LogError(traceback.format_exception(inf[0], inf[1], None)[-1]) wx.LogError('Error loading resource') + # Cleanup + res.Unload('xxx.xrc') + xrc.XmlResource.Set(None) wx.MemoryFSHandler.RemoveFile('xxx.xrc') def CloseTestWindow(self): @@ -1027,8 +1096,12 @@ class XML_Tree(wx.TreeCtrl): self.CloseTestWindow() def OnSizeTestWin(self, evt): - if g.testWin.highLight: - self.HighLight(g.testWin.highLight.item) + # Update highlight after size change + hl = g.testWin.highLight + if hl: + hl.Replace(self.FindNodePos(hl.item), hl.obj.GetSize()) + hl.Refresh() + #self.HighLight(g.testWin.highLight.item) evt.Skip() # Return index in parent, for real window children @@ -1036,8 +1109,9 @@ class XML_Tree(wx.TreeCtrl): n = 0 # index of sibling prev = self.GetPrevSibling(item) while prev.IsOk(): - # MenuBar is not a child - if not isinstance(self.GetPyData(prev), xxxMenuBar): + # MenuBar and sizers are not real children (who else?) + if not isinstance(self.GetPyData(prev), xxxMenuBar) and not \ + isinstance(self.GetPyData(prev), xxxSizer): n += 1 prev = self.GetPrevSibling(prev) return n @@ -1076,14 +1150,6 @@ class XML_Tree(wx.TreeCtrl): 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) - wx.TreeCtrl.SelectItem(self, item) - # Pull-down def OnRightDown(self, evt): pullDownMenu = g.pullDownMenu @@ -1134,6 +1200,9 @@ class XML_Tree(wx.TreeCtrl): m.Enable(ID_NEW.SPACER, False) if xxx.__class__ is not xxxFrame: m.Enable(ID_NEW.MENU_BAR, False) + # Add custom controls menu + if len(pullDownMenu.custom) > 2: + SetMenu(m, [pullDownMenu.custom]) m.AppendSeparator() m.Append(ID_NEW.REF, 'reference...', 'Create object_ref node') m.Append(ID_NEW.COMMENT, 'comment', 'Create comment node') @@ -1196,12 +1265,6 @@ class XML_Tree(wx.TreeCtrl): self.PopupMenu(menu, evt.GetPosition()) menu.Destroy() - # Redefine to force the update of font dimentions on wxGTK - if wx.Platform == '__WXGTK__': - def SetItemBold(self, item, state=True): - wx.TreeCtrl.SetItemBold(self, item, state) - self.SetIndent(self.GetIndent()) - # Apply changes def Apply(self, xxx, item): g.panel.Apply() @@ -1234,3 +1297,93 @@ class XML_Tree(wx.TreeCtrl): node.data = evt.GetLabel() g.panel.SetData(xxx) evt.Skip() + +################################################################################ + +# DragAndDrop + +class DropTarget(wx.PyDropTarget): + def __init__(self): + self.do = MyDataObject() + wx.DropTarget.__init__(self, self.do) + + # Find best object for dropping + def WhereToDrop(self, x, y, d): + # Find object by position + obj = wx.FindWindowAtPoint(g.testWin.ClientToScreen((x,y))) + if not obj: + return wx.DragNone, () + item = g.frame.FindObject(g.testWin.item, obj) + if not item: + return wx.DragNone, () + xxx = g.tree.GetPyData(item).treeObject() + parentItem = None + # Check if window has a XRC sizer, then use it as parent + if obj.GetSizer(): + sizer = obj.GetSizer() + sizerItem = g.frame.FindObject(g.testWin.item, sizer) + if sizerItem: + parentItem = sizerItem + obj = sizer + item = wx.TreeItemId() + # if not sizer but can have children, it is parent with free placement + elif xxx.hasChildren: + parentItem = item + item = wx.TreeItemId() + # Otherwise, try to add to item's parent + if not parentItem: + parentItem = g.tree.GetItemParent(item) + obj = g.tree.FindNodeObject(parentItem) + parent = g.tree.GetPyData(parentItem).treeObject() + return d,(obj,parent,parentItem,item) + + # Drop + def OnData(self, x, y, d): + self.GetData() + id = int(self.do.GetDataHere()) + d,other = self.WhereToDrop(x, y, d) + if d != wx.DragNone: + obj,parent,parentItem,item = other + g.tree.selection = parentItem + xxx = g.frame.CreateXXX(parent, parentItem, item, id) + # Set coordinates if parent is not sizer + if not parent.isSizer: + xxx.set('pos', '%d,%d' % (x, y)) + g.panel.SetData(xxx) + g.frame.SetStatusText('Object created') + self.RemoveHL() + return d + + def OnDragOver(self, x, y, d): + d,other = self.WhereToDrop(x, y, d) + if d != wx.DragNone: + obj,parent,parentItem,item = other + pos, size = g.tree.FindNodePos(parentItem, obj), obj.GetSize() + hl = g.testWin.highLightDT + # Set color of highlighted item back to normal + if hl and hl.item: + if hl.item != parentItem: + g.tree.SetItemTextColour(hl.item, g.tree.itemColour) + # Highlight future parent + g.tree.itemColour = g.tree.GetItemTextColour(parentItem) # save current + if not hl or hl.item != parentItem: + g.testWin.highLightDT = updateHL(hl, HighLightDTBox, pos, size) + g.testWin.highLightDT.item = parentItem + g.tree.SetItemTextColour(parentItem, g.tree.COLOUR_DT) + g.tree.EnsureVisible(parentItem) + g.frame.SetStatusText('Drop target: %s' % parent.treeName()) + else: + g.frame.SetStatusText('Inappropriate drop target') + self.RemoveHL() + return d + + def OnLeave(self): + self.RemoveHL() + + def RemoveHL(self): + hl = g.testWin.highLightDT + if hl: + if hl.item: + g.tree.SetItemTextColour(hl.item, g.tree.itemColour) + hl.Remove() +