X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/baba4aa5ece7924db50d1cb1390deec695a6b028..4b84311a447b8df710ac221d38e53aa11f1392d1:/wxPython/wx/tools/XRCed/xrced.py diff --git a/wxPython/wx/tools/XRCed/xrced.py b/wxPython/wx/tools/XRCed/xrced.py index 5ef935b9f3..ac593cb6e9 100644 --- a/wxPython/wx/tools/XRCed/xrced.py +++ b/wxPython/wx/tools/XRCed/xrced.py @@ -21,7 +21,7 @@ Options: """ 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 @@ -54,7 +54,7 @@ Consult README file for the details. defaultIDs = {xxxPanel:'PANEL', xxxDialog:'DIALOG', xxxFrame:'FRAME', xxxMenuBar:'MENUBAR', xxxMenu:'MENU', xxxToolBar:'TOOLBAR', - xxxWizard:'WIZARD'} + xxxWizard:'WIZARD', xxxBitmap:'BITMAP', xxxIcon:'ICON'} defaultName = 'UNTITLED.xrc' @@ -207,8 +207,8 @@ class Frame(wxFrame): '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() @@ -306,7 +306,6 @@ class Frame(wxFrame): self.SetSizer(sizer) # Initialize - self.clipboard = None self.Clear() # Other events @@ -314,6 +313,7 @@ class Frame(wxFrame): 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 @@ -413,7 +413,11 @@ class Frame(wxFrame): 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): @@ -442,18 +446,29 @@ class Frame(wxFrame): 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] and \ @@ -470,7 +485,8 @@ class Frame(wxFrame): 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 @@ -485,10 +501,11 @@ class Frame(wxFrame): # 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 @@ -505,6 +522,14 @@ class Frame(wxFrame): 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)) @@ -552,8 +577,11 @@ class Frame(wxFrame): 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.UnselectAll() tree.selection = None @@ -934,7 +962,7 @@ Homepage: http://xrced.sourceforge.net\ 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]: @@ -945,24 +973,44 @@ Homepage: http://xrced.sourceforge.net\ 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) - 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() @@ -983,9 +1031,6 @@ Homepage: http://xrced.sourceforge.net\ def Clear(self): self.dataFile = '' - if self.clipboard: - self.clipboard.unlink() - self.clipboard = None undoMan.Clear() self.SetModified(False) tree.Clear() @@ -995,9 +1040,10 @@ Homepage: http://xrced.sourceforge.net\ g.testWin = None # 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 @@ -1071,6 +1117,10 @@ Homepage: http://xrced.sourceforge.net\ #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() @@ -1111,6 +1161,11 @@ def usage(): 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