[gnue] r7255 - in trunk/gnue-designer: . src/forms

[kilo]

Author: kilo
Date: 2005-03-25 04:32:29 -0600 (Fri, 25 Mar 2005)
New Revision: 7255

Modified:
   trunk/gnue-designer/NEWS
   trunk/gnue-designer/src/forms/Debugger.py
Log:
Make Run Form work again.

Modified: trunk/gnue-designer/NEWS
===================================================================
--- trunk/gnue-designer/NEWS    2005-03-25 08:04:34 UTC (rev 7254)
+++ trunk/gnue-designer/NEWS    2005-03-25 10:32:29 UTC (rev 7255)
@@ -1,3 +1,10 @@
+New features/changes in version 0.5.6:
+* Improved wizard output
+* Put wizard's name into generated file
+* Updated config options
+* Enable Run Form function (still buggy, but works)
+* Connect to... works again
+
 New features/changes in version 0.5.5: (2004-11-27)
 * Mouse-over tooltips in property editor
 * Reset focus order by position

Modified: trunk/gnue-designer/src/forms/Debugger.py
===================================================================
--- trunk/gnue-designer/src/forms/Debugger.py   2005-03-25 08:04:34 UTC (rev 
7254)
+++ trunk/gnue-designer/src/forms/Debugger.py   2005-03-25 10:32:29 UTC (rev 
7255)
@@ -31,23 +31,31 @@
 from gnue.forms import GFForm, GFInstance, GFParser
 from StringIO import StringIO
 from gnue.forms.uidrivers.wx import UIdriver as UIwxpython
-   
+
+#####################################################
+## TODO
+##
+## Open little output window to print debug messages.
+## Currently disable with comment marks #~
+##
+#####################################################
+
 class DebugSession: 
   def __init__(self, caller): 
     self.caller = caller
     
-    #Open output window to show debug messages there
-    #instead of the console
-    outputWindow = wxFrame(caller, -1, _("Console Output"), 
-         size=wxSize(300,50))
-    outputWindow.text = wxTextCtrl(outputWindow, -1, style=wxTE_MULTILINE)
-    outputWindow.Show(true)
-    caller.outputWindow = outputWindow
-    self.outputWindow = outputWindow
+    #~ #Open output window to show debug messages there
+    #~ #instead of the console
+    #~ outputWindow = wxFrame(caller, -1, _("Console Output"), 
+         #~ size=wxSize(300,50))
+    #~ outputWindow.text = wxTextCtrl(outputWindow, -1, style=wxTE_MULTILINE)
+    #~ outputWindow.Show(true)
+    #~ caller.outputWindow = outputWindow
+    #~ self.outputWindow = outputWindow
     
-    #Redirect stdout and stderr to output window
-    self.stdoutcatcher = _stdoutcatcher(outputWindow.text)
-    self.stderrcatcher = _stderrcatcher(outputWindow.text)
+    #~ #Redirect stdout and stderr to output window
+    #~ self.stdoutcatcher = _stdoutcatcher(outputWindow.text)
+    #~ self.stderrcatcher = _stderrcatcher(outputWindow.text)
 
     try: 
       self._saveexit = sys.exit
@@ -68,18 +76,18 @@
     except: 
       self.sanityCheck()
       raise
-      self.outputWindow.text.AppendText(_('\n---- Form Closed Abruptly ----'))
+      #~ self.outputWindow.text.AppendText(_('\n---- Form Closed Abruptly 
----'))
 
 
   def debugClosing(self): 
     self.sanityCheck()
-    self.outputWindow.text.AppendText(_('\n---- Form Closed ----'))
+    #~ self.outputWindow.text.AppendText(_('\n---- Form Closed ----'))
     #self.outputWindow.Close()
     
 
   def sanityCheck(self): 
-    self.stdoutcatcher.restore()
-    self.stderrcatcher.restore()
+    #~ self.stdoutcatcher.restore()
+    #~ self.stderrcatcher.restore()
     sys.exit = self._saveexit
 
 
@@ -121,6 +129,9 @@
 
   def restore(self): 
     self.__stdout__ = self.orig
+    
+  def flush(self):
+    self.orig.flush()
 
 
 class _stderrcatcher:
@@ -128,8 +139,9 @@
     self.orig = sys.__stderr__
     self.origfh = GDebug._fh
     self.textctl = textctrl
-    sys.__stderr__ = self
-    GDebug._fh = self
+    #sys.__stderr__ = self
+    #GDebug._fh = self
+    GDebug.__catchStderr(self)
         
   def write(self, str):
     self.origfh.write(str)
@@ -140,6 +152,9 @@
       self.write(str)
 
   def restore(self): 
-    self.__stderr__ = self.orig
-    GDebug._fh = self.origfh
+    #self.__stderr__ = self.orig
+    #GDebug._fh = self.origfh
+    GDebug.__catchStderr(self.origfh)
 
+  def flush(self):
+    self.orig.flush()