Use close button used in wxMiniFrame.

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

diff --git a/wxPython/wx/py/crust.py b/wxPython/wx/py/crust.py
index cd78c8c907e7f862b09338dc695d5616b93b9cf3..4dea6293621e721bd53f89976e14efb8b361a34d 100644 (file)
--- a/wxPython/wx/py/crust.py
+++ b/wxPython/wx/py/crust.py
@@ -63,7 +63,7 @@ class Crust(wx.SplitterWindow):
         self.notebook.AddPage(page=self.calltip, text='Calltip')
         
         self.sessionlisting = SessionListing(parent=self.notebook)
         self.notebook.AddPage(page=self.calltip, text='Calltip')
         
         self.sessionlisting = SessionListing(parent=self.notebook)

-        self.notebook.AddPage(page=self.sessionlisting, text='Session')
+        self.notebook.AddPage(page=self.sessionlisting, text='History')

         
         self.dispatcherlisting = DispatcherListing(parent=self.notebook)
         self.notebook.AddPage(page=self.dispatcherlisting, text='Dispatcher')
         
         self.dispatcherlisting = DispatcherListing(parent=self.notebook)
         self.notebook.AddPage(page=self.dispatcherlisting, text='Dispatcher')


@@ -162,6 +162,10 @@ class Calltip(wx.TextCtrl):
         self.SetBackgroundColour(wx.Colour(255, 255, 208))
         dispatcher.connect(receiver=self.display, signal='Shell.calltip')
 
         self.SetBackgroundColour(wx.Colour(255, 255, 208))
         dispatcher.connect(receiver=self.display, signal='Shell.calltip')
 

+        df = self.GetFont()
+        font = wx.Font(df.GetPointSize(), wx.TELETYPE, wx.NORMAL, wx.NORMAL)
+        self.SetFont(font)
+

     def display(self, calltip):
         """Receiver for Shell.calltip signal."""
         ## self.SetValue(calltip)  # Caused refresh problem on Windows.
     def display(self, calltip):
         """Receiver for Shell.calltip signal."""
         ## self.SetValue(calltip)  # Caused refresh problem on Windows.


@@ -177,17 +181,29 @@ class SessionListing(wx.TextCtrl):
         style = (wx.TE_MULTILINE | wx.TE_READONLY |
                  wx.TE_RICH2 | wx.TE_DONTWRAP)
         wx.TextCtrl.__init__(self, parent, id, style=style)
         style = (wx.TE_MULTILINE | wx.TE_READONLY |
                  wx.TE_RICH2 | wx.TE_DONTWRAP)
         wx.TextCtrl.__init__(self, parent, id, style=style)

-        dispatcher.connect(receiver=self.push, signal='Interpreter.push')
+        dispatcher.connect(receiver=self.addHistory, signal="Shell.addHistory")
+        dispatcher.connect(receiver=self.clearHistory, signal="Shell.clearHistory")
+        dispatcher.connect(receiver=self.loadHistory, signal="Shell.loadHistory")
+
+        df = self.GetFont()
+        font = wx.Font(df.GetPointSize(), wx.TELETYPE, wx.NORMAL, wx.NORMAL)
+        self.SetFont(font)
+
+    def loadHistory(self, history):
+        # preload the existing history, if any
+        hist = history[:]
+        hist.reverse()
+        self.SetValue('\n'.join(hist) + '\n')
+        self.SetInsertionPointEnd()

 
 

-    def push(self, command, more):
-        """Receiver for Interpreter.push signal."""
-        if command and not more:
+    def addHistory(self, command):
+        if command:

             self.SetInsertionPointEnd()
             self.SetInsertionPointEnd()

-            start, end = self.GetSelection()
-            if start != end:
-                self.SetSelection(0, 0)

             self.AppendText(command + '\n')
 
             self.AppendText(command + '\n')
 

+    def clearHistory(self):
+        self.SetValue("")
+

 
 class DispatcherListing(wx.TextCtrl):
     """Text control containing all dispatches for session."""
 
 class DispatcherListing(wx.TextCtrl):
     """Text control containing all dispatches for session."""


@@ -198,6 +214,10 @@ class DispatcherListing(wx.TextCtrl):
         wx.TextCtrl.__init__(self, parent, id, style=style)
         dispatcher.connect(receiver=self.spy)
 
         wx.TextCtrl.__init__(self, parent, id, style=style)
         dispatcher.connect(receiver=self.spy)
 

+        df = self.GetFont()
+        font = wx.Font(df.GetPointSize(), wx.TELETYPE, wx.NORMAL, wx.NORMAL)
+        self.SetFont(font)
+

     def spy(self, signal, sender):
         """Receiver for Any signal from Any sender."""
         text = '%r from %s' % (signal, sender)
     def spy(self, signal, sender):
         """Receiver for Any signal from Any sender."""
         text = '%r from %s' % (signal, sender)


@@ -279,6 +299,10 @@ class CrustFrame(frame.Frame, frame.ShellFrameMixin):
         dialog.Destroy()
 
 
         dialog.Destroy()
 
 

+    def OnHelp(self, event):
+        """Show a help dialog."""
+        frame.ShellFrameMixin.OnHelp(self, event)
+

 
     def LoadSettings(self):
         if self.config is not None:
 
     def LoadSettings(self):
         if self.config is not None:


@@ -287,17 +311,17 @@ class CrustFrame(frame.Frame, frame.ShellFrameMixin):
             self.crust.LoadSettings(self.config)
 
 
             self.crust.LoadSettings(self.config)
 
 

-    def SaveSettings(self):
+    def SaveSettings(self, force=False):

         if self.config is not None:
             frame.ShellFrameMixin.SaveSettings(self)
         if self.config is not None:
             frame.ShellFrameMixin.SaveSettings(self)

-            if self.autoSaveSettings:
+            if self.autoSaveSettings or force:

                 frame.Frame.SaveSettings(self, self.config)
                 self.crust.SaveSettings(self.config)
 
 
     def DoSaveSettings(self):
         if self.config is not None:
                 frame.Frame.SaveSettings(self, self.config)
                 self.crust.SaveSettings(self.config)
 
 
     def DoSaveSettings(self):
         if self.config is not None:

-            self.SaveSettings()
+            self.SaveSettings(force=True)

             self.config.Flush()
         
 
             self.config.Flush()