r5611 - trunk/gnue-forms/src

[jamest]

Author: jamest
Date: 2004-04-01 22:14:56 -0600 (Thu, 01 Apr 2004)
New Revision: 5611

Modified:
   trunk/gnue-forms/src/GFForm.py
   trunk/gnue-forms/src/GFInstance.py
Log:
added pre-exit trigger to forms, once raise TriggerError is fixed 
then use will be able to abort form closure via this trigger


Modified: trunk/gnue-forms/src/GFForm.py
===================================================================
--- trunk/gnue-forms/src/GFForm.py      2004-04-02 02:25:30 UTC (rev 5610)
+++ trunk/gnue-forms/src/GFForm.py      2004-04-02 04:14:56 UTC (rev 5611)
@@ -96,6 +96,7 @@
 
     self._validTriggers = { 'ON-STARTUP':     'On-Startup',
                             'ON-ACTIVATION':  'On-Activation',
+                            'PRE-EXIT':       'Pre-Exit',
                             'ON-EXIT':        'On-Exit',
                             'PRE-COMMIT':     'Pre-Commit',
                             'POST-COMMIT':    'Post-Commit' }

Modified: trunk/gnue-forms/src/GFInstance.py
===================================================================
--- trunk/gnue-forms/src/GFInstance.py  2004-04-02 02:25:30 UTC (rev 5610)
+++ trunk/gnue-forms/src/GFInstance.py  2004-04-02 04:14:56 UTC (rev 5611)
@@ -734,15 +734,19 @@
   # has been saved
   #
   def executeExit(self, event):
-    if not event._form.isSaved():
-      self.displayMessageBox( _('Data not saved. Save changes or clear the 
form to proceed.'))
+    try:
+      event._form.processTrigger('Pre-Exit')
+    
+      if not event._form.isSaved():
+        self.displayMessageBox( _('Data not saved. Save changes or clear the 
form to proceed.'))
+        event._form.refreshUIEvents()
+      else:
+        event._form.processTrigger('On-Exit')
+        self.dispatchEvent('exitApplication',_('Current data is 
saved'),_formName=event._form.name)
+    except TriggerError, t:
+      self.displayMessageBox(t.msg)
       event._form.refreshUIEvents()
-    else:
-      event._form.processTrigger('On-Exit')
-      self.dispatchEvent('exitApplication',_('Current data is 
saved'),_formName=event._form.name)
-
-    return
-
+  
   #
   # deleteRecord
   #