r6654 - trunk/gnue-forms/src/GFObjects

[reinhard]

Author: reinhard
Date: 2004-11-08 10:55:22 -0600 (Mon, 08 Nov 2004)
New Revision: 6654

Modified:
   trunk/gnue-forms/src/GFObjects/GFBlock.py
Log:
React on record navigation that was caused from outside the block. This is a
preparation for blocks following dropdowns.


Modified: trunk/gnue-forms/src/GFObjects/GFBlock.py
===================================================================
--- trunk/gnue-forms/src/GFObjects/GFBlock.py   2004-11-08 16:51:10 UTC (rev 
6653)
+++ trunk/gnue-forms/src/GFObjects/GFBlock.py   2004-11-08 16:55:22 UTC (rev 
6654)
@@ -306,10 +306,15 @@
     self._resultSet = resultSet
     self._currentRecord = -1
     self._recordCount = 0
+
+    # This makes the resultSet call our currentRecordMoved method
+    resultSet.registerListener (self)
+
+    # FIXME: Is this used anywhere?
     resultSet._block = self
 
     if self._resultSet.firstRecord():
-      self.switchRecord(0)
+      # self.switchRecord(0)            # happens via currentRecordMoved
       self._recordCount = self._resultSet.getRecordCount()
     else:
       # This means no results were returned from a query.
@@ -341,6 +346,10 @@
     return self._resultSet
 
 
+  # This gets called by the resultSet whenever the current record changes
+  def currentRecordMoved (self):
+    self.switchRecord (self._resultSet.getRecordNumber() - self._currentRecord)
+
   #
   #
   #
@@ -381,7 +390,7 @@
           self._resultSet.current.setField(field, value, 0)
 
       self._recordCount = self._resultSet.getRecordCount()
-      self.switchRecord(1)
+      # self.switchRecord(1)            # happens via currentRecordMoved
       # Focus in
       self.processTrigger('PRE-FOCUSIN')
       self.processTrigger('ON-NEWRECORD')
@@ -408,7 +417,7 @@
 
       self._resultSet.nextRecord()
       self._recordCount = self._resultSet.getRecordCount()
-      self.switchRecord(1)
+      # self.switchRecord(1)            # happens via currentRecordMoved
 
       # Focus in
       self.processTrigger('PRE-FOCUSIN')
@@ -428,8 +437,8 @@
       self.processTrigger('POST-FOCUSOUT')
 
       self._resultSet.lastRecord()
-      jump = self._resultSet.getRecordNumber () - self._currentRecord
-      self.switchRecord (jump)
+      # jump = self._resultSet.getRecordNumber () - self._currentRecord
+      # self.switchRecord (jump)        # happens via currentRecordMoved
 
       # Focus in
       self.processTrigger('PRE-FOCUSIN')
@@ -442,7 +451,7 @@
       self.processTrigger('POST-FOCUSOUT')
 
       self._resultSet.firstRecord()
-      self.switchRecord(0)
+      # self.switchRecord(0)            # happens via currentRecordMoved
 
       # Focus in
       self.processTrigger('PRE-FOCUSIN')
@@ -456,7 +465,7 @@
       self.processTrigger('POST-FOCUSOUT')
 
       self._resultSet.prevRecord()
-      self.switchRecord(-1)
+      # self.switchRecord(-1)           # happens via currentRecordMoved
 
       # Focus in
       self.processTrigger('PRE-FOCUSIN')
@@ -490,9 +499,9 @@
       if not self._resultSet.setRecord(recordNumber):
         self._resultSet.lastRecord()
 
-      jump = self._resultSet.getRecordNumber() - self._currentRecord
-      self._currentRecord = self._resultSet.getRecordNumber()
-      self.switchRecord(jump)
+      # jump = self._resultSet.getRecordNumber() - self._currentRecord
+      # self._currentRecord = self._resultSet.getRecordNumber()
+      # self.switchRecord(jump)         # happens via currentRecordMoved
 
       # Focus in
       self.processTrigger('PRE-FOCUSIN')
@@ -565,6 +574,7 @@
       
self._dataSourceLink.createEmptyResultSet(masterRecordSet=self._resultSet._masterRecordSet)
     self._currentRecord = 0
     self._recordCount = 0
+    # FIXME: does this happen via currentRecordMoved?
     self.switchRecord(0)
 
 
@@ -594,6 +604,7 @@
         self._dataSourceLink.createEmptyResultSet ( \
             masterRecordSet = self._resultSet._masterRecordSet)
 
+    # FIXME: does this happen via currentRecordMoved?
     self.switchRecord (0)