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

[reinhard]

Author: reinhard
Date: 2006-10-17 10:50:11 -0500 (Tue, 17 Oct 2006)
New Revision: 8821

Modified:
   trunk/gnue-forms/src/GFObjects/GFBlock.py
Log:
Call block and field focus triggers also if the resultset changes, and a few
other fixes.


Modified: trunk/gnue-forms/src/GFObjects/GFBlock.py
===================================================================
--- trunk/gnue-forms/src/GFObjects/GFBlock.py   2006-10-17 15:22:50 UTC (rev 
8820)
+++ trunk/gnue-forms/src/GFObjects/GFBlock.py   2006-10-17 15:50:11 UTC (rev 
8821)
@@ -267,6 +267,8 @@
 
   def __dsResultSetActivated (self, event):
 
+    self.__focus_out()
+
     self._resultSet = event.resultSet
 
     # FIXME: during commit, master datasources navigate the current record
@@ -284,7 +286,9 @@
 
     self.__current_record_changed(True)
 
+    self.__focus_in()
 
+
   # ---------------------------------------------------------------------------
 
   def __dsCursorMoved (self, event):
@@ -1076,16 +1080,16 @@
             if field is not None:
                 field.focus_in()
 
-        self._form.beginEditing()
+            self._form.beginEditing()
 
   # ---------------------------------------------------------------------------
 
   def __focus_out(self):
 
-        self._form.endEditing()
-
         if self._form.get_focus_block() is self:
 
+            self._form.endEditing()
+
             try:
                 field = self._form.get_focus_object().get_field()
                 if field is not None:
@@ -1215,13 +1219,13 @@
 
   def __update_record_status(self):
 
-        self._form.update_record_counter(
-                record_number=self._currentRecord+1,
-                record_count=self._recordCount)
-
         if self.mode == 'query':
+            record_number = 1
+            record_count = 1
             record_status = 'QRY'
         else:
+            record_number = self._resultSet.getRecordNumber()+1
+            record_count = self._resultSet.getRecordCount()
             record_status = {
                     None:       '',
                     'empty':    'NEW',
@@ -1231,6 +1235,9 @@
                     'modified': 'MOD',
                     'deleted':  'DEL'}[self.get_record_status()]
 
+        self._form.update_record_counter(record_number=record_number,
+                record_count=record_count)
+
         self._form.update_record_status(record_status)
 
   # ---------------------------------------------------------------------------