[gnue] r8822 - trunk/gnue-forms/src/GFObjects

[reinhard]

Author: reinhard
Date: 2006-10-17 11:36:53 -0500 (Tue, 17 Oct 2006)
New Revision: 8822

Modified:
   trunk/gnue-forms/src/GFObjects/GFBlock.py
   trunk/gnue-forms/src/GFObjects/GFField.py
Log:
Run focus-out triggers on field and block when switching to query mode.
Run focus-in triggers on field and block when switching from query mode.
Don't run focus triggers on fields and blocks while in query mode.


Modified: trunk/gnue-forms/src/GFObjects/GFBlock.py
===================================================================
--- trunk/gnue-forms/src/GFObjects/GFBlock.py   2006-10-17 15:50:11 UTC (rev 
8821)
+++ trunk/gnue-forms/src/GFObjects/GFBlock.py   2006-10-17 16:36:53 UTC (rev 
8822)
@@ -854,6 +854,7 @@
 
   def init_query(self):
 
+        self.__focus_out()
         self.mode = 'query'
         self.__query_values = {}
         self.__query_values.update(self._queryDefaults)
@@ -865,6 +866,7 @@
 
   def copy_query(self):
 
+        self.__focus_out()
         self.__query_values = {}
         self.__query_values.update(self.__last_query_values)
         self.__current_record_changed(True)
@@ -877,8 +879,7 @@
 
         self.mode = 'normal'
         self.__current_record_changed(True)
-        if self._form.get_focus_block() is self:
-            self.__update_record_status()
+        self.__focus_in()
 
   # ---------------------------------------------------------------------------
 
@@ -901,7 +902,6 @@
 
     # Store block states
     for block in self._logic._blockList:
-      block.mode = 'normal'
       block.__last_query_values = {}
       block.__last_query_values.update (block.__query_values)
 
@@ -941,6 +941,7 @@
       block.processTrigger ('POST-QUERY')
       for field in block._fieldList:
         field.processTrigger ('POST-QUERY')
+      block.cancel_query()
 
 
   # ---------------------------------------------------------------------------
@@ -1112,8 +1113,9 @@
         Notify the block that it has received the focus.
         """
 
-        self.processTrigger('PRE-FOCUSIN')
-        self.processTrigger('POST-FOCUSIN')
+        if self.mode == 'normal':
+            self.processTrigger('PRE-FOCUSIN')
+            self.processTrigger('POST-FOCUSIN')
 
         self.__update_record_status()
 
@@ -1128,10 +1130,11 @@
         will be prevented.
         """
 
-        self.processTrigger('PRE-FOCUSOUT', ignoreAbort=False)
+        if self.mode == 'normal':
+            self.processTrigger('PRE-FOCUSOUT', ignoreAbort=False)
 
-        if self.autoCommit and self.is_pending():
-            self._form.execute_commit()
+            if self.autoCommit and self.is_pending():
+                self._form.execute_commit()
 
   # ---------------------------------------------------------------------------
 
@@ -1143,7 +1146,8 @@
         stop the focus from changing now.
         """
 
-        self.processTrigger('POST-FOCUSOUT')
+        if self.mode == 'normal':
+            self.processTrigger('POST-FOCUSOUT')
 
 
   # ---------------------------------------------------------------------------

Modified: trunk/gnue-forms/src/GFObjects/GFField.py
===================================================================
--- trunk/gnue-forms/src/GFObjects/GFField.py   2006-10-17 15:50:11 UTC (rev 
8821)
+++ trunk/gnue-forms/src/GFObjects/GFField.py   2006-10-17 16:36:53 UTC (rev 
8822)
@@ -356,8 +356,9 @@
         Notify the field that it has received the focus.
         """
 
-        self.processTrigger('PRE-FOCUSIN')
-        self.processTrigger('POST-FOCUSIN')
+        if self._block.mode == 'normal':
+            self.processTrigger('PRE-FOCUSIN')
+            self.processTrigger('POST-FOCUSIN')
 
     # -------------------------------------------------------------------------
 
@@ -370,7 +371,8 @@
         will be prevented.
         """
 
-        self.processTrigger('PRE-FOCUSOUT', ignoreAbort=False)
+        if self._block.mode == 'normal':
+            self.processTrigger('PRE-FOCUSOUT', ignoreAbort=False)
 
     # -------------------------------------------------------------------------
 
@@ -382,7 +384,8 @@
         stop the focus from changing now.
         """
 
-        self.processTrigger('POST-FOCUSOUT')
+        if self._block.mode == 'normal':
+            self.processTrigger('POST-FOCUSOUT')
 
 
     # -------------------------------------------------------------------------