Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

This commit was manufactured by cvs2svn to create tag 'WX_2_8_4'.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/WX_2_8_4@46016 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bryan Petty
2007-05-14 08:18:10 +00:00
parent e86fbab1ba
commit 50c46e10bb
840 changed files with 30344 additions and 96262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

398
wxPython/wx/tools/XRCed/tree.py
View File

@@ -86,10 +86,12 @@ class ID_NEW:
CHOICEBOOK = wx.NewId()
LISTBOOK = wx.NewId()
SPLITTER_WINDOW = wx.NewId()
GRID = wx.NewId()
SCROLLED_WINDOW = wx.NewId()
HTML_WINDOW = wx.NewId()
CALENDAR_CTRL = wx.NewId()
DATE_CTRL = wx.NewId()
FILE_PICKER_CTRL = wx.NewId()
GENERIC_DIR_CTRL = wx.NewId()
SPIN_CTRL = wx.NewId()
UNKNOWN = wx.NewId()
@@ -124,6 +126,10 @@ class ID_NEW:
CONTEXT_HELP_BUTTON = wx.NewId()
REF = wx.NewId()
COMMENT = wx.NewId()
CUSTOM = wx.NewId()
for i in range(99): wx.NewId() # reserve IDs for custom controls
LAST = wx.NewId()
@@ -193,10 +199,12 @@ class PullDownMenu:
ID_NEW.CHOICEBOOK: 'wxChoicebook',
ID_NEW.LISTBOOK: 'wxListbook',
ID_NEW.SPLITTER_WINDOW: 'wxSplitterWindow',
ID_NEW.GRID: 'wxGrid',
ID_NEW.SCROLLED_WINDOW: 'wxScrolledWindow',
ID_NEW.HTML_WINDOW: 'wxHtmlWindow',
ID_NEW.CALENDAR_CTRL: 'wxCalendarCtrl',
ID_NEW.DATE_CTRL: 'wxDatePickerCtrl',
ID_NEW.FILE_PICKER_CTRL: 'wxFilePickerCtrl',
ID_NEW.GENERIC_DIR_CTRL: 'wxGenericDirCtrl',
ID_NEW.SPIN_CTRL: 'wxSpinCtrl',
@@ -268,10 +276,12 @@ class PullDownMenu:
(ID_NEW.SCROLL_BAR, 'ScrollBar', 'Create scroll bar'),
(ID_NEW.TREE_CTRL, 'TreeCtrl', 'Create tree'),
(ID_NEW.LIST_CTRL, 'ListCtrl', 'Create list'),
# (ID_NEW.GRID, 'Grid', 'Create grid'),
(ID_NEW.SCROLLED_WINDOW, 'ScrolledWindow', 'Create scrolled window'),
(ID_NEW.HTML_WINDOW, 'HtmlWindow', 'Create HTML window'),
(ID_NEW.CALENDAR_CTRL, 'CalendarCtrl', 'Create calendar control'),
(ID_NEW.DATE_CTRL, 'DatePickerCtrl', 'Create date picker control'),
# (ID_NEW.FILE_PICKER_CTRL, 'FilePickerCtrl', 'Create file picker control'),
(ID_NEW.GENERIC_DIR_CTRL, 'GenericDirCtrl', 'Create generic dir control'),
(ID_NEW.UNKNOWN, 'Unknown', 'Create custom control placeholder'),
],
@@ -370,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
################################################################################
@@ -396,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
@@ -417,29 +446,78 @@ 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):
wx.TreeCtrl.__init__(self, parent, id, style = wx.TR_HAS_BUTTONS | wx.TR_MULTIPLE)
# 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))
self.fontComment = wx.FFont(self.GetFont().GetPointSize(),
self.GetFont().GetFamily(),
wx.FONTFLAG_ITALIC)
# 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)
wx.EVT_RIGHT_DOWN(self, self.OnRightDown)
wx.EVT_TREE_ITEM_EXPANDED(self, self.GetId(), self.OnItemExpandedCollapsed)
wx.EVT_TREE_ITEM_COLLAPSED(self, self.GetId(), self.OnItemExpandedCollapsed)
self.Bind(wx.EVT_TREE_BEGIN_LABEL_EDIT, self.OnBeginLabelEdit)
self.Bind(wx.EVT_TREE_END_LABEL_EDIT, self.OnEndLabelEdit)
self.selection = None
self.selectionChanging = False
@@ -450,6 +528,7 @@ class XML_Tree(wx.TreeCtrl):
# Create image list
il = wx.ImageList(16, 16, True)
self.rootImage = il.Add(images.getTreeRootImage().Scale(16,16).ConvertToBitmap())
xxxComment.image = il.Add(images.getTreeCommentImage().Scale(16,16).ConvertToBitmap())
xxxObject.image = il.Add(images.getTreeDefaultImage().Scale(16,16).ConvertToBitmap())
xxxPanel.image = il.Add(images.getTreePanelImage().Scale(16,16).ConvertToBitmap())
xxxDialog.image = il.Add(images.getTreeDialogImage().Scale(16,16).ConvertToBitmap())
@@ -498,7 +577,6 @@ class XML_Tree(wx.TreeCtrl):
# Clear tree
def Clear(self):
self.selection = None
self.UnselectAll()
self.DeleteAllItems()
# Add minimal structure
@@ -511,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)
@@ -518,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
@@ -560,17 +638,22 @@ class XML_Tree(wx.TreeCtrl):
item = self.AppendItem(itemParent, treeObj.treeName(),
image=treeObj.treeImage(),
data=wx.TreeItemData(xxx))
# Different color for references
if treeObj.ref:
self.SetItemTextColour(item, 'DarkGreen')
# Different color for comments and references
if xxx.className == 'comment':
self.SetItemTextColour(item, self.COLOUR_COMMENT)
self.SetItemFont(item, self.fontComment)
elif treeObj.ref:
self.SetItemTextColour(item, self.COLOUR_REF)
elif treeObj.hasStyle and treeObj.params.get('hidden', False):
self.SetItemTextColour(item, self.COLOUR_HIDDEN)
# Try to find children objects
if treeObj.hasChildren:
nodes = treeObj.element.childNodes[:]
nodes = treeObj.node.childNodes[:]
for n in nodes:
if IsObject(n):
self.AddNode(item, treeObj, n)
elif n.nodeType != minidom.Node.ELEMENT_NODE:
treeObj.element.removeChild(n)
treeObj.node.removeChild(n)
n.unlink()
# Insert new item at specific position
@@ -579,23 +662,30 @@ class XML_Tree(wx.TreeCtrl):
xxx = MakeXXXFromDOM(parent, elem)
# If nextItem is None, we append to parent, otherwise insert before it
if nextItem.IsOk():
node = self.GetPyData(nextItem).element
parent.element.insertBefore(elem, node)
node = self.GetPyData(nextItem).node
parent.node.insertBefore(elem, node)
# Inserting before is difficult, se we insert after or first child
index = self.ItemIndex(nextItem)
newItem = self.InsertItemBefore(itemParent, index,
xxx.treeName(), image=xxx.treeImage())
self.SetPyData(newItem, xxx)
else:
parent.element.appendChild(elem)
parent.node.appendChild(elem)
newItem = self.AppendItem(itemParent, xxx.treeName(), image=xxx.treeImage(),
data=wx.TreeItemData(xxx))
# Different color for references
if xxx.treeObject().ref: self.SetItemTextColour(newItem, 'DarkGreen')
treeObj = xxx.treeObject()
# Different color for references and comments
if xxx.className == 'comment':
self.SetItemTextColour(newItem, self.COLOUR_COMMENT)
self.SetItemFont(newItem, self.fontComment)
elif treeObj.ref:
self.SetItemTextColour(newItem, self.COLOUR_REF)
elif treeObj.hasStyle and treeObj.params.get('hidden', False):
self.SetItemTextColour(newItem, self.COLOUR_HIDDEN)
# Add children items
if xxx.hasChildren:
treeObj = xxx.treeObject()
for n in treeObj.element.childNodes:
for n in treeObj.node.childNodes:
if IsObject(n):
self.AddNode(newItem, treeObj, n)
return newItem
@@ -603,13 +693,12 @@ class XML_Tree(wx.TreeCtrl):
# Remove leaf of tree, return it's data object
def RemoveLeaf(self, leaf):
xxx = self.GetPyData(leaf)
node = xxx.element
node = xxx.node
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
def FindNodePos(self, item, obj=None):
# Root at (0,0)
@@ -629,17 +718,18 @@ class XML_Tree(wx.TreeCtrl):
if g.testWin.highLight:
g.testWin.highLight.Remove()
break
# Find first ancestor which is a wxWindow (not a sizer)
# For sizers and notebooks we must select the first window-like parent
winParent = itemParent
while self.GetPyData(winParent).isSizer:
winParent = self.GetItemParent(winParent)
# Notebook children are layed out in a little strange way
if self.GetPyData(itemParent).treeObject().__class__ == xxxNotebook:
parentPos = wx.Point(0,0)
else:
parentPos = self.FindNodePos(winParent)
# Position (-1,-1) is really (0,0)
# wxGTK places NB panels relative to the NB parent
if wx.Platform == '__WXGTK__':
if self.GetPyData(itemParent).treeObject().__class__ == xxxNotebook:
winParent = self.GetItemParent(winParent)
parentPos = self.FindNodePos(winParent)
pos = obj.GetPosition()
# Position (-1,-1) is really (0,0)
if pos == (-1,-1): pos = (0,0)
return parentPos + pos
@@ -682,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
@@ -692,25 +800,24 @@ 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():
self.Apply(xxx, oldItem)
#if conf.autoRefresh:
if g.testWin:
if g.testWin.highLight:
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
@@ -723,7 +830,8 @@ class XML_Tree(wx.TreeCtrl):
if item == g.testWin.item: return False
while item != self.root:
item = self.GetItemParent(item)
if item == g.testWin.item: return True
if item == g.testWin.item:
return True
return False
# Highlight selected item
@@ -739,19 +847,20 @@ class XML_Tree(wx.TreeCtrl):
return
# Get window/sizer object
obj = self.FindNodeObject(item)
if not obj:
xxx = self.GetPyData(item).treeObject()
# Remove existing HL if item not found or is hidden
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)
@@ -769,6 +878,7 @@ class XML_Tree(wx.TreeCtrl):
return
# Show item in bold
if g.testWin: # Reset old
self.UnselectAll()
self.SetItemBold(g.testWin.item, False)
try:
wx.BeginBusyCursor()
@@ -804,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:
@@ -842,7 +939,7 @@ class XML_Tree(wx.TreeCtrl):
# Save in memory FS
memFile = MemoryFile('xxx.xrc')
# Create memory XML file
elem = xxx.element.cloneNode(True)
elem = xxx.node.cloneNode(True)
if not xxx.name:
name = 'noname'
else:
@@ -871,6 +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()
# Same module list
res.Load('memory:xxx.xrc')
try:
if xxx.__class__ == xxxFrame:
@@ -896,12 +998,13 @@ 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(None, STD_NAME)
testWin = g.testWin = res.LoadDialog(g.frame, STD_NAME)
testWin.panel = testWin
testWin.Layout()
testWin.SetPosition(pos)
@@ -911,7 +1014,7 @@ class XML_Tree(wx.TreeCtrl):
wx.EVT_BUTTON(testWin, wx.ID_CANCEL, self.OnCloseTestWin)
elif xxx.__class__ == xxxWizard:
wiz = wx.wizard.PreWizard()
res.LoadOnObject(wiz, None, STD_NAME, 'wxWizard')
res.LoadOnObject(wiz, g.frame, STD_NAME, 'wxWizard')
# Find first page (don't know better way)
firstPage = None
for w in wiz.GetChildren():
@@ -953,10 +1056,18 @@ class XML_Tree(wx.TreeCtrl):
testWin.toolBar = res.LoadToolBar(testWin, STD_NAME)
testWin.SetToolBar(testWin.toolBar)
testWin.Show(True)
# Catch some events, set highlight
if testWin:
testWin.item = item
wx.EVT_CLOSE(testWin, self.OnCloseTestWin)
testWin.highLight = None
wx.EVT_SIZE(testWin, self.OnSizeTestWin)
# 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:
@@ -968,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):
@@ -981,13 +1095,23 @@ class XML_Tree(wx.TreeCtrl):
def OnCloseTestWin(self, evt):
self.CloseTestWindow()
def OnSizeTestWin(self, evt):
# 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
def WindowIndex(self, item):
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
@@ -1026,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
@@ -1062,6 +1178,7 @@ class XML_Tree(wx.TreeCtrl):
SetMenu(m, pullDownMenu.topLevel)
m.AppendSeparator()
m.Append(ID_NEW.REF, 'reference...', 'Create object_ref node')
m.Append(ID_NEW.COMMENT, 'comment', 'Create comment node')
else:
xxx = self.GetPyData(item).treeObject()
# Check parent for possible child nodes if inserting sibling
@@ -1083,8 +1200,12 @@ 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')
# Select correct label for create menu
if not needInsert:
if self.shift:
@@ -1116,15 +1237,16 @@ class XML_Tree(wx.TreeCtrl):
(ID_NEW.PANEL, 'Panel', 'Create panel'),
(ID_NEW.DIALOG, 'Dialog', 'Create dialog'),
(ID_NEW.FRAME, 'Frame', 'Create frame')], shift=True)
elif xxx.isSizer:
elif xxx.isSizer and self.ItemHasChildren(item):
SetMenu(m, pullDownMenu.sizers, shift=True)
else:
SetMenu(m, pullDownMenu.controls, shift=True)
id = wx.NewId()
menu.AppendMenu(id, 'Replace With', m)
if not m.GetMenuItemCount(): menu.Enable(id, False)
menu.Append(pullDownMenu.ID_SUBCLASS, 'Subclass...',
'Set "subclass" property')
if xxx.isElement:
id = wx.NewId()
menu.AppendMenu(id, 'Replace With', m)
if not m.GetMenuItemCount(): menu.Enable(id, False)
menu.Append(pullDownMenu.ID_SUBCLASS, 'Subclass...',
'Set "subclass" property')
menu.AppendSeparator()
# Not using standart IDs because we don't want to show shortcuts
menu.Append(wx.ID_CUT, 'Cut', 'Cut to the clipboard')
@@ -1143,6 +1265,12 @@ 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()
@@ -1153,9 +1281,115 @@ class XML_Tree(wx.TreeCtrl):
# Item width may have changed
# !!! Tric to update tree width (wxGTK, ??)
self.SetIndent(self.GetIndent())
elif xxx.className == 'comment':
self.SetItemText(item, xxx.treeName())
# Change tree icon for sizers
if isinstance(xxx, xxxBoxSizer):
self.SetItemImage(item, xxx.treeImage())
# Set global modified state
g.frame.SetModified()
def OnBeginLabelEdit(self, evt):
xxx = self.GetPyData(evt.GetItem())
if xxx.isElement:
evt.Veto()
else:
evt.Skip()
def OnEndLabelEdit(self, evt):
xxx = self.GetPyData(evt.GetItem())
node = xxx.node
if not xxx.isElement:
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()