X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fd91945141be5443ca353a44cb7a6b551f7eaa85..d0ee33f5c6908b4ac5e1364381f0ef00942e3936:/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 003eca63d2..1cdb52788e 100644 --- a/wxPython/wx/tools/XRCed/xrced.py +++ b/wxPython/wx/tools/XRCed/xrced.py @@ -22,7 +22,7 @@ Options: from globals import * -import os, sys, getopt, re, traceback +import os, sys, getopt, re, traceback, tempfile, shutil # Local modules from tree import * # imports xxx which imports params @@ -54,7 +54,8 @@ Consult README file for the details. """ defaultIDs = {xxxPanel:'PANEL', xxxDialog:'DIALOG', xxxFrame:'FRAME', - xxxMenuBar:'MENUBAR', xxxMenu:'MENU', xxxToolBar:'TOOLBAR'} + xxxMenuBar:'MENUBAR', xxxMenu:'MENU', xxxToolBar:'TOOLBAR', + xxxWizard:'WIZARD'} ################################################################################ @@ -72,6 +73,7 @@ class ScrolledMessageDialog(wxDialog): ok = wxButton(self, wxID_OK, "OK") text.SetConstraints(Layoutf('t=t5#1;b=t5#2;l=l5#1;r=r5#1', (self,ok))) text.SetSize((w * 80 + 30, h * 40)) + text.ShowPosition(1) ok.SetConstraints(Layoutf('b=b5#1;x%w50#1;w!80;h!25', (self,))) self.SetAutoLayout(True) self.Fit() @@ -96,6 +98,14 @@ class Frame(wxFrame): # Idle flag self.inIdle = False + # Load our own resources + self.res = wxXmlResource('') + # !!! Blocking of assert failure occurring in older unicode builds + try: + self.res.Load(os.path.join(basePath, 'xrced.xrc')) + except wx._core.PyAssertionError: + print 'PyAssertionError was ignored' + # Make menus menuBar = wxMenuBar() @@ -123,8 +133,10 @@ class Frame(wxFrame): menu.Append(wxID_PASTE, '&Paste\tCtrl-V', 'Paste from the clipboard') self.ID_DELETE = wxNewId() menu.Append(self.ID_DELETE, '&Delete\tCtrl-D', 'Delete object') -# menu.AppendSeparator() + menu.AppendSeparator() self.ID_LOCATE = wxNewId() + self.ID_TOOL_LOCATE = wxNewId() + self.ID_TOOL_PASTE = wxNewId() menu.Append(self.ID_LOCATE, '&Locate\tCtrl-L', 'Locate control in test window and select it') menuBar.Append(menu, '&Edit') @@ -145,6 +157,8 @@ class Frame(wxFrame): menu.Append(self.ID_AUTO_REFRESH, '&Auto-refresh\tCtrl-A', 'Toggle auto-refresh mode', True) menu.Check(self.ID_AUTO_REFRESH, conf.autoRefresh) + self.ID_TEST_HIDE = wxNewId() + menu.Append(self.ID_TEST_HIDE, '&Hide\tCtrl-H', 'Close test window') menuBar.Append(menu, '&View') menu = wxMenu() @@ -162,17 +176,30 @@ class Frame(wxFrame): # Create toolbar tb = self.CreateToolBar(wxTB_HORIZONTAL | wxNO_BORDER | wxTB_FLAT) - tb.SetToolBitmapSize((24, 23)) - tb.AddSimpleTool(wxID_NEW, images.getNewBitmap(), 'New', 'New file') - tb.AddSimpleTool(wxID_OPEN, images.getOpenBitmap(), 'Open', 'Open file') - tb.AddSimpleTool(wxID_SAVE, images.getSaveBitmap(), 'Save', 'Save file') + tb.SetToolBitmapSize((24,24)) + new_bmp = wx.ArtProvider.GetBitmap(wx.ART_NEW, 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.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') + tb.AddControl(wxStaticLine(tb, -1, size=(-1,23), style=wxLI_VERTICAL)) + tb.AddSimpleTool(wxID_UNDO, undo_bmp, 'Undo', 'Undo') + tb.AddSimpleTool(wxID_REDO, redo_bmp, 'Redo', 'Redo') tb.AddControl(wxStaticLine(tb, -1, size=(-1,23), style=wxLI_VERTICAL)) - tb.AddSimpleTool(wxID_UNDO, images.getUndoBitmap(), 'Undo', 'Undo') - tb.AddSimpleTool(wxID_REDO, images.getRedoBitmap(), 'Redo', 'Redo') + tb.AddSimpleTool(wxID_CUT, cut_bmp, 'Cut', 'Cut') + 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.AddSimpleTool(wxID_CUT, images.getCutBitmap(), 'Cut', 'Cut') - tb.AddSimpleTool(wxID_COPY, images.getCopyBitmap(), 'Copy', 'Copy') - tb.AddSimpleTool(wxID_PASTE, images.getPasteBitmap(), 'Paste', 'Paste') + 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(), @@ -183,6 +210,7 @@ class Frame(wxFrame): tb.AddSeparator() # otherwise auto-refresh sticks in status line tb.ToggleTool(self.ID_AUTO_REFRESH, conf.autoRefresh) tb.Realize() + self.tb = tb self.minWidth = tb.GetSize()[0] # minimal width is the size of toolbar @@ -198,14 +226,17 @@ class Frame(wxFrame): EVT_MENU(self, wxID_CUT, self.OnCutDelete) EVT_MENU(self, wxID_COPY, self.OnCopy) EVT_MENU(self, wxID_PASTE, self.OnPaste) + EVT_MENU(self, self.ID_TOOL_PASTE, self.OnPaste) EVT_MENU(self, self.ID_DELETE, self.OnCutDelete) EVT_MENU(self, self.ID_LOCATE, self.OnLocate) + EVT_MENU(self, self.ID_TOOL_LOCATE, self.OnLocate) # View EVT_MENU(self, self.ID_EMBED_PANEL, self.OnEmbedPanel) EVT_MENU(self, self.ID_SHOW_TOOLS, self.OnShowTools) EVT_MENU(self, self.ID_TEST, self.OnTest) EVT_MENU(self, self.ID_REFRESH, self.OnRefresh) EVT_MENU(self, self.ID_AUTO_REFRESH, self.OnAutoRefresh) + EVT_MENU(self, self.ID_TEST_HIDE, self.OnTestHide) # Help EVT_MENU(self, wxID_ABOUT, self.OnAbout) EVT_MENU(self, self.ID_README, self.OnReadme) @@ -214,6 +245,9 @@ class Frame(wxFrame): EVT_UPDATE_UI(self, wxID_CUT, self.OnUpdateUI) EVT_UPDATE_UI(self, wxID_COPY, self.OnUpdateUI) EVT_UPDATE_UI(self, wxID_PASTE, self.OnUpdateUI) + EVT_UPDATE_UI(self, self.ID_LOCATE, self.OnUpdateUI) + EVT_UPDATE_UI(self, self.ID_TOOL_LOCATE, self.OnUpdateUI) + EVT_UPDATE_UI(self, self.ID_TOOL_PASTE, self.OnUpdateUI) EVT_UPDATE_UI(self, wxID_UNDO, self.OnUpdateUI) EVT_UPDATE_UI(self, wxID_REDO, self.OnUpdateUI) EVT_UPDATE_UI(self, self.ID_DELETE, self.OnUpdateUI) @@ -313,12 +347,14 @@ class Frame(wxFrame): self.SetStatusText('Loading...') wxYield() wxBeginBusyCursor() - if self.Open(path): - self.SetStatusText('Data loaded') - else: - self.SetStatusText('Failed') - self.SaveRecent(path) - wxEndBusyCursor() + try: + if self.Open(path): + self.SetStatusText('Data loaded') + else: + self.SetStatusText('Failed') + self.SaveRecent(path) + finally: + wxEndBusyCursor() dlg.Destroy() def OnSaveOrSaveAs(self, evt): @@ -340,13 +376,18 @@ class Frame(wxFrame): wxYield() wxBeginBusyCursor() try: - self.Save(path) - self.dataFile = path - self.SetStatusText('Data saved') - self.SaveRecent(path) - except IOError: - self.SetStatusText('Failed') - wxEndBusyCursor() + try: + tmpFile,tmpName = tempfile.mkstemp(prefix='xrced-') + os.close(tmpFile) + self.Save(tmpName) # save temporary file first + shutil.move(tmpName, path) + self.dataFile = path + self.SetStatusText('Data saved') + self.SaveRecent(path) + except IOError: + self.SetStatusText('Failed') + finally: + wxEndBusyCursor() def SaveRecent(self,path): # append to recently used files @@ -379,7 +420,11 @@ class Frame(wxFrame): selected = tree.selection if not selected: return # key pressed event # For pasting with Ctrl pressed + appendChild = True if evt.GetId() == pullDownMenu.ID_PASTE_SIBLING: appendChild = False + elif evt.GetId() == self.ID_TOOL_PASTE: + if g.tree.ctrl: appendChild = False + else: appendChild = not tree.NeedInsert(selected) else: appendChild = not tree.NeedInsert(selected) xxx = tree.GetPyData(selected) if not appendChild: @@ -406,7 +451,7 @@ class Frame(wxFrame): error = False # Top-level x = xxx.treeObject() - if x.__class__ in [xxxDialog, xxxFrame, xxxMenuBar]: + if x.__class__ in [xxxDialog, xxxFrame, xxxMenuBar, xxxWizard]: # Top-level classes if parent.__class__ != xxxMainNode: error = True elif x.__class__ == xxxToolBar: @@ -580,6 +625,9 @@ class Frame(wxFrame): if not tree.selection: return # key pressed event tree.ShowTestWindow(tree.selection) + def OnTestHide(self, evt): + tree.CloseTestWindow() + # Find object by relative position def FindObject(self, item, obj): # We simply perform depth-first traversal, sinse it's too much @@ -602,6 +650,11 @@ class Frame(wxFrame): item = self.FindObject(g.testWin.item, evt.GetEventObject()) if item: tree.SelectItem(item) + self.tb.ToggleTool(self.ID_TOOL_LOCATE, False) + if item: + self.SetStatusText('Selected %s' % tree.GetItemText(item)) + else: + self.SetStatusText('Locate failed!') def SetHandler(self, w, h=None): if h: @@ -615,8 +668,16 @@ class Frame(wxFrame): def OnLocate(self, evt): if g.testWin: - self.SetHandler(g.testWin, g.testWin) - g.testWin.Connect(wxID_ANY, wxID_ANY, wxEVT_LEFT_DOWN, self.OnTestWinLeftDown) + if evt.GetId() == self.ID_LOCATE or \ + evt.GetId() == self.ID_TOOL_LOCATE and evt.IsChecked(): + self.SetHandler(g.testWin, g.testWin) + g.testWin.Connect(wxID_ANY, wxID_ANY, wxEVT_LEFT_DOWN, self.OnTestWinLeftDown) + if evt.GetId() == self.ID_LOCATE: + self.tb.ToggleTool(self.ID_TOOL_LOCATE, True) + elif evt.GetId() == self.ID_TOOL_LOCATE and not evt.IsChecked(): + self.SetHandler(g.testWin, None) + g.testWin.Disconnect(wxID_ANY, wxID_ANY, wxEVT_LEFT_DOWN) + self.SetStatusText('Click somewhere in your test window now') def OnRefresh(self, evt): # If modified, apply first @@ -743,6 +804,7 @@ Homepage: http://xrced.sourceforge.net\ nodes = elem.childNodes[:] tags = [] for node in nodes: + if node.nodeType != minidom.Node.ELEMENT_NODE: continue remove = False tag = node.tagName if tag == 'object': @@ -765,6 +827,8 @@ Homepage: http://xrced.sourceforge.net\ dummy.unlink() # Change class name elem.setAttribute('class', className) + if elem.hasAttribute('subclass'): + elem.removeAttribute('subclass') # clear subclassing # Re-create xxx element xxx = MakeXXXFromDOM(parentXXX, elem) # Update parent in child objects @@ -830,10 +894,12 @@ 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_PASTE: + elif evt.GetId() in [wxID_PASTE, self.ID_TOOL_PASTE]: evt.Enable((self.clipboard and tree.selection) != 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]: + evt.Enable(g.testWin is not None) elif evt.GetId() == wxID_UNDO: evt.Enable(undoMan.CanUndo()) elif evt.GetId() == wxID_REDO: evt.Enable(undoMan.CanRedo()) @@ -893,7 +959,8 @@ Homepage: http://xrced.sourceforge.net\ # Numbers for new controls self.maxIDs = {} self.maxIDs[xxxPanel] = self.maxIDs[xxxDialog] = self.maxIDs[xxxFrame] = \ - self.maxIDs[xxxMenuBar] = self.maxIDs[xxxMenu] = self.maxIDs[xxxToolBar] = 0 + self.maxIDs[xxxMenuBar] = self.maxIDs[xxxMenu] = self.maxIDs[xxxToolBar] = \ + self.maxIDs[xxxWizard] = 0 def Open(self, path): if not os.path.exists(path): @@ -905,8 +972,12 @@ Homepage: http://xrced.sourceforge.net\ self.Clear() dom = minidom.parse(f) f.close() - # Set encoding global variable - if dom.encoding: g.currentEncoding = dom.encoding + # Set encoding global variable and default encoding + 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) @@ -918,6 +989,7 @@ Homepage: http://xrced.sourceforge.net\ inf = sys.exc_info() wxLogError(traceback.format_exception(inf[0], inf[1], None)[-1]) wxLogError('Error reading file: %s' % path) + if debug: raise return False return True @@ -944,7 +1016,10 @@ Homepage: http://xrced.sourceforge.net\ # Apply changes if tree.selection and panel.IsModified(): self.OnRefresh(wxCommandEvent()) - f = codecs.open(path, 'w', g.currentEncoding) + if g.currentEncoding: + f = codecs.open(path, 'wt', g.currentEncoding) + else: + 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) @@ -990,8 +1065,8 @@ class App(wxApp): def OnInit(self): global debug # Process comand-line + opts = args = None try: - opts = args = None opts, args = getopt.getopt(sys.argv[1:], 'dhiv') for o,a in opts: if o == '-h': @@ -1039,13 +1114,6 @@ class App(wxApp): # Create main frame frame = Frame(pos, size) frame.Show(True) - # Load resources from XRC file (!!! should be transformed to .py later?) - frame.res = wxXmlResource('') - # !!! Temporary blocking of assert failure occuring in unicode build - try: - frame.res.Load(os.path.join(basePath, 'xrced.xrc')) - except wx._core.PyAssertionError: - pass # Load file after showing if args: