cursor image type fix

[wxWidgets.git] / wxPython / wx / tools / XRCed / xrced.py

diff --git a/wxPython/wx/tools/XRCed/xrced.py b/wxPython/wx/tools/XRCed/xrced.py
index c41e9592cca721a098a659134445240fa7a6381c..63cc39c6f234bc0743780ae237eb3d70d75778fa 100644 (file)
--- a/wxPython/wx/tools/XRCed/xrced.py
+++ b/wxPython/wx/tools/XRCed/xrced.py
@@ -105,7 +105,7 @@ class Frame(wx.Frame):
         self.inIdle = False
 
         # Load our own resources
         self.inIdle = False
 
         # Load our own resources

-        self.res = xrc.XmlResource('')
+        self.res = xrc.EmptyXmlResource()

         # !!! Blocking of assert failure occurring in older unicode builds
         try:
             quietlog = wx.LogNull()
         # !!! Blocking of assert failure occurring in older unicode builds
         try:
             quietlog = wx.LogNull()


@@ -120,9 +120,13 @@ class Frame(wx.Frame):
         menu.Append(wx.ID_NEW, '&New\tCtrl-N', 'New file')
         menu.AppendSeparator()
         menu.Append(wx.ID_OPEN, '&Open...\tCtrl-O', 'Open XRC file')
         menu.Append(wx.ID_NEW, '&New\tCtrl-N', 'New file')
         menu.AppendSeparator()
         menu.Append(wx.ID_OPEN, '&Open...\tCtrl-O', 'Open XRC file')

+        

         self.recentMenu = wx.Menu()
         self.recentMenu = wx.Menu()

-        self.AppendRecent(self.recentMenu)
-        menu.AppendMenu(-1, 'Open Recent', self.recentMenu, 'Open a recent file')
+        g.fileHistory.UseMenu(self.recentMenu)
+        g.fileHistory.AddFilesToMenu()
+        self.Bind(wx.EVT_MENU, self.OnRecentFile, id=wx.ID_FILE1, id2=wx.ID_FILE9)
+        menu.AppendMenu(-1, 'Open &Recent', self.recentMenu, 'Open a recent file')
+        

         menu.AppendSeparator()
         menu.Append(wx.ID_SAVE, '&Save\tCtrl-S', 'Save XRC file')
         menu.Append(wx.ID_SAVEAS, 'Save &As...', 'Save XRC file under different name')
         menu.AppendSeparator()
         menu.Append(wx.ID_SAVE, '&Save\tCtrl-S', 'Save XRC file')
         menu.Append(wx.ID_SAVEAS, 'Save &As...', 'Save XRC file under different name')


@@ -297,7 +301,7 @@ class Frame(wx.Frame):
 
         # Build interface
         sizer = wx.BoxSizer(wx.VERTICAL)
 
         # Build interface
         sizer = wx.BoxSizer(wx.VERTICAL)

-        sizer.Add(wx.StaticLine(self, -1), 0, wx.EXPAND)
+        #sizer.Add(wx.StaticLine(self, -1), 0, wx.EXPAND)

         # Horizontal sizer for toolbar and splitter
         self.toolsSizer = sizer1 = wx.BoxSizer()
         splitter = wx.SplitterWindow(self, -1, style=wx.SP_3DSASH)
         # Horizontal sizer for toolbar and splitter
         self.toolsSizer = sizer1 = wx.BoxSizer()
         splitter = wx.SplitterWindow(self, -1, style=wx.SP_3DSASH)


@@ -350,25 +354,22 @@ class Frame(wx.Frame):
         wx.EVT_KEY_UP(self, tools.OnKeyUp)
         wx.EVT_ICONIZE(self, self.OnIconize)
     
         wx.EVT_KEY_UP(self, tools.OnKeyUp)
         wx.EVT_ICONIZE(self, self.OnIconize)
     

-    def AppendRecent(self, menu):
-        # add recently used files to the menu
-        for id,name in conf.recentfiles.iteritems():
-            menu.Append(id,name)
-            wx.EVT_MENU(self,id,self.OnRecentFile)
-        return 
-        

     def OnRecentFile(self,evt):
         # open recently used file
         if not self.AskSave(): return
         wx.BeginBusyCursor()
     def OnRecentFile(self,evt):
         # open recently used file
         if not self.AskSave(): return
         wx.BeginBusyCursor()

-        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')
+
+        # get the pathname based on the menu ID
+        fileNum = evt.GetId() - wx.ID_FILE1
+        path = g.fileHistory.GetHistoryFile(fileNum)
+            
+        if self.Open(path):
+            self.SetStatusText('Data loaded')
+            # add it back to the history so it will be moved up the list
+            self.SaveRecent(path)
+        else:
+            self.SetStatusText('Failed')
+

         wx.EndBusyCursor()
 
     def OnNew(self, evt):
         wx.EndBusyCursor()
 
     def OnNew(self, evt):


@@ -386,9 +387,9 @@ class Frame(wx.Frame):
             try:
                 if self.Open(path):
                     self.SetStatusText('Data loaded')
             try:
                 if self.Open(path):
                     self.SetStatusText('Data loaded')

+                    self.SaveRecent(path)

                 else:
                     self.SetStatusText('Failed')
                 else:
                     self.SetStatusText('Failed')

-                self.SaveRecent(path)

             finally:
                 wx.EndBusyCursor()
         dlg.Destroy()
             finally:
                 wx.EndBusyCursor()
         dlg.Destroy()


@@ -433,6 +434,7 @@ class Frame(wx.Frame):
                 self.Save(tmpName) # save temporary file first
                 shutil.move(tmpName, path)
                 self.dataFile = path
                 self.Save(tmpName) # save temporary file first
                 shutil.move(tmpName, path)
                 self.dataFile = path

+                self.SetModified(False)

                 if conf.localconf.ReadBool("autogenerate", False):
                     pypath = conf.localconf.Read("filename")
                     embed = conf.localconf.ReadBool("embedResource", False)
                 if conf.localconf.ReadBool("autogenerate", False):
                     pypath = conf.localconf.Read("filename")
                     embed = conf.localconf.ReadBool("embedResource", False)


@@ -448,11 +450,7 @@ class Frame(wx.Frame):
 
     def SaveRecent(self,path):
         # append to recently used files
 
     def SaveRecent(self,path):
         # append to recently used files

-        if path not in conf.recentfiles.values():
-            newid = wx.NewId()
-            self.recentMenu.Append(newid, path)
-            wx.EVT_MENU(self, newid, self.OnRecentFile)
-            conf.recentfiles[newid] = path
+        g.fileHistory.AddFileToHistory(path)

 
     def GeneratePython(self, dataFile, pypath, embed, genGettext):
         try:
 
     def GeneratePython(self, dataFile, pypath, embed, genGettext):
         try:


@@ -484,6 +482,7 @@ class Frame(wx.Frame):
                 if dlg.FindWindowById(id).IsChecked():
                     d[p] = str(c.GetValue())
                 elif p in d: del d[p]
                 if dlg.FindWindowById(id).IsChecked():
                     d[p] = str(c.GetValue())
                 elif p in d: del d[p]

+            g.conf.allowExec = ('ask', 'yes', 'no')[dlg.radio_allow_exec.GetSelection()]

         dlg.Destroy()
         
     def OnExit(self, evt):
         dlg.Destroy()
         
     def OnExit(self, evt):


@@ -989,8 +988,9 @@ class Frame(wx.Frame):
                 child = tree.GetNextSibling(child)
         return None
 
                 child = tree.GetNextSibling(child)
         return None
 

+    # Click event after locate activated

     def OnTestWinLeftDown(self, evt):
     def OnTestWinLeftDown(self, evt):

-        pos = evt.GetPosition()
+        # Restore normal event processing

         self.SetHandler(g.testWin)
         g.testWin.Disconnect(wx.ID_ANY, wx.ID_ANY, wx.wxEVT_LEFT_DOWN)
         item = self.FindObject(g.testWin.item, evt.GetEventObject())
         self.SetHandler(g.testWin)
         g.testWin.Disconnect(wx.ID_ANY, wx.ID_ANY, wx.wxEVT_LEFT_DOWN)
         item = self.FindObject(g.testWin.item, evt.GetEventObject())


@@ -1102,19 +1102,24 @@ Homepage: http://xrced.sourceforge.net\
         parent = tree.GetPyData(parentLeaf)
         if parent.hasChild: parent = parent.child
 
         parent = tree.GetPyData(parentLeaf)
         if parent.hasChild: parent = parent.child
 

+        self.CreateXXX(parent, parentLeaf, nextItem, evt.GetId())
+
+    # Actual method to create object and add to XML and wx trees
+    def CreateXXX(self, parent, parentLeaf, nextItem, id):
+        selected = tree.selection

         # Create object_ref?
         # Create object_ref?

-        if evt.GetId() == ID_NEW.REF:
+        if id == ID_NEW.REF:

             ref = wx.GetTextFromUser('Create reference to:', 'Create reference')
             if not ref: return
             xxx = MakeEmptyRefXXX(parent, ref)
             ref = wx.GetTextFromUser('Create reference to:', 'Create reference')
             if not ref: return
             xxx = MakeEmptyRefXXX(parent, ref)

-        elif evt.GetId() == ID_NEW.COMMENT:
+        elif id == ID_NEW.COMMENT:

             xxx = MakeEmptyCommentXXX(parent)
         else:
             # Create empty element
             xxx = MakeEmptyCommentXXX(parent)
         else:
             # Create empty element

-            if evt.GetId() >= ID_NEW.CUSTOM:
-                className = pullDownMenu.customMap[evt.GetId()]
+            if id >= ID_NEW.CUSTOM:
+                className = pullDownMenu.customMap[id]

             else:
             else:

-                className = pullDownMenu.createMap[evt.GetId()]
+                className = pullDownMenu.createMap[id]

             xxx = MakeEmptyXXX(parent, className)
 
         # Insert new node, register undo
             xxx = MakeEmptyXXX(parent, className)
 
         # Insert new node, register undo


@@ -1126,17 +1131,21 @@ Homepage: http://xrced.sourceforge.net\
                 xxx.setTreeName('%s%d' % (defaultIDs[cl], frame.maxIDs[cl]))
             # And for some other standard controls
             elif parent.__class__ == xxxStdDialogButtonSizer:
                 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
+                # ... we can even set automatically tree name
+                xxx.setTreeName(pullDownMenu.stdButtonIDs[id][0])

                 obj = xxx.treeObject()
                 obj = xxx.treeObject()

+                # ... and label

                 elem = g.tree.dom.createElement('label')
                 elem = g.tree.dom.createElement('label')

-                elem.appendChild(g.tree.dom.createTextNode(pullDownMenu.stdButtonIDs[evt.GetId()][1]))
+                elem.appendChild(g.tree.dom.createTextNode(pullDownMenu.stdButtonIDs[id][1]))

                 obj.params['label'] = xxxParam(elem)
                 xxx.treeObject().node.appendChild(elem)
                 obj.params['label'] = xxxParam(elem)
                 xxx.treeObject().node.appendChild(elem)

-
-            newItem = tree.InsertNode(parentLeaf, parent, xxx.node, nextItem)
-        else:                           # comment node
-            newItem = tree.InsertNode(parentLeaf, parent, xxx.node, nextItem)
+            # Else, set label if exists to class name
+            elif 'label' in xxx.treeObject().allParams:
+                label = className
+                if label[:2] == 'wx': label = label[2:]
+                xxx.treeObject().set('label', label.upper())
+        # For comment nodes, simply add node
+        newItem = tree.InsertNode(parentLeaf, parent, xxx.node, nextItem)

         undoMan.RegisterUndo(UndoPasteCreate(parentLeaf, parent, newItem, selected))
         tree.EnsureVisible(newItem)
         tree.SelectItem(newItem)
         undoMan.RegisterUndo(UndoPasteCreate(parentLeaf, parent, newItem, selected))
         tree.EnsureVisible(newItem)
         tree.SelectItem(newItem)


@@ -1154,6 +1163,7 @@ Homepage: http://xrced.sourceforge.net\
         if not xxx.isElement:
             tree.EditLabel(newItem)
         self.SetModified()
         if not xxx.isElement:
             tree.EditLabel(newItem)
         self.SetModified()

+        return xxx

 
     # Replace one object with another
     def OnReplace(self, evt):
 
     # Replace one object with another
     def OnReplace(self, evt):


@@ -1314,10 +1324,10 @@ Homepage: http://xrced.sourceforge.net\
             if tree.needUpdate:
                 if conf.autoRefresh:
                     if g.testWin:
             if tree.needUpdate:
                 if conf.autoRefresh:
                     if g.testWin:

-                        self.SetStatusText('Refreshing test window...')
+                        #self.SetStatusText('Refreshing test window...')

                         # (re)create
                         tree.CreateTestWin(g.testWin.item)
                         # (re)create
                         tree.CreateTestWin(g.testWin.item)

-                        self.SetStatusText('')
+                        #self.SetStatusText('')

                     tree.needUpdate = False
             elif tree.pendingHighLight:
                 try:
                     tree.needUpdate = False
             elif tree.pendingHighLight:
                 try:


@@ -1396,6 +1406,8 @@ Homepage: http://xrced.sourceforge.net\
         g.pullDownMenu.custom = self.custom[:]
         # Remove modules imported from comment directives
         map(sys.modules.pop, [m for m in sys.modules if m not in self.modules])
         g.pullDownMenu.custom = self.custom[:]
         # Remove modules imported from comment directives
         map(sys.modules.pop, [m for m in sys.modules if m not in self.modules])

+        xxxParamComment.locals = {}     # clear local namespace
+        xxxParamComment.allow = None    # clear execution state

 
     def SetModified(self, state=True):
         self.modified = state
 
     def SetModified(self, state=True):
         self.modified = state


@@ -1513,9 +1525,6 @@ Homepage: http://xrced.sourceforge.net\
             return True
         return False
 
             return True
         return False
 

-    def SaveUndo(self):
-        pass                            # !!!
-

 ################################################################################
 
 class PythonOptions(wx.Dialog):
 ################################################################################
 
 class PythonOptions(wx.Dialog):


@@ -1592,7 +1601,8 @@ class PrefsDialog(wx.Dialog):
         self.PostCreate(pre)
         self.checkControls = {} # map of check IDs to (control,dict,param)
 
         self.PostCreate(pre)
         self.checkControls = {} # map of check IDs to (control,dict,param)
 

-        xxx = sys.modules['xxx']
+        ##xxx = sys.modules['xxx']
+        import xxx

         d = xxx.xxxSizerItem.defaults_panel
 
         self.check_proportion_panel = xrc.XRCCTRL(self, 'check_proportion_panel')
         d = xxx.xxxSizerItem.defaults_panel
 
         self.check_proportion_panel = xrc.XRCCTRL(self, 'check_proportion_panel')


@@ -1632,6 +1642,13 @@ class PrefsDialog(wx.Dialog):
             except KeyError:
                 c.Enable(False)
 
             except KeyError:
                 c.Enable(False)
 

+        self.radio_allow_exec = xrc.XRCCTRL(self, 'radio_allow_exec')
+        try:
+            radio = {'ask': 0, 'yes':1, 'no':2}[g.conf.allowExec]
+        except KeyError:
+            radio = 0
+        self.radio_allow_exec.SetSelection(radio)
+

     def OnCheck(self, evt):
         self.checkControls[evt.GetId()][0].Enable(evt.IsChecked())
         evt.Skip()
     def OnCheck(self, evt):
         self.checkControls[evt.GetId()][0].Enable(evt.IsChecked())
         evt.Skip()


@@ -1692,12 +1709,11 @@ Please upgrade wxWidgets to %d.%d.%d or higher.''' % MinWxVersion)
         conf.embedPanel = conf.ReadInt('embedPanel', True)
         conf.showTools = conf.ReadInt('showTools', True)
         conf.sashPos = conf.ReadInt('sashPos', 200)
         conf.embedPanel = conf.ReadInt('embedPanel', True)
         conf.showTools = conf.ReadInt('showTools', True)
         conf.sashPos = conf.ReadInt('sashPos', 200)

+

         # read recently used files
         # read recently used files

-        recentfiles=conf.Read('recentFiles','')
-        conf.recentfiles={}
-        if recentfiles:
-            for fil in recentfiles.split('|'):
-                conf.recentfiles[wx.NewId()]=fil
+        g.fileHistory = wx.FileHistory()
+        g.fileHistory.Load(conf)
+

         if not conf.embedPanel:
             conf.panelX = conf.ReadInt('panelX', -1)
             conf.panelY = conf.ReadInt('panelY', -1)
         if not conf.embedPanel:
             conf.panelX = conf.ReadInt('panelX', -1)
             conf.panelY = conf.ReadInt('panelY', -1)


@@ -1707,13 +1723,17 @@ Please upgrade wxWidgets to %d.%d.%d or higher.''' % MinWxVersion)
         conf.panelHeight = conf.ReadInt('panelHeight', 200)
         conf.panic = not conf.HasEntry('nopanic')
         # Preferences
         conf.panelHeight = conf.ReadInt('panelHeight', 200)
         conf.panic = not conf.HasEntry('nopanic')
         # Preferences

+        conf.allowExec = conf.Read('Prefs/allowExec', 'ask')

         p = 'Prefs/sizeritem_defaults_panel'
         p = 'Prefs/sizeritem_defaults_panel'

+        import xxx

         if conf.HasEntry(p):
         if conf.HasEntry(p):

-            sys.modules['xxx'].xxxSizerItem.defaults_panel = ReadDictFromString(conf.Read(p))
+            ##sys.modules['xxx'].xxxSizerItem.defaults_panel = ReadDictFromString(conf.Read(p))
+            xxx.xxxSizerItem.defaults_panel = ReadDictFromString(conf.Read(p))

         p = 'Prefs/sizeritem_defaults_control'
         if conf.HasEntry(p):
         p = 'Prefs/sizeritem_defaults_control'
         if conf.HasEntry(p):

-            sys.modules['xxx'].xxxSizerItem.defaults_control = ReadDictFromString(conf.Read(p))
-
+            ##sys.modules['xxx'].xxxSizerItem.defaults_control = ReadDictFromString(conf.Read(p))
+            xxx.xxxSizerItem.defaults_control = ReadDictFromString(conf.Read(p))
+            

         # Add handlers
         wx.FileSystem.AddHandler(wx.MemoryFSHandler())
         # Create main frame
         # Add handlers
         wx.FileSystem.AddHandler(wx.MemoryFSHandler())
         # Create main frame


@@ -1741,7 +1761,7 @@ Please upgrade wxWidgets to %d.%d.%d or higher.''' % MinWxVersion)
         # Store important data
         frame.handlers = getHandlers()[:]
         frame.custom = g.pullDownMenu.custom[:]
         # Store important data
         frame.handlers = getHandlers()[:]
         frame.custom = g.pullDownMenu.custom[:]

-        frame.modules = set(sys.modules.keys())
+        frame.modules = sys.modules.copy()

 
         # Initialize
         frame.Clear()
 
         # Initialize
         frame.Clear()


@@ -1770,14 +1790,19 @@ Please upgrade wxWidgets to %d.%d.%d or higher.''' % MinWxVersion)
         wc.WriteInt('sashPos', conf.sashPos)
         wc.WriteInt('panelWidth', conf.panelWidth)
         wc.WriteInt('panelHeight', conf.panelHeight)
         wc.WriteInt('sashPos', conf.sashPos)
         wc.WriteInt('panelWidth', conf.panelWidth)
         wc.WriteInt('panelHeight', conf.panelHeight)

-        wc.WriteInt('nopanic', True)
-        wc.Write('recentFiles', '|'.join(conf.recentfiles.values()[-5:]))
+        wc.WriteInt('nopanic', 1)
+        g.fileHistory.Save(wc)

         # Preferences
         wc.DeleteGroup('Prefs')
         # Preferences
         wc.DeleteGroup('Prefs')

-        v = sys.modules['xxx'].xxxSizerItem.defaults_panel
+        wc.Write('Prefs/allowExec', conf.allowExec)
+        import xxx
+        ##v = sys.modules['xxx'].xxxSizerItem.defaults_panel
+        v = xxx.xxxSizerItem.defaults_panel

         if v: wc.Write('Prefs/sizeritem_defaults_panel', DictToString(v))
         if v: wc.Write('Prefs/sizeritem_defaults_panel', DictToString(v))

-        v = sys.modules['xxx'].xxxSizerItem.defaults_control
+        ###v = sys.modules['xxx'].xxxSizerItem.defaults_control
+        v = xxx.xxxSizerItem.defaults_control

         if v: wc.Write('Prefs/sizeritem_defaults_control', DictToString(v))
         if v: wc.Write('Prefs/sizeritem_defaults_control', DictToString(v))

+        

         wc.Flush()
 
 def main():
         wc.Flush()
 
 def main():