-v output version info and exit
"""
-
from globals import *
-import os, sys, getopt, re, traceback, tempfile, shutil
+import os, sys, getopt, re, traceback, tempfile, shutil, cPickle
# Local modules
from tree import * # imports xxx which imports params
defaultIDs = {xxxPanel:'PANEL', xxxDialog:'DIALOG', xxxFrame:'FRAME',
xxxMenuBar:'MENUBAR', xxxMenu:'MENU', xxxToolBar:'TOOLBAR',
- xxxWizard:'WIZARD'}
+ xxxWizard:'WIZARD', xxxBitmap:'BITMAP', xxxIcon:'ICON'}
+
+defaultName = 'UNTITLED.xrc'
################################################################################
# Load our own resources
self.res = wxXmlResource('')
- # !!! Blocking of assert failure occuring in older unicode builds
+ # !!! Blocking of assert failure occurring in older unicode builds
try:
self.res.Load(os.path.join(basePath, 'xrced.xrc'))
except wx._core.PyAssertionError:
# Create toolbar
tb = self.CreateToolBar(wxTB_HORIZONTAL | wxNO_BORDER | wxTB_FLAT)
tb.SetToolBitmapSize((24,24))
- new_bmp = wx.ArtProvider.GetBitmap(wx.ART_NEW, wx.ART_TOOLBAR)
+ new_bmp = wx.ArtProvider.GetBitmap(wx.ART_NORMAL_FILE, wx.ART_TOOLBAR)
open_bmp = wx.ArtProvider.GetBitmap(wx.ART_FILE_OPEN, wx.ART_TOOLBAR)
save_bmp = wx.ArtProvider.GetBitmap(wx.ART_FILE_SAVE, wx.ART_TOOLBAR)
undo_bmp = wx.ArtProvider.GetBitmap(wx.ART_UNDO, wx.ART_TOOLBAR)
'Refresh', 'Refresh view')
tb.AddSimpleTool(self.ID_AUTO_REFRESH, images.getAutoRefreshBitmap(),
'Auto-refresh', 'Toggle auto-refresh mode', True)
- if wxPlatform == '__WXGTK__':
- tb.AddSeparator() # otherwise auto-refresh sticks in status line
+# if wxPlatform == '__WXGTK__':
+# tb.AddSeparator() # otherwise auto-refresh sticks in status line
tb.ToggleTool(self.ID_AUTO_REFRESH, conf.autoRefresh)
tb.Realize()
EVT_MENU(self, self.ID_README, self.OnReadme)
# Update events
+ EVT_UPDATE_UI(self, wxID_SAVE, self.OnUpdateUI)
EVT_UPDATE_UI(self, wxID_CUT, self.OnUpdateUI)
EVT_UPDATE_UI(self, wxID_COPY, self.OnUpdateUI)
EVT_UPDATE_UI(self, wxID_PASTE, self.OnUpdateUI)
# !!! frame styles are broken
# Miniframe for not embedded mode
- miniFrame = wxFrame(self, -1, 'Properties Panel',
+ miniFrame = wxFrame(self, -1, 'Properties & Style',
(conf.panelX, conf.panelY),
(conf.panelWidth, conf.panelHeight))
self.miniFrame = miniFrame
self.SetSizer(sizer)
# Initialize
- self.clipboard = None
self.Clear()
# Other events
EVT_CLOSE(self, self.OnCloseWindow)
EVT_KEY_DOWN(self, tools.OnKeyDown)
EVT_KEY_UP(self, tools.OnKeyUp)
+ EVT_ICONIZE(self, self.OnIconize)
def AppendRecent(self, menu):
# add recently used files to the menu
if dlg.ShowModal() == wxID_OK:
path = dlg.GetPath()
self.SetStatusText('Loading...')
- wxYield()
wxBeginBusyCursor()
try:
if self.Open(path):
def OnSaveOrSaveAs(self, evt):
if evt.GetId() == wxID_SAVEAS or not self.dataFile:
- if self.dataFile: defaultName = ''
- else: defaultName = 'UNTITLED.xrc'
- dirname = os.path.dirname(self.dataFile)
- dlg = wxFileDialog(self, 'Save As', dirname, defaultName, '*.xrc',
+ if self.dataFile: name = ''
+ else: name = defaultName
+ dirname = os.path.abspath(os.path.dirname(self.dataFile))
+ dlg = wxFileDialog(self, 'Save As', dirname, name, '*.xrc',
wxSAVE | wxOVERWRITE_PROMPT | wxCHANGE_DIR)
if dlg.ShowModal() == wxID_OK:
path = dlg.GetPath()
else:
path = self.dataFile
self.SetStatusText('Saving...')
- wxYield()
wxBeginBusyCursor()
try:
try:
selected = tree.selection
if not selected: return # key pressed event
xxx = tree.GetPyData(selected)
- self.clipboard = xxx.element.cloneNode(True)
+ wx.TheClipboard.Open()
+ data = wx.CustomDataObject('XRCED')
+ data.SetData(cPickle.dumps(xxx.element.toxml()))
+ wx.TheClipboard.SetData(data)
+ wx.TheClipboard.Close()
self.SetStatusText('Copied')
def OnPaste(self, evt):
parentLeaf = selected
parent = tree.GetPyData(parentLeaf).treeObject()
- # Create a copy of clipboard element
- elem = self.clipboard.cloneNode(True)
+ # Create a copy of clipboard pickled element
+ wx.TheClipboard.Open()
+ data = wx.CustomDataObject('XRCED')
+ if not wx.TheClipboard.IsSupported(data.GetFormat()):
+ wx.TheClipboard.Close()
+ wx.LogError('unsupported clipboard format')
+ return
+ wx.TheClipboard.GetData(data)
+ wx.TheClipboard.Close()
+ xml = cPickle.loads(data.GetData()) # xml representation of element
+ elem = minidom.parseString(xml).childNodes[0]
# Tempopary xxx object to test things
xxx = MakeXXXFromDOM(parent, elem)
-
# Check compatibility
error = False
# Top-level
x = xxx.treeObject()
- if x.__class__ in [xxxDialog, xxxFrame, xxxMenuBar, xxxWizard]:
+ if x.__class__ in [xxxDialog, xxxFrame, xxxWizard]:
# Top-level classes
if parent.__class__ != xxxMainNode: error = True
+ elif x.__class__ == xxxMenuBar:
+ # Menubar can be put in frame or dialog
+ if parent.__class__ not in [xxxMainNode, xxxFrame, xxxDialog]: error = True
elif x.__class__ == xxxToolBar:
# Toolbar can be top-level of child of panel or frame
- if parent.__class__ not in [xxxMainNode, xxxPanel, xxxFrame]: error = True
+ if parent.__class__ not in [xxxMainNode, xxxPanel, xxxFrame] and \
+ not parent.isSizer: error = True
elif x.__class__ == xxxPanel and parent.__class__ == xxxMainNode:
pass
elif x.__class__ == xxxSpacer:
if not parent.__class__ in [xxxMainNode, xxxMenuBar, xxxMenu]: error = True
elif x.__class__ == xxxMenuItem:
if not parent.__class__ in [xxxMenuBar, xxxMenu]: error = True
- elif x.isSizer and parent.__class__ == xxxNotebook: error = True
+ elif x.isSizer and parent.__class__ in [xxxNotebook, xxxChoicebook, xxxListbook]:
+ error = True
else: # normal controls can be almost anywhere
if parent.__class__ == xxxMainNode or \
parent.__class__ in [xxxMenuBar, xxxMenu]: error = True
# If parent is sizer or notebook, child is of wrong class or
# parent is normal window, child is child container then detach child.
isChildContainer = isinstance(xxx, xxxChildContainer)
+ parentIsBook = parent.__class__ in [xxxNotebook, xxxChoicebook, xxxListbook]
if isChildContainer and \
((parent.isSizer and not isinstance(xxx, xxxSizerItem)) or \
- (isinstance(parent, xxxNotebook) and not isinstance(xxx, xxxNotebookPage)) or \
- not (parent.isSizer or isinstance(parent, xxxNotebook))):
+ (parentIsBook and not isinstance(xxx, xxxPage)) or \
+ not (parent.isSizer or parentIsBook)):
elem.removeChild(xxx.child.element) # detach child
elem.unlink() # delete child container
elem = xxx.child.element # replace
# Parent is sizer or notebook, child is not child container
if parent.isSizer and not isChildContainer and not isinstance(xxx, xxxSpacer):
# Create sizer item element
- sizerItemElem = MakeEmptyDOM('sizeritem')
+ sizerItemElem = MakeEmptyDOM(parent.itemTag)
sizerItemElem.appendChild(elem)
elem = sizerItemElem
elif isinstance(parent, xxxNotebook) and not isChildContainer:
pageElem = MakeEmptyDOM('notebookpage')
pageElem.appendChild(elem)
elem = pageElem
+ elif isinstance(parent, xxxChoicebook) and not isChildContainer:
+ pageElem = MakeEmptyDOM('choicebookpage')
+ pageElem.appendChild(elem)
+ elem = pageElem
+ elif isinstance(parent, xxxListbook) and not isChildContainer:
+ pageElem = MakeEmptyDOM('listbookpage')
+ pageElem.appendChild(elem)
+ elem = pageElem
# Insert new node, register undo
newItem = tree.InsertNode(parentLeaf, parent, elem, nextItem)
undoMan.RegisterUndo(UndoPasteCreate(parentLeaf, parent, newItem, selected))
tree.pendingHighLight = newItem
else:
tree.pendingHighLight = None
- self.modified = True
+ self.SetModified()
self.SetStatusText('Pasted')
def OnCutDelete(self, evt):
elem = tree.RemoveLeaf(selected)
undoMan.RegisterUndo(UndoCutDelete(index, parent, elem))
if evt.GetId() == wxID_CUT:
- if self.clipboard: self.clipboard.unlink()
- self.clipboard = elem.cloneNode(True)
+ wx.TheClipboard.Open()
+ data = wx.CustomDataObject('XRCED')
+ data.SetData(cPickle.dumps(elem.toxml()))
+ wx.TheClipboard.SetData(data)
+ wx.TheClipboard.Close()
tree.pendingHighLight = None
- tree.Unselect()
+ tree.UnselectAll()
+ tree.selection = None
+ # Update tools
+ g.tools.UpdateUI()
panel.Clear()
- self.modified = True
+ self.SetModified()
self.SetStatusText(status)
def OnSubclass(self, evt):
subclass = dlg.GetValue()
if subclass:
elem.setAttribute('subclass', subclass)
- self.modified = True
elif elem.hasAttribute('subclass'):
elem.removeAttribute('subclass')
- self.modified = True
+ self.SetModified()
xxx.subclass = elem.getAttribute('subclass')
tree.SetItemText(selected, xxx.treeName())
panel.pages[0].box.SetLabel(xxx.panelName())
sizePanel = panel.GetSize()
panel.Reparent(self.splitter)
self.miniFrame.GetSizer().Remove(panel)
- wxYield()
# Widen
self.SetDimensions(pos.x, pos.y, size.width + sizePanel.width, size.height)
self.splitter.SplitVertically(tree, panel, conf.sashPos)
self.miniFrame.Show(True)
self.miniFrame.SetDimensions(conf.panelX, conf.panelY,
conf.panelWidth, conf.panelHeight)
- wxYield()
# Reduce width
self.SetDimensions(pos.x, pos.y,
max(size.width - sizePanel.width, self.minWidth), size.height)
# Simple emulation of python command line
def OnDebugCMD(self, evt):
- import traceback
while 1:
try:
exec raw_input('C:\> ')
parent = tree.GetPyData(parentLeaf)
if parent.hasChild: parent = parent.child
- # Create element
- className = pullDownMenu.createMap[evt.GetId()]
- xxx = MakeEmptyXXX(parent, className)
+ # Create object_ref?
+ if evt.GetId() == ID_NEW.REF:
+ ref = wxGetTextFromUser('Create reference to:', 'Create reference')
+ if not ref: return
+ xxx = MakeEmptyRefXXX(parent, ref)
+ else:
+ # Create empty element
+ className = pullDownMenu.createMap[evt.GetId()]
+ xxx = MakeEmptyXXX(parent, className)
# Set default name for top-level windows
if parent.__class__ == xxxMainNode:
cl = xxx.treeObject().__class__
frame.maxIDs[cl] += 1
- xxx.treeObject().name = '%s%d' % (defaultIDs[cl], frame.maxIDs[cl])
- xxx.treeObject().element.setAttribute('name', xxx.treeObject().name)
+ 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
+ obj = xxx.treeObject()
+ elem = g.tree.dom.createElement('label')
+ elem.appendChild(g.tree.dom.createTextNode(pullDownMenu.stdButtonIDs[evt.GetId()][1]))
+ obj.params['label'] = xxxParam(elem)
+ xxx.treeObject().element.appendChild(elem)
# Insert new node, register undo
elem = xxx.element
else:
tree.pendingHighLight = None
tree.SetFocus()
- self.modified = True
+ self.SetModified()
# Replace one object with another
def OnReplace(self, evt):
xxx = tree.GetPyData(selected).treeObject()
elem = xxx.element
parent = elem.parentNode
- parentXXX = xxx.parent
+ undoMan.RegisterUndo(UndoReplace(selected))
# New class
className = pullDownMenu.createMap[evt.GetId() - 1000]
# Create temporary empty node (with default values)
dummy = MakeEmptyDOM(className)
- xxxClass = xxxDict[className]
+ if className == 'spacer' and xxx.className != 'spacer':
+ klass = xxxSpacer
+ elif xxx.className == 'spacer' and className != 'spacer':
+ klass = xxxSizerItem
+ else:
+ klass = xxxDict[className]
# Remove non-compatible children
- if tree.ItemHasChildren(selected) and not xxxClass.hasChildren:
+ if tree.ItemHasChildren(selected) and not klass.hasChildren:
tree.DeleteChildren(selected)
nodes = elem.childNodes[:]
tags = []
remove = False
tag = node.tagName
if tag == 'object':
- if not xxxClass.hasChildren:
- remove = True
- elif tag not in xxxClass.allParams and \
- (not xxxClass.hasStyle or tag not in xxxClass.styles):
+ if not klass.hasChildren: remove = True
+ elif tag not in klass.allParams and \
+ (not klass.hasStyle or tag not in klass.styles):
remove = True
else:
tags.append(tag)
elem.removeChild(node)
node.unlink()
- # Copy parameters present in dummy but not in elem
- for node in dummy.childNodes:
- tag = node.tagName
- if tag not in tags:
- elem.appendChild(node.cloneNode(True))
+ # Remove sizeritem child if spacer
+ if className == 'spacer' and xxx.className != 'spacer':
+ sizeritem = elem.parentNode
+ assert sizeritem.getAttribute('class') == 'sizeritem'
+ sizeritem.removeChild(elem)
+ elem.unlink()
+ elem = sizeritem
+ tree.GetPyData(selected).hasChild = false
+ elif xxx.className == 'spacer' and className != 'spacer':
+ # Create sizeritem element
+ assert xxx.parent.isSizer
+ elem.setAttribute('class', 'sizeritem')
+ node = MakeEmptyDOM(className)
+ elem.appendChild(node)
+ # Replace to point to new object
+ xxx = xxxSizerItem(xxx.parent, elem)
+ elem = node
+ tree.SetPyData(selected, xxx)
+ xxx = xxx.child
+ else:
+ # Copy parameters present in dummy but not in elem
+ for node in dummy.childNodes:
+ if node.tagName not in tags: elem.appendChild(node.cloneNode(True))
dummy.unlink()
+
# Change class name
- elem.setAttribute('class', className)
+ elem.setAttribute('class', className)
if elem.hasAttribute('subclass'):
elem.removeAttribute('subclass') # clear subclassing
# Re-create xxx element
- xxx = MakeXXXFromDOM(parentXXX, elem)
+ xxx = MakeXXXFromDOM(xxx.parent, elem)
# Update parent in child objects
if tree.ItemHasChildren(selected):
i, cookie = tree.GetFirstChild(selected)
x.parent = xxx
if x.hasChild: x.child.parent = xxx
i, cookie = tree.GetNextChild(selected, cookie)
-
+
# Update tree
if tree.GetPyData(selected).hasChild: # child container
container = tree.GetPyData(selected)
container.child = xxx
container.hasChildren = xxx.hasChildren
container.isSizer = xxx.isSizer
+ xxx = container
else:
tree.SetPyData(selected, xxx)
tree.SetItemText(selected, xxx.treeName())
if parent.__class__ == xxxMainNode:
cl = xxx.treeObject().__class__
frame.maxIDs[cl] += 1
- xxx.treeObject().name = '%s%d' % (defaultIDs[cl], frame.maxIDs[cl])
- xxx.treeObject().element.setAttribute('name', xxx.treeObject().name)
+ xxx.setTreeName('%s%d' % (defaultIDs[cl], frame.maxIDs[cl]))
# Update panel
g.panel.SetData(xxx)
else:
tree.pendingHighLight = None
tree.SetFocus()
- self.modified = True
+ self.SetModified()
# Expand/collapse subtree
def OnExpand(self, evt):
def OnUpdateUI(self, evt):
if evt.GetId() in [wxID_CUT, wxID_COPY, self.ID_DELETE]:
evt.Enable(tree.selection is not None and tree.selection != tree.root)
+ elif evt.GetId() == wxID_SAVE:
+ evt.Enable(self.modified)
elif evt.GetId() in [wxID_PASTE, self.ID_TOOL_PASTE]:
- evt.Enable((self.clipboard and tree.selection) != None)
+ evt.Enable(tree.selection is not None)
elif evt.GetId() == self.ID_TEST:
evt.Enable(tree.selection is not None and tree.selection != tree.root)
elif evt.GetId() in [self.ID_LOCATE, self.ID_TOOL_LOCATE]:
def OnIdle(self, evt):
if self.inIdle: return # Recursive call protection
self.inIdle = True
- if tree.needUpdate:
- if conf.autoRefresh:
- if g.testWin:
- self.SetStatusText('Refreshing test window...')
- # (re)create
- tree.CreateTestWin(g.testWin.item)
- wxYield()
- self.SetStatusText('')
- tree.needUpdate = False
- elif tree.pendingHighLight:
- tree.HighLight(tree.pendingHighLight)
- else:
- evt.Skip()
- self.inIdle = False
+ try:
+ if tree.needUpdate:
+ if conf.autoRefresh:
+ if g.testWin:
+ self.SetStatusText('Refreshing test window...')
+ # (re)create
+ tree.CreateTestWin(g.testWin.item)
+ self.SetStatusText('')
+ tree.needUpdate = False
+ elif tree.pendingHighLight:
+ try:
+ tree.HighLight(tree.pendingHighLight)
+ except:
+ # Remove highlight if any problem
+ if g.testWin.highLight:
+ g.testWin.highLight.Remove()
+ tree.pendingHighLight = None
+ raise
+ else:
+ evt.Skip()
+ finally:
+ self.inIdle = False
# We don't let close panel window
def OnCloseMiniFrame(self, evt):
return
+ def OnIconize(self, evt):
+ conf.x, conf.y = self.GetPosition()
+ conf.width, conf.height = self.GetSize()
+ if conf.embedPanel:
+ conf.sashPos = self.splitter.GetSashPosition()
+ else:
+ conf.panelX, conf.panelY = self.miniFrame.GetPosition()
+ conf.panelWidth, conf.panelHeight = self.miniFrame.GetSize()
+ self.miniFrame.Iconize()
+ evt.Skip()
+
def OnCloseWindow(self, evt):
if not self.AskSave(): return
if g.testWin: g.testWin.Destroy()
def Clear(self):
self.dataFile = ''
- if self.clipboard:
- self.clipboard.unlink()
- self.clipboard = None
undoMan.Clear()
- self.modified = False
+ self.SetModified(False)
tree.Clear()
panel.Clear()
if g.testWin:
g.testWin.Destroy()
g.testWin = None
- self.SetTitle(progname)
# Numbers for new controls
self.maxIDs = {}
- self.maxIDs[xxxPanel] = self.maxIDs[xxxDialog] = self.maxIDs[xxxFrame] = \
- self.maxIDs[xxxMenuBar] = self.maxIDs[xxxMenu] = self.maxIDs[xxxToolBar] = \
- self.maxIDs[xxxWizard] = 0
+ for cl in [xxxPanel, xxxDialog, xxxFrame,
+ xxxMenuBar, xxxMenu, xxxToolBar,
+ xxxWizard, xxxBitmap, xxxIcon]:
+ self.maxIDs[cl] = 0
+
+ def SetModified(self, state=True):
+ self.modified = state
+ name = os.path.basename(self.dataFile)
+ if not name: name = defaultName
+ if state:
+ self.SetTitle(progname + ': ' + name + ' *')
+ else:
+ self.SetTitle(progname + ': ' + name)
def Open(self, path):
if not os.path.exists(path):
#self.domCopy = tree.dom.cloneNode(True)
self.domCopy = MyDocument()
mainNode = self.domCopy.appendChild(tree.mainNode.cloneNode(True))
+ # Remove first child (test element)
+ testElem = mainNode.firstChild
+ mainNode.removeChild(testElem)
+ testElem.unlink()
self.Indent(mainNode)
self.domCopy.writexml(f, encoding = g.currentEncoding)
f.close()
self.domCopy.unlink()
self.domCopy = None
- self.modified = False
+ self.SetModified(False)
panel.SetModified(False)
except:
+ inf = sys.exc_info()
+ wxLogError(traceback.format_exception(inf[0], inf[1], None)[-1])
wxLogError('Error writing file: %s' % path)
raise
# If save was successful, modified flag is unset
if not self.modified: return True
elif say == wxID_NO:
- self.modified = False
+ self.SetModified(False)
panel.SetModified(False)
return True
return False
class App(wxApp):
def OnInit(self):
+ # Check version
+ if wxVERSION[:3] < MinWxVersion:
+ wxLogWarning('''\
+This version of XRCed may not work correctly on your version of wxWindows. \
+Please upgrade wxWindows to %d.%d.%d or higher.''' % MinWxVersion)
global debug
# Process comand-line
opts = args = None
projects / wxWidgets.git / blobdiff