Upport scrolling changes and mouse wheel changes.

[wxWidgets.git] / wxPython / wx / py / frame.py

diff --git a/wxPython/wx/py/frame.py b/wxPython/wx/py/frame.py
index fcdb14c85ebec1e0180d1ad53f77929f3ff9f465..904c1b01fb90e2be6b508bbec492f884db143ad0 100644 (file)
--- 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 os
 from version import VERSION
 import editwindow

+import dispatcher

 
 ID_NEW = wx.ID_NEW
 ID_OPEN = wx.ID_OPEN
 
 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_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()
 ID_SAVESETTINGS = wx.NewId()
 ID_DELSETTINGSFILE = wx.NewId()
 ID_EDITSTARTUPSCRIPT = wx.NewId()


@@ -52,6 +55,7 @@ ID_STARTUP = wx.NewId()
 ID_SETTINGS = wx.NewId()
 ID_FIND = wx.ID_FIND
 ID_FINDNEXT = wx.NewId()
 ID_SETTINGS = wx.NewId()
 ID_FIND = wx.ID_FIND
 ID_FINDNEXT = wx.NewId()

+ID_SHOWTOOLS = wx.NewId()

 
 
 
 
 
 


@@ -138,9 +142,9 @@ class Frame(wx.Frame):
         m.Append(ID_SELECTALL, 'Select A&ll \tCtrl+A',
                  'Select all text')
         m.AppendSeparator()
         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')
                  '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')
                  'Search for text in the edit buffer')
         m.Append(ID_FINDNEXT, 'Find &Next \tF3',
                  'Find next/previous instance of the search text')


@@ -151,6 +155,10 @@ class Frame(wx.Frame):
                  'Wrap lines at right edge', wx.ITEM_CHECK)
         m.Append(ID_SHOW_LINENUMBERS, '&Show Line Numbers\tCtrl+Shift+L', 'Show Line Numbers', wx.ITEM_CHECK)
         m.Append(ID_TOGGLE_MAXIMIZE, '&Toggle Maximize\tF11', 'Maximize/Restore Application')
                  'Wrap lines at right edge', wx.ITEM_CHECK)
         m.Append(ID_SHOW_LINENUMBERS, '&Show Line Numbers\tCtrl+Shift+L', 'Show Line Numbers', wx.ITEM_CHECK)
         m.Append(ID_TOGGLE_MAXIMIZE, '&Toggle Maximize\tF11', 'Maximize/Restore Application')

+        if hasattr(self, 'ToggleTools'):
+            m.Append(ID_SHOWTOOLS,
+                     'Show &Tools\tF4',
+                     'Show the filling and other tools', wx.ITEM_CHECK)

 
         # Options
         m = self.autocompMenu = wx.Menu()
 
         # Options
         m = self.autocompMenu = wx.Menu()


@@ -180,14 +188,22 @@ class Frame(wx.Frame):
                      'Use anti-aliased fonts', wx.ITEM_CHECK)
             
         m.AppendSeparator()
                      'Use anti-aliased fonts', wx.ITEM_CHECK)
             
         m.AppendSeparator()

-        m.Append(ID_SAVEHISTORY, '&Save History',
+
+        self.historyMenu = wx.Menu()
+        self.historyMenu.Append(ID_SAVEHISTORY, '&Autosave History',

                  'Automatically save history on close', wx.ITEM_CHECK)
                  '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',
                                 'Execute Startup Script', wx.ITEM_CHECK)
         self.startupMenu.Append(ID_EDITSTARTUPSCRIPT,
         self.startupMenu = wx.Menu()
         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...',

                                 'Edit Startup Script')
         m.AppendMenu(ID_STARTUP, '&Startup', self.startupMenu, 'Startup Options')
 
                                 'Edit Startup Script')
         m.AppendMenu(ID_STARTUP, '&Startup', self.startupMenu, 'Startup Options')
 


@@ -249,12 +265,15 @@ 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.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)
         self.Bind(wx.EVT_MENU, self.OnExecStartupScript, id=ID_EXECSTARTUPSCRIPT)
         self.Bind(wx.EVT_MENU, self.OnFindText, id=ID_FIND)
         self.Bind(wx.EVT_MENU, self.OnFindNext, id=ID_FINDNEXT)
         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)
         self.Bind(wx.EVT_MENU, self.OnExecStartupScript, id=ID_EXECSTARTUPSCRIPT)
         self.Bind(wx.EVT_MENU, self.OnFindText, id=ID_FIND)
         self.Bind(wx.EVT_MENU, self.OnFindNext, id=ID_FINDNEXT)

+        self.Bind(wx.EVT_MENU, self.OnToggleTools, id=ID_SHOWTOOLS)

 
         self.Bind(wx.EVT_UPDATE_UI, self.OnUpdateMenu, id=ID_NEW)
         self.Bind(wx.EVT_UPDATE_UI, self.OnUpdateMenu, id=ID_OPEN)
 
         self.Bind(wx.EVT_UPDATE_UI, self.OnUpdateMenu, id=ID_NEW)
         self.Bind(wx.EVT_UPDATE_UI, self.OnUpdateMenu, id=ID_OPEN)


@@ -288,9 +307,12 @@ 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_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)
         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)

+        self.Bind(wx.EVT_UPDATE_UI, self.OnUpdateMenu, id=ID_SHOWTOOLS)

         
         self.Bind(wx.EVT_ACTIVATE, self.OnActivate)
         self.Bind(wx.EVT_FIND, self.OnFindNext)
         
         self.Bind(wx.EVT_ACTIVATE, self.OnActivate)
         self.Bind(wx.EVT_FIND, self.OnFindNext)


@@ -436,7 +458,13 @@ class Frame(wx.Frame):
         win.SetUseAntiAliasing(event.IsChecked())
 
     def OnSaveHistory(self, event):
         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()
 
     def OnAutoSaveSettings(self, event):
         self.autoSaveSettings = event.IsChecked()


@@ -474,17 +502,24 @@ class Frame(wx.Frame):
         self.findDlg.Show()
         
     def OnFindNext(self, event):
         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 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()
         self.findDlg = None
     
 
     def OnFindClose(self, event):
         self.findDlg.Destroy()
         self.findDlg = None
     

-
+    def OnToggleTools(self, event):
+        self.ToggleTools()
+        

 
     def OnUpdateMenu(self, event):
         """Update menu items based on current status and context."""
 
     def OnUpdateMenu(self, event):
         """Update menu items based on current status and context."""


@@ -567,8 +602,14 @@ class Frame(wx.Frame):
                 event.Enable(self.config is not None)
 
             elif id == ID_SAVEHISTORY:
                 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)
                 event.Enable(self.dataDir is not None)

+                

             elif id == ID_EDITSTARTUPSCRIPT:
                 event.Enable(hasattr(self, 'EditStartupScript'))
                 event.Enable(self.dataDir is not None)
             elif id == ID_EDITSTARTUPSCRIPT:
                 event.Enable(hasattr(self, 'EditStartupScript'))
                 event.Enable(self.dataDir is not None)


@@ -576,9 +617,11 @@ class Frame(wx.Frame):
             elif id == ID_FIND:
                 event.Enable(hasattr(win, 'DoFindNext'))
             elif id == ID_FINDNEXT:
             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'))
+
+            elif id == ID_SHOWTOOLS:
+                event.Check(self.ToolsShown())
+                                             

             else:
                 event.Enable(False)
         except AttributeError:
             else:
                 event.Enable(False)
         except AttributeError:


@@ -603,7 +646,7 @@ class Frame(wx.Frame):
 
 
     def LoadSettings(self, config):
 
 
     def LoadSettings(self, config):

-        """Called be derived classes to load settings specific to the Frame"""
+        """Called by derived classes to load settings specific to the Frame"""

         pos  = wx.Point(config.ReadInt('Window/PosX', -1),
                         config.ReadInt('Window/PosY', -1))
                         
         pos  = wx.Point(config.ReadInt('Window/PosX', -1),
                         config.ReadInt('Window/PosY', -1))
                         


@@ -645,7 +688,7 @@ class ShellFrameMixin:
             self.startupScript = os.path.join(self.dataDir, 'startup')
             
         self.autoSaveSettings = False
             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
 
         # We need this one before we have a chance to load the settings...
         self.execStartupScript = True


@@ -672,7 +715,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)
         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()
 
 
             self.LoadHistory()
 
 


@@ -681,8 +724,9 @@ class ShellFrameMixin:
             # always save this one
             self.config.WriteBool('Options/AutoSaveSettings', self.autoSaveSettings)
             if self.autoSaveSettings:
             # 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)
                 self.config.WriteBool('Options/ExecStartupScript', self.execStartupScript)

+            if self.autoSaveHistory:

                 self.SaveHistory()
 
 
                 self.SaveHistory()
 
 


@@ -690,20 +734,17 @@ class ShellFrameMixin:
     def SaveHistory(self):
         if self.dataDir:
             try:
     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')
                 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()
                 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:
 
     def LoadHistory(self):
         if self.dataDir:


@@ -713,7 +754,8 @@ class ShellFrameMixin:
                     f = file(name, 'U')
                     hist = f.read()
                     f.close()
                     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)
                 except:
                     d = wx.MessageDialog(self, "Error loading history file.",
                                          "Error", wx.ICON_EXCLAMATION)