[gnue] r8517 - in trunk/gnue-forms/src: . uidrivers/_base

[reinhard]

Author: reinhard
Date: 2006-06-28 15:46:34 -0500 (Wed, 28 Jun 2006)
New Revision: 8517

Modified:
   trunk/gnue-forms/src/GFInstance.py
   trunk/gnue-forms/src/uidrivers/_base/UIdriver.py
Log:
Prevent focus to be mouseclicked out of an entry with an invalid current value.
Necessary as a result of the last change with beginEdit and endEdit.

issue79 testing


Modified: trunk/gnue-forms/src/GFInstance.py
===================================================================
--- trunk/gnue-forms/src/GFInstance.py  2006-06-28 15:13:29 UTC (rev 8516)
+++ trunk/gnue-forms/src/GFInstance.py  2006-06-28 20:46:34 UTC (rev 8517)
@@ -394,6 +394,7 @@
 
     assert gDebug (4, "Setting initial focus")    
     self.dispatchEvent ('gotoENTRY', object = form._currentEntry, _form = form)
+    form.beginEditing()
     assert gDebug (4, "Activating form")    
     self._uiinstance.activateForm (formName, modal)
 
@@ -539,6 +540,7 @@
     has to update the status bar. Used to cut down on repeated code.
     """
     self.dispatchEvent ('gotoENTRY', object = form._currentEntry, _form = form)
+    form.beginEditing()
     self.updateRecordCounter (form)
     self.updateRecordStatus (form)
 
@@ -607,6 +609,7 @@
 
       self.dispatchEvent ('gotoENTRY', object = event._form._currentEntry,
                           _form = event._form)
+      event._form.beginEditing()
 
     self.updateRecordStatus (event._form)
     self.updateTip (event._form)
@@ -636,6 +639,7 @@
       event._form.previousEntry ()
       self.dispatchEvent ('gotoENTRY', object = event._form._currentEntry,
                           _form = event._form)
+      event._form.beginEditing()
 
     self.updateRecordStatus (event._form)
     self.updateTip (event._form)
@@ -1120,6 +1124,10 @@
     """
 
     if not event._form.endEditing ():
+      # Old focus entry has invalid value: beat the UI focus back, so we are
+      # captured until the value is corrected.
+      self.dispatchEvent ('gotoENTRY', object = event._form._currentEntry,
+                         _form = event._form)
       return False
 
     if event.data._type in ['GFEntry', 'GFImage', 'GFButton']:
@@ -1134,6 +1142,7 @@
 
       self.dispatchEvent ('gotoENTRY', object = event._form._currentEntry,
                          _form = event._form)
+      event._form.beginEditing()
 
       self.updateRecordStatus (event._form)
       self.updateTip (event._form)
@@ -1158,6 +1167,7 @@
     event._form.refreshDisplay (event._form)
     self.dispatchEvent ('gotoENTRY', object = event._form._currentEntry,
                        _form = event._form)
+    event._form.beginEditing()
     self.updateStatus (event._form)
 
 
@@ -1178,6 +1188,7 @@
     event._form.refreshDisplay (event._form)
     self.dispatchEvent ('gotoENTRY', object = event._form._currentEntry,
                        _form = event._form)
+    event._form.beginEditing()
     self.updateStatus (event._form)
 
 
@@ -1197,6 +1208,7 @@
     event._form.refreshDisplay (event._form)
     self.dispatchEvent ('gotoENTRY', object = event._form._currentEntry,
                        _form = event._form)
+    event._form.beginEditing()
     self.updateStatus (event._form)
 
 
@@ -1213,8 +1225,6 @@
     if message:
       self.displayMessageBox (message, 'Error')
 
-    self.dispatchEvent ('gotoENTRY', object = event._form._currentEntry,
-                       _form = event._form)
     event._form.refreshDisplay (event._form._currentBlock)
     self._entryUpdated (event._form)
 

Modified: trunk/gnue-forms/src/uidrivers/_base/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/_base/UIdriver.py    2006-06-28 15:13:29 UTC 
(rev 8516)
+++ trunk/gnue-forms/src/uidrivers/_base/UIdriver.py    2006-06-28 20:46:34 UTC 
(rev 8517)
@@ -356,7 +356,6 @@
       self._uiFocusWidget = self._gfObjToUIWidget [object]
       self._uiFocusIndex = object._visibleIndex
       self._uiFocusWidget.indexedFocus (object._visibleIndex)
-      object._form.beginEditing()
 
 
   # ---------------------------------------------------------------------------