gnue/forms/src/GFObjects GFBlock.py GFEntry.py

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/11/22 00:50:39

Modified files:
        forms/src/GFObjects: GFBlock.py GFEntry.py 

Log message:
        more work on switching focus traversal into new logic/layout (row fixes)

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/forms/src/GFObjects/GFBlock.py.diff?cvsroot=OldCVS&tr1=1.64&tr2=1.65&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/forms/src/GFObjects/GFEntry.py.diff?cvsroot=OldCVS&tr1=1.81&tr2=1.82&r1=text&r2=text

Patches:
Index: gnue/forms/src/GFObjects/GFBlock.py
diff -c gnue/forms/src/GFObjects/GFBlock.py:1.64 
gnue/forms/src/GFObjects/GFBlock.py:1.65
*** gnue/forms/src/GFObjects/GFBlock.py:1.64    Thu Nov 21 21:57:24 2002
--- gnue/forms/src/GFObjects/GFBlock.py Fri Nov 22 00:50:39 2002
***************
*** 57,63 ****
      #self._datasource = None
      self._resultSet = None
      self._dataSourceLink = None
!     
      self._currentRecord = 0
      self._recordCount = 0
      self._queryDefaults = {}
--- 57,63 ----
      #self._datasource = None
      self._resultSet = None
      self._dataSourceLink = None
! 
      self._currentRecord = 0
      self._recordCount = 0
      self._queryDefaults = {}
***************
*** 66,72 ****
      self._autocreate =  int(gConfig('autocreate'))
      self._gap = 0
      self._rows = 1
!     
      # Populated by GFEntry's initialize
      self._entryList = []
  
--- 66,72 ----
      self._autocreate =  int(gConfig('autocreate'))
      self._gap = 0
      self._rows = 1
! 
      # Populated by GFEntry's initialize
      self._entryList = []
  
***************
*** 111,125 ****
                              'isSaved':{'function':self.isSaved,
                                         'description':'Returns 1 if block 
contains no modified records.'},
                              'lastRecord':{'function':self.lastRecord,
!                                       'description':'Navigates the block to 
the last record it contains.'},                                      
                              'newRecord':{'function':self.newRecord,
!                                          'description':''},                   
                   
                              'nextRecord':{'function':self.nextRecord,
!                                           'description':'Navigates the block 
to the next record in sequence.'},                                      
                              'prevRecord':{'function':self.prevRecord,
!                                           'description':'Navigates the block 
to the previous record in sequence.'},                                      
                              'rollback':{'function':self.processRollback,
!                                         'description':'Clears all records 
regardless of state from the block'},                                      
                              }
  
      self._triggerProperties={'parent':  {'get':self.getParent}}
--- 111,125 ----
                              'isSaved':{'function':self.isSaved,
                                         'description':'Returns 1 if block 
contains no modified records.'},
                              'lastRecord':{'function':self.lastRecord,
!                                       'description':'Navigates the block to 
the last record it contains.'},
                              'newRecord':{'function':self.newRecord,
!                                          'description':''},
                              'nextRecord':{'function':self.nextRecord,
!                                           'description':'Navigates the block 
to the next record in sequence.'},
                              'prevRecord':{'function':self.prevRecord,
!                                           'description':'Navigates the block 
to the previous record in sequence.'},
                              'rollback':{'function':self.processRollback,
!                                         'description':'Clears all records 
regardless of state from the block'},
                              }
  
      self._triggerProperties={'parent':  {'get':self.getParent}}
***************
*** 150,156 ****
      if hasattr(self,'datasource'):
        self.datasource = string.lower(self.datasource)
  
-     self.walk(self.__setChildRowSettings)
      return GFContainer._buildObject(self)
  
    #
--- 150,155 ----
***************
*** 182,193 ****
      # We will monitor our own resultSet changes
      self._dataSourceLink.registerResultSetListener(self._loadResultSet)
  
  
    def __setChildRowSettings(self, object):
      if hasattr(object,'rows'):
!       object._rows = object.rows
      else:
!       object._rows = self._rows
  
      if hasattr(object,'rowSpacer'):
        object._gap = object.rowSpacer
--- 181,193 ----
      # We will monitor our own resultSet changes
      self._dataSourceLink.registerResultSetListener(self._loadResultSet)
  
+     self.walk(self.__setChildRowSettings)
  
    def __setChildRowSettings(self, object):
      if hasattr(object,'rows'):
!       rows = object._rows = object.rows
      else:
!       rows = object._rows = self._rows
  
      if hasattr(object,'rowSpacer'):
        object._gap = object.rowSpacer
Index: gnue/forms/src/GFObjects/GFEntry.py
diff -c gnue/forms/src/GFObjects/GFEntry.py:1.81 
gnue/forms/src/GFObjects/GFEntry.py:1.82
*** gnue/forms/src/GFObjects/GFEntry.py:1.81    Fri Nov 22 00:36:12 2002
--- gnue/forms/src/GFObjects/GFEntry.py Fri Nov 22 00:50:39 2002
***************
*** 131,136 ****
--- 131,148 ----
                 self._form._app.eventController,
                 self._displaymask, self._inputmask)
  
+     # Row settings
+     if hasattr(self,'rows'):
+       self._rows = self.rows
+     else:
+       self._rows = self._field._rows
+ 
+     if hasattr(self,'rowSpacer'):
+       self._gap = self.rowSpacer
+     else:
+       self._gap = self._field._gap
+ 
+ 
    # TODO: Conversion:  Does this belong here or not?
    def getValue(self, *args, **parms):
      return self._field.getValue(*args, **parms)