X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/095315e20d117d292ea01f8f964b19c032a0fd56..bb9e79c05e26cbb3cdf3799910e69cea359efef3:/wxPython/wx/py/frame.py diff --git a/wxPython/wx/py/frame.py b/wxPython/wx/py/frame.py index b74d652123..58b760e4d2 100644 --- a/wxPython/wx/py/frame.py +++ b/wxPython/wx/py/frame.py @@ -8,6 +8,7 @@ import wx import os from version import VERSION import editwindow +import dispatcher ID_NEW = wx.ID_NEW ID_OPEN = wx.ID_OPEN @@ -44,6 +45,8 @@ ID_USEAA = wx.NewId() ID_SHOW_LINENUMBERS = wx.NewId() ID_AUTO_SAVESETTINGS = wx.NewId() ID_SAVEHISTORY = wx.NewId() +ID_SAVEHISTORYNOW = wx.NewId() +ID_CLEARHISTORY = wx.NewId() ID_SAVESETTINGS = wx.NewId() ID_DELSETTINGSFILE = wx.NewId() ID_EDITSTARTUPSCRIPT = wx.NewId() @@ -138,9 +141,9 @@ class Frame(wx.Frame): m.Append(ID_SELECTALL, 'Select A&ll \tCtrl+A', 'Select all text') m.AppendSeparator() - m.Append(ID_EMPTYBUFFER, 'E&mpty Buffer', + m.Append(ID_EMPTYBUFFER, 'E&mpty Buffer...', 'Delete all the contents of the edit buffer') - m.Append(ID_FIND, '&Find Text \tCtrl+F', + m.Append(ID_FIND, '&Find Text... \tCtrl+F', 'Search for text in the edit buffer') m.Append(ID_FINDNEXT, 'Find &Next \tF3', 'Find next/previous instance of the search text') @@ -176,26 +179,45 @@ class Frame(wx.Frame): 'Call Tip Options') if wx.Platform == "__WXMAC__": - m.Append(ID_USEAA, '&Use AntiAliasing\tCtrl+Shift+A', + m.Append(ID_USEAA, '&Use AntiAliasing', 'Use anti-aliased fonts', wx.ITEM_CHECK) m.AppendSeparator() - m.Append(ID_SAVEHISTORY, '&Save History\tAlt+Ctrl+A', 'Automatically save history on close', wx.ITEM_CHECK) + + self.historyMenu = wx.Menu() + self.historyMenu.Append(ID_SAVEHISTORY, '&Autosave History', + 'Automatically save history on close', wx.ITEM_CHECK) + self.historyMenu.Append(ID_SAVEHISTORYNOW, '&Save History Now', + 'Save history') + self.historyMenu.Append(ID_CLEARHISTORY, '&Clear History ', + 'Clear history') + m.AppendMenu(-1, "&History", self.historyMenu, "History Options") + self.startupMenu = wx.Menu() - self.startupMenu.Append(ID_EXECSTARTUPSCRIPT, 'E&xecute Startup Script\tAlt+Ctrl+X', 'Execute Startup Script', wx.ITEM_CHECK) - self.startupMenu.Append(ID_EDITSTARTUPSCRIPT, '&Edit Startup Script\tAlt+Ctrl+E', 'Edit Startup Script') + self.startupMenu.Append(ID_EXECSTARTUPSCRIPT, + 'E&xecute Startup Script', + 'Execute Startup Script', wx.ITEM_CHECK) + self.startupMenu.Append(ID_EDITSTARTUPSCRIPT, + '&Edit Startup Script...', + 'Edit Startup Script') m.AppendMenu(ID_STARTUP, '&Startup', self.startupMenu, 'Startup Options') self.settingsMenu = wx.Menu() - self.settingsMenu.Append(ID_AUTO_SAVESETTINGS, '&Auto Save Settings\tAlt+Ctrl+A', 'Automatically save settings on close', wx.ITEM_CHECK) - self.settingsMenu.Append(ID_SAVESETTINGS, '&Save Settings\tAlt+Ctrl+S', 'Save settings now') - self.settingsMenu.Append(ID_DELSETTINGSFILE, '&Revert to default\tAlt+Ctrl+R', 'Revert to the default settings') + self.settingsMenu.Append(ID_AUTO_SAVESETTINGS, + '&Auto Save Settings', + 'Automatically save settings on close', wx.ITEM_CHECK) + self.settingsMenu.Append(ID_SAVESETTINGS, + '&Save Settings', + 'Save settings now') + self.settingsMenu.Append(ID_DELSETTINGSFILE, + '&Revert to default', + 'Revert to the default settings') m.AppendMenu(ID_SETTINGS, '&Settings', self.settingsMenu, 'Settings Options') m = self.helpMenu = wx.Menu() m.Append(ID_HELP, '&Help\tF1', 'Help!') m.AppendSeparator() - m.Append(ID_ABOUT, '&About...\tAlt+A', 'About this program') + m.Append(ID_ABOUT, '&About...', 'About this program') b = self.menuBar = wx.MenuBar() b.Append(self.fileMenu, '&File') @@ -238,6 +260,8 @@ class Frame(wx.Frame): self.Bind(wx.EVT_MENU, self.OnShowLineNumbers, id=ID_SHOW_LINENUMBERS) self.Bind(wx.EVT_MENU, self.OnAutoSaveSettings, id=ID_AUTO_SAVESETTINGS) self.Bind(wx.EVT_MENU, self.OnSaveHistory, id=ID_SAVEHISTORY) + self.Bind(wx.EVT_MENU, self.OnSaveHistoryNow, id=ID_SAVEHISTORYNOW) + self.Bind(wx.EVT_MENU, self.OnClearHistory, id=ID_CLEARHISTORY) self.Bind(wx.EVT_MENU, self.OnSaveSettings, id=ID_SAVESETTINGS) self.Bind(wx.EVT_MENU, self.OnDelSettingsFile, id=ID_DELSETTINGSFILE) self.Bind(wx.EVT_MENU, self.OnEditStartupScript, id=ID_EDITSTARTUPSCRIPT) @@ -277,6 +301,8 @@ class Frame(wx.Frame): self.Bind(wx.EVT_UPDATE_UI, self.OnUpdateMenu, id=ID_DELSETTINGSFILE) self.Bind(wx.EVT_UPDATE_UI, self.OnUpdateMenu, id=ID_EXECSTARTUPSCRIPT) self.Bind(wx.EVT_UPDATE_UI, self.OnUpdateMenu, id=ID_SAVEHISTORY) + self.Bind(wx.EVT_UPDATE_UI, self.OnUpdateMenu, id=ID_SAVEHISTORYNOW) + self.Bind(wx.EVT_UPDATE_UI, self.OnUpdateMenu, id=ID_CLEARHISTORY) self.Bind(wx.EVT_UPDATE_UI, self.OnUpdateMenu, id=ID_EDITSTARTUPSCRIPT) self.Bind(wx.EVT_UPDATE_UI, self.OnUpdateMenu, id=ID_FIND) self.Bind(wx.EVT_UPDATE_UI, self.OnUpdateMenu, id=ID_FINDNEXT) @@ -425,7 +451,13 @@ class Frame(wx.Frame): win.SetUseAntiAliasing(event.IsChecked()) def OnSaveHistory(self, event): - self.saveHistory = event.IsChecked() + self.autoSaveHistory = event.IsChecked() + + def OnSaveHistoryNow(self, event): + self.SaveHistory() + + def OnClearHistory(self, event): + self.shell.clearHistory() def OnAutoSaveSettings(self, event): self.autoSaveSettings = event.IsChecked() @@ -463,11 +495,16 @@ class Frame(wx.Frame): self.findDlg.Show() def OnFindNext(self, event): + if not self.findData.GetFindString(): + self.OnFindText(event) + return if isinstance(event, wx.FindDialogEvent): win = self.findDlg.GetParent() else: win = wx.Window.FindFocus() win.DoFindNext(self.findData, self.findDlg) + if self.findDlg is not None: + self.OnFindClose(None) def OnFindClose(self, event): self.findDlg.Destroy() @@ -556,8 +593,14 @@ class Frame(wx.Frame): event.Enable(self.config is not None) elif id == ID_SAVEHISTORY: - event.Check(self.saveHistory) + event.Check(self.autoSaveHistory) event.Enable(self.dataDir is not None) + elif id == ID_SAVEHISTORYNOW: + event.Enable(self.dataDir is not None and + hasattr(self, 'SaveHistory')) + elif id == ID_CLEARHISTORY: + event.Enable(self.dataDir is not None) + elif id == ID_EDITSTARTUPSCRIPT: event.Enable(hasattr(self, 'EditStartupScript')) event.Enable(self.dataDir is not None) @@ -565,9 +608,8 @@ class Frame(wx.Frame): elif id == ID_FIND: event.Enable(hasattr(win, 'DoFindNext')) elif id == ID_FINDNEXT: - event.Enable(hasattr(win, 'DoFindNext') and - self.findData.GetFindString() != '') - + event.Enable(hasattr(win, 'DoFindNext')) + else: event.Enable(False) except AttributeError: @@ -634,7 +676,7 @@ class ShellFrameMixin: self.startupScript = os.path.join(self.dataDir, 'startup') self.autoSaveSettings = False - self.saveHistory = False + self.autoSaveHistory = False # We need this one before we have a chance to load the settings... self.execStartupScript = True @@ -661,7 +703,7 @@ class ShellFrameMixin: if self.config is not None: self.autoSaveSettings = self.config.ReadBool('Options/AutoSaveSettings', False) self.execStartupScript = self.config.ReadBool('Options/ExecStartupScript', True) - self.saveHistory = self.config.ReadBool('Options/SaveHistory', False) + self.autoSaveHistory = self.config.ReadBool('Options/AutoSaveHistory', False) self.LoadHistory() @@ -670,8 +712,9 @@ class ShellFrameMixin: # always save this one self.config.WriteBool('Options/AutoSaveSettings', self.autoSaveSettings) if self.autoSaveSettings: - self.config.WriteBool('Options/SaveHistory', self.saveHistory) + self.config.WriteBool('Options/AutoSaveHistory', self.autoSaveHistory) self.config.WriteBool('Options/ExecStartupScript', self.execStartupScript) + if self.autoSaveHistory: self.SaveHistory() @@ -679,20 +722,17 @@ class ShellFrameMixin: def SaveHistory(self): if self.dataDir: try: - # always open the file so that when we are not - # saving the history, the old file is emptied. name = os.path.join(self.dataDir, 'history') f = file(name, 'w') - if self.saveHistory: - hist = '\n'.join(self.shell.history) - f.write(hist) + hist = '\x00\n'.join(self.shell.history) + f.write(hist) f.close() except: d = wx.MessageDialog(self, "Error saving history file.", "Error", wx.ICON_EXCLAMATION) d.ShowModal() d.Destroy() - + raise def LoadHistory(self): if self.dataDir: @@ -702,7 +742,8 @@ class ShellFrameMixin: f = file(name, 'U') hist = f.read() f.close() - self.shell.history = hist.split('\n') + self.shell.history = hist.split('\x00\n') + dispatcher.send(signal="Shell.loadHistory", history=self.shell.history) except: d = wx.MessageDialog(self, "Error loading history file.", "Error", wx.ICON_EXCLAMATION)