X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6c75a4cf0f94cbe53bfde4fbcddff741158fbc7c..46ae103b9f08fc4e447d16a6a92b03cf55ee3189:/wxPython/wx/tools/XRCed/xrced.py?ds=sidebyside diff --git a/wxPython/wx/tools/XRCed/xrced.py b/wxPython/wx/tools/XRCed/xrced.py index fed12e47c4..a68597b7fd 100644 --- a/wxPython/wx/tools/XRCed/xrced.py +++ b/wxPython/wx/tools/XRCed/xrced.py @@ -20,7 +20,6 @@ Options: -v output version info and exit """ - from globals import * import os, sys, getopt, re, traceback, tempfile, shutil @@ -57,6 +56,8 @@ defaultIDs = {xxxPanel:'PANEL', xxxDialog:'DIALOG', xxxFrame:'FRAME', xxxMenuBar:'MENUBAR', xxxMenu:'MENU', xxxToolBar:'TOOLBAR', xxxWizard:'WIZARD'} +defaultName = 'UNTITLED.xrc' + ################################################################################ # ScrolledMessageDialog - modified from wxPython lib to set fixed-width font @@ -100,7 +101,7 @@ class Frame(wxFrame): # 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: @@ -176,17 +177,16 @@ class Frame(wxFrame): # Create toolbar tb = self.CreateToolBar(wxTB_HORIZONTAL | wxNO_BORDER | wxTB_FLAT) - tsize = (24,23) - new_bmp = wx.ArtProvider.GetBitmap(wx.ART_NORMAL_FILE, wx.ART_TOOLBAR, tsize) - open_bmp = wx.ArtProvider.GetBitmap(wx.ART_FILE_OPEN, wx.ART_TOOLBAR, tsize) - save_bmp = wx.ArtProvider.GetBitmap(wx.ART_FILE_SAVE, wx.ART_TOOLBAR, tsize) - undo_bmp = wx.ArtProvider.GetBitmap(wx.ART_UNDO, wx.ART_TOOLBAR, tsize) - redo_bmp = wx.ArtProvider.GetBitmap(wx.ART_REDO, wx.ART_TOOLBAR, tsize) - cut_bmp = wx.ArtProvider.GetBitmap(wx.ART_CUT, wx.ART_TOOLBAR, tsize) - copy_bmp = wx.ArtProvider.GetBitmap(wx.ART_COPY, wx.ART_TOOLBAR, tsize) - paste_bmp= wx.ArtProvider.GetBitmap(wx.ART_PASTE, wx.ART_TOOLBAR, tsize) + tb.SetToolBitmapSize((24,24)) + 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) + redo_bmp = wx.ArtProvider.GetBitmap(wx.ART_REDO, wx.ART_TOOLBAR) + cut_bmp = wx.ArtProvider.GetBitmap(wx.ART_CUT, wx.ART_TOOLBAR) + copy_bmp = wx.ArtProvider.GetBitmap(wx.ART_COPY, wx.ART_TOOLBAR) + paste_bmp= wx.ArtProvider.GetBitmap(wx.ART_PASTE, wx.ART_TOOLBAR) - tb.SetToolBitmapSize(tsize) tb.AddSimpleTool(wxID_NEW, new_bmp, 'New', 'New file') tb.AddSimpleTool(wxID_OPEN, open_bmp, 'Open', 'Open file') tb.AddSimpleTool(wxID_SAVE, save_bmp, 'Save', 'Save file') @@ -198,9 +198,9 @@ class Frame(wxFrame): tb.AddSimpleTool(wxID_COPY, copy_bmp, 'Copy', 'Copy') tb.AddSimpleTool(self.ID_TOOL_PASTE, paste_bmp, 'Paste', 'Paste') tb.AddControl(wxStaticLine(tb, -1, size=(-1,23), style=wxLI_VERTICAL)) - tb.AddCheckTool(self.ID_TOOL_LOCATE, - images.getLocateBitmap(), images.getLocateArmedBitmap(), - 'Locate', 'Locate control in test window and select it') + tb.AddSimpleTool(self.ID_TOOL_LOCATE, + images.getLocateBitmap(), #images.getLocateArmedBitmap(), + 'Locate', 'Locate control in test window and select it', True) tb.AddControl(wxStaticLine(tb, -1, size=(-1,23), style=wxLI_VERTICAL)) tb.AddSimpleTool(self.ID_TEST, images.getTestBitmap(), 'Test', 'Test window') tb.AddSimpleTool(self.ID_REFRESH, images.getRefreshBitmap(), @@ -243,6 +243,7 @@ class Frame(wxFrame): 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) @@ -280,7 +281,7 @@ class Frame(wxFrame): # !!! 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 @@ -313,6 +314,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 @@ -346,7 +348,6 @@ class Frame(wxFrame): if dlg.ShowModal() == wxID_OK: path = dlg.GetPath() self.SetStatusText('Loading...') - wxYield() wxBeginBusyCursor() try: if self.Open(path): @@ -360,10 +361,10 @@ class Frame(wxFrame): 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() @@ -374,7 +375,6 @@ class Frame(wxFrame): else: path = self.dataFile self.SetStatusText('Saving...') - wxYield() wxBeginBusyCursor() try: try: @@ -457,7 +457,8 @@ class Frame(wxFrame): if parent.__class__ != xxxMainNode: 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: @@ -498,7 +499,7 @@ class Frame(wxFrame): # 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: @@ -521,7 +522,7 @@ class Frame(wxFrame): tree.pendingHighLight = newItem else: tree.pendingHighLight = None - self.modified = True + self.SetModified() self.SetStatusText('Pasted') def OnCutDelete(self, evt): @@ -555,9 +556,12 @@ class Frame(wxFrame): if self.clipboard: self.clipboard.unlink() self.clipboard = elem.cloneNode(True) 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): @@ -570,10 +574,9 @@ class Frame(wxFrame): 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()) @@ -590,7 +593,6 @@ class Frame(wxFrame): 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) @@ -608,7 +610,6 @@ class Frame(wxFrame): 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) @@ -717,7 +718,6 @@ Homepage: http://xrced.sourceforge.net\ # Simple emulation of python command line def OnDebugCMD(self, evt): - import traceback while 1: try: exec raw_input('C:\> ') @@ -757,16 +757,30 @@ Homepage: http://xrced.sourceforge.net\ 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 @@ -785,7 +799,7 @@ Homepage: http://xrced.sourceforge.net\ else: tree.pendingHighLight = None tree.SetFocus() - self.modified = True + self.SetModified() # Replace one object with another def OnReplace(self, evt): @@ -793,14 +807,19 @@ Homepage: http://xrced.sourceforge.net\ 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 = [] @@ -809,10 +828,9 @@ Homepage: http://xrced.sourceforge.net\ 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) @@ -820,18 +838,37 @@ Homepage: http://xrced.sourceforge.net\ 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) @@ -840,13 +877,14 @@ Homepage: http://xrced.sourceforge.net\ 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()) @@ -856,8 +894,7 @@ Homepage: http://xrced.sourceforge.net\ 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) @@ -873,7 +910,7 @@ Homepage: http://xrced.sourceforge.net\ else: tree.pendingHighLight = None tree.SetFocus() - self.modified = True + self.SetModified() # Expand/collapse subtree def OnExpand(self, evt): @@ -895,6 +932,8 @@ Homepage: http://xrced.sourceforge.net\ 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) elif evt.GetId() == self.ID_TEST: @@ -913,7 +952,6 @@ Homepage: http://xrced.sourceforge.net\ self.SetStatusText('Refreshing test window...') # (re)create tree.CreateTestWin(g.testWin.item) - wxYield() self.SetStatusText('') tree.needUpdate = False elif tree.pendingHighLight: @@ -926,6 +964,17 @@ Homepage: http://xrced.sourceforge.net\ 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() @@ -950,19 +999,27 @@ Homepage: http://xrced.sourceforge.net\ 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 + 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): wxLogError('File does not exists: %s' % path) @@ -977,6 +1034,8 @@ Homepage: http://xrced.sourceforge.net\ if dom.encoding: g.currentEncoding = dom.encoding wx.SetDefaultPyEncoding(g.currentEncoding.encode()) + else: + g.currentEncoding = '' # Change dir self.dataFile = path = os.path.abspath(path) dir = os.path.dirname(path) @@ -1016,22 +1075,28 @@ Homepage: http://xrced.sourceforge.net\ if tree.selection and panel.IsModified(): self.OnRefresh(wxCommandEvent()) if g.currentEncoding: - f = codecs.open(path, 'w', g.currentEncoding) + f = codecs.open(path, 'wt', g.currentEncoding) else: - f = codecs.open(path, 'w') + f = codecs.open(path, 'wt') # Make temporary copy for formatting it # !!! We can't clone dom node, it works only once #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 @@ -1047,7 +1112,7 @@ Homepage: http://xrced.sourceforge.net\ # 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