X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/289128a4fb1383e46d3478d605bd574a89aeb548..b843b628c9f936d6a87ca1e9b91e88a4604270c4:/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 82b35c6e8f..003eca63d2 100644 --- a/wxPython/wx/tools/XRCed/xrced.py +++ b/wxPython/wx/tools/XRCed/xrced.py @@ -79,6 +79,11 @@ class ScrolledMessageDialog(wxDialog): ################################################################################ +# Event handler for using during location +class Locator(wxEvtHandler): + def ProcessEvent(self, evt): + print evt + class Frame(wxFrame): def __init__(self, pos, size): wxFrame.__init__(self, None, -1, '', pos, size) @@ -96,11 +101,17 @@ class Frame(wxFrame): menu = wxMenu() menu.Append(wxID_NEW, '&New\tCtrl-N', 'New file') + menu.AppendSeparator() menu.Append(wxID_OPEN, '&Open...\tCtrl-O', 'Open XRC file') + self.recentMenu = wxMenu() + self.AppendRecent(self.recentMenu) + menu.AppendMenu(-1, 'Open Recent', self.recentMenu, 'Open a recent file') + menu.AppendSeparator() menu.Append(wxID_SAVE, '&Save\tCtrl-S', 'Save XRC file') menu.Append(wxID_SAVEAS, 'Save &As...', 'Save XRC file under different name') menu.AppendSeparator() menu.Append(wxID_EXIT, '&Quit\tCtrl-Q', 'Exit application') + menuBar.Append(menu, '&File') menu = wxMenu() @@ -113,8 +124,8 @@ class Frame(wxFrame): self.ID_DELETE = wxNewId() menu.Append(self.ID_DELETE, '&Delete\tCtrl-D', 'Delete object') # menu.AppendSeparator() - ID_SELECT = wxNewId() -# menu.Append(ID_SELECT, '&Select', 'Select object') + self.ID_LOCATE = wxNewId() + menu.Append(self.ID_LOCATE, '&Locate\tCtrl-L', 'Locate control in test window and select it') menuBar.Append(menu, '&Edit') menu = wxMenu() @@ -127,7 +138,7 @@ class Frame(wxFrame): menu.Check(self.ID_SHOW_TOOLS, conf.showTools) menu.AppendSeparator() self.ID_TEST = wxNewId() - menu.Append(self.ID_TEST, '&Test\tF5', 'Test window') + menu.Append(self.ID_TEST, '&Test\tF5', 'Show test window') self.ID_REFRESH = wxNewId() menu.Append(self.ID_REFRESH, '&Refresh\tCtrl-R', 'Refresh test window') self.ID_AUTO_REFRESH = wxNewId() @@ -188,7 +199,7 @@ class Frame(wxFrame): EVT_MENU(self, wxID_COPY, self.OnCopy) EVT_MENU(self, wxID_PASTE, self.OnPaste) EVT_MENU(self, self.ID_DELETE, self.OnCutDelete) - EVT_MENU(self, ID_SELECT, self.OnSelect) + EVT_MENU(self, self.ID_LOCATE, self.OnLocate) # View EVT_MENU(self, self.ID_EMBED_PANEL, self.OnEmbedPanel) EVT_MENU(self, self.ID_SHOW_TOOLS, self.OnShowTools) @@ -265,9 +276,29 @@ class Frame(wxFrame): # Other events EVT_IDLE(self, self.OnIdle) EVT_CLOSE(self, self.OnCloseWindow) - EVT_LEFT_DOWN(self, self.OnLeftDown) EVT_KEY_DOWN(self, tools.OnKeyDown) EVT_KEY_UP(self, tools.OnKeyUp) + + def AppendRecent(self, menu): + # add recently used files to the menu + for id,name in conf.recentfiles.iteritems(): + menu.Append(id,name) + EVT_MENU(self,id,self.OnRecentFile) + return + + def OnRecentFile(self,evt): + # open recently used file + if not self.AskSave(): return + wxBeginBusyCursor() + try: + path=conf.recentfiles[evt.GetId()] + if self.Open(path): + self.SetStatusText('Data loaded') + else: + self.SetStatusText('Failed') + except KeyError: + self.SetStatusText('No such file') + wxEndBusyCursor() def OnNew(self, evt): if not self.AskSave(): return @@ -286,6 +317,7 @@ class Frame(wxFrame): self.SetStatusText('Data loaded') else: self.SetStatusText('Failed') + self.SaveRecent(path) wxEndBusyCursor() dlg.Destroy() @@ -293,8 +325,8 @@ class Frame(wxFrame): if evt.GetId() == wxID_SAVEAS or not self.dataFile: if self.dataFile: defaultName = '' else: defaultName = 'UNTITLED.xrc' - dlg = wxFileDialog(self, 'Save As', os.path.dirname(self.dataFile), - defaultName, '*.xrc', + dirname = os.path.dirname(self.dataFile) + dlg = wxFileDialog(self, 'Save As', dirname, defaultName, '*.xrc', wxSAVE | wxOVERWRITE_PROMPT | wxCHANGE_DIR) if dlg.ShowModal() == wxID_OK: path = dlg.GetPath() @@ -311,9 +343,18 @@ class Frame(wxFrame): self.Save(path) self.dataFile = path self.SetStatusText('Data saved') + self.SaveRecent(path) except IOError: self.SetStatusText('Failed') - wxEndBusyCursor() + wxEndBusyCursor() + + def SaveRecent(self,path): + # append to recently used files + if path not in conf.recentfiles.values(): + newid = wxNewId() + self.recentMenu.Append(newid, path) + EVT_MENU(self, newid, self.OnRecentFile) + conf.recentfiles[newid] = path def OnExit(self, evt): self.Close() @@ -492,17 +533,6 @@ class Frame(wxFrame): panel.pages[0].box.SetLabel(xxx.panelName()) dlg.Destroy() - def OnSelect(self, evt): - print >> sys.stderr, 'Xperimental function!' - wxYield() - self.SetCursor(wxCROSS_CURSOR) - self.CaptureMouse() - - def OnLeftDown(self, evt): - pos = evt.GetPosition() - self.SetCursor(wxNullCursor) - self.ReleaseMouse() - def OnEmbedPanel(self, evt): conf.embedPanel = evt.IsChecked() if conf.embedPanel: @@ -513,7 +543,7 @@ class Frame(wxFrame): pos = self.GetPosition() sizePanel = panel.GetSize() panel.Reparent(self.splitter) - self.miniFrame.GetSizer().RemoveWindow(panel) + self.miniFrame.GetSizer().Remove(panel) wxYield() # Widen self.SetDimensions(pos.x, pos.y, size.width + sizePanel.width, size.height) @@ -550,6 +580,44 @@ class Frame(wxFrame): if not tree.selection: return # key pressed event tree.ShowTestWindow(tree.selection) + # Find object by relative position + def FindObject(self, item, obj): + # We simply perform depth-first traversal, sinse it's too much + # hassle to deal with all sizer/window combinations + w = tree.FindNodeObject(item) + if w == obj: + return item + if tree.ItemHasChildren(item): + child = tree.GetFirstChild(item)[0] + while child: + found = self.FindObject(child, obj) + if found: return found + child = tree.GetNextSibling(child) + return None + + def OnTestWinLeftDown(self, evt): + pos = evt.GetPosition() + self.SetHandler(g.testWin) + g.testWin.Disconnect(wxID_ANY, wxID_ANY, wxEVT_LEFT_DOWN) + item = self.FindObject(g.testWin.item, evt.GetEventObject()) + if item: + tree.SelectItem(item) + + def SetHandler(self, w, h=None): + if h: + w.SetEventHandler(h) + w.SetCursor(wxCROSS_CURSOR) + else: + w.SetEventHandler(w) + w.SetCursor(wxNullCursor) + for ch in w.GetChildren(): + self.SetHandler(ch, h) + + 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) + def OnRefresh(self, evt): # If modified, apply first selection = tree.selection @@ -794,17 +862,19 @@ Homepage: http://xrced.sourceforge.net\ def OnCloseWindow(self, evt): if not self.AskSave(): return if g.testWin: g.testWin.Destroy() - # Destroy cached windows - panel.cacheParent.Destroy() if not panel.GetPageCount() == 2: panel.page2.Destroy() - 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() + # If we don't do this, page does not get destroyed (a bug?) + panel.RemovePage(1) + if not self.IsIconized(): + 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() evt.Skip() def Clear(self): @@ -833,26 +903,15 @@ Homepage: http://xrced.sourceforge.net\ try: f = open(path) self.Clear() - # Parse first line to get encoding (!! hack, I don't know a better way) - line = f.readline() - mo = re.match(r'^<\?xml ([^<>]* )?encoding="(?P[^<>].*)"\?>', line) - # Build wx tree - f.seek(0) dom = minidom.parse(f) - # Set encoding global variable and document encoding property - if mo: - dom.encoding = g.currentEncoding = mo.group('encd') - if dom.encoding not in ['ascii', sys.getdefaultencoding()]: - wxLogWarning('Encoding is different from system default') - else: - g.currentEncoding = 'ascii' - dom.encoding = '' f.close() + # Set encoding global variable + if dom.encoding: g.currentEncoding = dom.encoding # Change dir + self.dataFile = path = os.path.abspath(path) dir = os.path.dirname(path) if dir: os.chdir(dir) tree.SetData(dom) - self.dataFile = path self.SetTitle(progname + ': ' + os.path.basename(path)) except: # Nice exception printing @@ -881,17 +940,18 @@ Homepage: http://xrced.sourceforge.net\ def Save(self, path): try: + import codecs # Apply changes if tree.selection and panel.IsModified(): self.OnRefresh(wxCommandEvent()) - f = open(path, 'w') + f = codecs.open(path, 'w', g.currentEncoding) # 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)) self.Indent(mainNode) - self.domCopy.writexml(f, encoding=tree.rootObj.params['encoding'].value()) + self.domCopy.writexml(f, encoding = g.currentEncoding) f.close() self.domCopy.unlink() self.domCopy = None @@ -931,21 +991,23 @@ class App(wxApp): global debug # Process comand-line try: + opts = args = None opts, args = getopt.getopt(sys.argv[1:], 'dhiv') + for o,a in opts: + if o == '-h': + usage() + sys.exit(0) + elif o == '-d': + debug = True + elif o == '-v': + print 'XRCed version', version + sys.exit(0) + except getopt.GetoptError: if wxPlatform != '__WXMAC__': # macs have some extra parameters print >> sys.stderr, 'Unknown option' usage() sys.exit(1) - for o,a in opts: - if o == '-h': - usage() - sys.exit(0) - elif o == '-d': - debug = True - elif o == '-v': - print 'XRCed version', version - sys.exit(0) self.SetAppName('xrced') # Settings @@ -957,6 +1019,12 @@ class App(wxApp): conf.embedPanel = conf.ReadInt('embedPanel', True) conf.showTools = conf.ReadInt('showTools', True) conf.sashPos = conf.ReadInt('sashPos', 200) + # read recently used files + recentfiles=conf.Read('recentFiles','') + conf.recentfiles={} + if recentfiles: + for fil in recentfiles.split('|'): + conf.recentfiles[wxNewId()]=fil if not conf.embedPanel: conf.panelX = conf.ReadInt('panelX', -1) conf.panelY = conf.ReadInt('panelY', -1) @@ -973,7 +1041,11 @@ class App(wxApp): frame.Show(True) # Load resources from XRC file (!!! should be transformed to .py later?) frame.res = wxXmlResource('') - frame.res.Load(os.path.join(basePath, 'xrced.xrc')) + # !!! 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: @@ -1000,6 +1072,7 @@ class App(wxApp): wc.WriteInt('panelWidth', conf.panelWidth) wc.WriteInt('panelHeight', conf.panelHeight) wc.WriteInt('nopanic', True) + wc.Write('recentFiles', '|'.join(conf.recentfiles.values()[-5:])) wc.Flush() def main():