# Build interface
sizer = wx.BoxSizer(wx.VERTICAL)
- sizer.Add(wx.StaticLine(self, -1), 0, wx.EXPAND)
+ #sizer.Add(wx.StaticLine(self, -1), 0, wx.EXPAND)
# Horizontal sizer for toolbar and splitter
self.toolsSizer = sizer1 = wx.BoxSizer()
splitter = wx.SplitterWindow(self, -1, style=wx.SP_3DSASH)
index = tree.ItemIndex(selected)
if index == 0: return # No previous sibling found
+ # Remove highlight, update testWin
+ if g.testWin and g.testWin.highLight:
+ g.testWin.highLight.Remove()
+ tree.needUpdate = True
+
# Undo info
self.lastOp = 'MOVEUP'
status = 'Moved before previous sibling'
# Prepare undo data
panel.Apply()
+ tree.UnselectAll()
parent = tree.GetItemParent(selected)
elem = tree.RemoveLeaf(selected)
next = tree.GetNextSibling(selected)
if not next: return
+ # Remove highlight, update testWin
+ if g.testWin and g.testWin.highLight:
+ g.testWin.highLight.Remove()
+ tree.needUpdate = True
+
# Undo info
self.lastOp = 'MOVEDOWN'
status = 'Moved after next sibling'
# Prepare undo data
panel.Apply()
+ tree.UnselectAll()
parent = tree.GetItemParent(selected)
elem = tree.RemoveLeaf(selected)
# Check compatibility
if not self.ItemsAreCompatible(tree.GetPyData(pparent).treeObject(), tree.GetPyData(selected).treeObject()): return
+ # Remove highlight, update testWin
+ if g.testWin and g.testWin.highLight:
+ g.testWin.highLight.Remove()
+ tree.needUpdate = True
+
# Undo info
self.lastOp = 'MOVELEFT'
status = 'Made next sibling of parent'
selected = tree.InsertNode(pparent, tree.GetPyData(pparent).treeObject(), elem, nextItem)
newIndex = tree.ItemIndex(selected)
+ tree.oldItem = None
tree.SelectItem(selected)
undoMan.RegisterUndo(UndoMove(oldParent, oldIndex, pparent, newIndex))
# Check compatibility
if not self.ItemsAreCompatible(parent, tree.GetPyData(selected).treeObject()): return
+ # Remove highlight, update testWin
+ if g.testWin and g.testWin.highLight:
+ g.testWin.highLight.Remove()
+ tree.needUpdate = True
+
# Undo info
self.lastOp = 'MOVERIGHT'
status = 'Made last child of previous sibling'
selected = tree.InsertNode(newParent, tree.GetPyData(newParent).treeObject(), elem, wx.TreeItemId())
newIndex = tree.ItemIndex(selected)
+ tree.oldItem = None
tree.SelectItem(selected)
undoMan.RegisterUndo(UndoMove(oldParent, oldIndex, newParent, newIndex))
-
+
self.modified = True
self.SetStatusText(status)
child = tree.GetNextSibling(child)
return None
+ # Click event after locate activated
def OnTestWinLeftDown(self, evt):
- pos = evt.GetPosition()
+ # Restore normal event processing
self.SetHandler(g.testWin)
g.testWin.Disconnect(wx.ID_ANY, wx.ID_ANY, wx.wxEVT_LEFT_DOWN)
item = self.FindObject(g.testWin.item, evt.GetEventObject())
print msg
def OnCreate(self, evt):
+ # Ignore fake events generated while dragging
+ if g.tools.drag:
+ g.tools.drag = False
+ return
selected = tree.selection
if tree.ctrl: appendChild = False
else: appendChild = not tree.NeedInsert(selected)
parent = tree.GetPyData(parentLeaf)
if parent.hasChild: parent = parent.child
+ self.CreateXXX(parent, parentLeaf, nextItem, evt.GetId())
+
+ # Actual method to create object and add to XML and wx trees
+ def CreateXXX(self, parent, parentLeaf, nextItem, id):
+ selected = tree.selection
# Create object_ref?
- if evt.GetId() == ID_NEW.REF:
+ if id == ID_NEW.REF:
ref = wx.GetTextFromUser('Create reference to:', 'Create reference')
if not ref: return
xxx = MakeEmptyRefXXX(parent, ref)
- elif evt.GetId() == ID_NEW.COMMENT:
+ elif id == ID_NEW.COMMENT:
xxx = MakeEmptyCommentXXX(parent)
else:
# Create empty element
- if evt.GetId() >= ID_NEW.CUSTOM:
- className = pullDownMenu.customMap[evt.GetId()]
+ if id >= ID_NEW.CUSTOM:
+ className = pullDownMenu.customMap[id]
else:
- className = pullDownMenu.createMap[evt.GetId()]
+ className = pullDownMenu.createMap[id]
xxx = MakeEmptyXXX(parent, className)
# Insert new node, register undo
xxx.setTreeName('%s%d' % (defaultIDs[cl], frame.maxIDs[cl]))
# And for some other standard controls
elif parent.__class__ == xxxStdDialogButtonSizer:
- xxx.setTreeName(pullDownMenu.stdButtonIDs[evt.GetId()][0])
- # We can even set label
+ # ... we can even set automatically tree name
+ xxx.setTreeName(pullDownMenu.stdButtonIDs[id][0])
obj = xxx.treeObject()
+ # ... and label
elem = g.tree.dom.createElement('label')
- elem.appendChild(g.tree.dom.createTextNode(pullDownMenu.stdButtonIDs[evt.GetId()][1]))
+ elem.appendChild(g.tree.dom.createTextNode(pullDownMenu.stdButtonIDs[id][1]))
obj.params['label'] = xxxParam(elem)
xxx.treeObject().node.appendChild(elem)
-
- newItem = tree.InsertNode(parentLeaf, parent, xxx.node, nextItem)
- else: # comment node
- newItem = tree.InsertNode(parentLeaf, parent, xxx.node, nextItem)
+ # Else, set label if exists to class name
+ elif 'label' in xxx.treeObject().allParams:
+ label = className
+ if label[:2] == 'wx': label = label[2:]
+ xxx.treeObject().set('label', label.upper())
+ # For comment nodes, simply add node
+ newItem = tree.InsertNode(parentLeaf, parent, xxx.node, nextItem)
undoMan.RegisterUndo(UndoPasteCreate(parentLeaf, parent, newItem, selected))
tree.EnsureVisible(newItem)
tree.SelectItem(newItem)
if not xxx.isElement:
tree.EditLabel(newItem)
self.SetModified()
+ return xxx
# Replace one object with another
def OnReplace(self, evt):
if tree.needUpdate:
if conf.autoRefresh:
if g.testWin:
- self.SetStatusText('Refreshing test window...')
+ #self.SetStatusText('Refreshing test window...')
# (re)create
tree.CreateTestWin(g.testWin.item)
- self.SetStatusText('')
+ #self.SetStatusText('')
tree.needUpdate = False
elif tree.pendingHighLight:
try:
tree.HighLight(tree.pendingHighLight)
except:
# Remove highlight if any problem
- if g.testWin.highLight:
+ if g.testWin and g.testWin.highLight:
g.testWin.highLight.Remove()
tree.pendingHighLight = None
raise
# Store important data
frame.handlers = getHandlers()[:]
frame.custom = g.pullDownMenu.custom[:]
- frame.modules = set(sys.modules.keys())
+ frame.modules = sys.modules.copy()
# Initialize
frame.Clear()
projects / wxWidgets.git / blobdiff