[gnue] r8890 - trunk/gnue-forms/src

[reinhard]

Author: reinhard
Date: 2006-10-21 07:59:07 -0500 (Sat, 21 Oct 2006)
New Revision: 8890

Modified:
   trunk/gnue-forms/src/GFForm.py
   trunk/gnue-forms/src/GFInstance.py
Log:
Renamed GFForm.execute_close() to GFForm.close()


Modified: trunk/gnue-forms/src/GFForm.py
===================================================================
--- trunk/gnue-forms/src/GFForm.py      2006-10-21 12:33:23 UTC (rev 8889)
+++ trunk/gnue-forms/src/GFForm.py      2006-10-21 12:59:07 UTC (rev 8890)
@@ -209,10 +209,9 @@
             'runReport': {
                 'function': self.__trigger_run_report,
                 'global': True},
-            'close': {
-                'function': self.__trigger_close,
-                'global': True}}
 
+            'close': {'function': self.close, 'global': True}}
+
         self._features = {
             'GUI:MENUBAR:SUPPRESS': False,
             'GUI:TOOLBAR:SUPPRESS': False,
@@ -575,16 +574,7 @@
         rep_engine = GREngine(self._instance.connections)
         rep_engine.processReport(reportFile, parameters=parameters, **parms)
 
-    # -------------------------------------------------------------------------
 
-    def __trigger_close(self):
-        """
-        Closes this copy of GNUe-Forms.
-        @return: None, or 1 if error
-        """
-        self.execute_close()
-
-
     # -------------------------------------------------------------------------
     # Get the value of a parameter
     # -------------------------------------------------------------------------
@@ -1786,7 +1776,7 @@
     # Close this window
     # -------------------------------------------------------------------------
 
-    def execute_close(self):
+    def close(self):
 
         if self._currentBlock is not None:
             self._currentBlock._focus_out()

Modified: trunk/gnue-forms/src/GFInstance.py
===================================================================
--- trunk/gnue-forms/src/GFInstance.py  2006-10-21 12:33:23 UTC (rev 8889)
+++ trunk/gnue-forms/src/GFInstance.py  2006-10-21 12:59:07 UTC (rev 8890)
@@ -659,4 +659,4 @@
 
   def __execute_exit(self, event):
 
-    event._form.execute_close()
+        event._form.close()