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

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/01/01 13:32:43

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

Log message:
        resumed work on input masks... may
        break cvs

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/forms/src/GFForm.py.diff?cvsroot=OldCVS&tr1=1.134&tr2=1.135&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/forms/src/GFObjects/GFEntry.py.diff?cvsroot=OldCVS&tr1=1.29&tr2=1.30&r1=text&r2=text

Patches:
Index: gnue/forms/src/GFForm.py
diff -c gnue/forms/src/GFForm.py:1.134 gnue/forms/src/GFForm.py:1.135
*** gnue/forms/src/GFForm.py:1.134      Thu Dec 20 22:20:29 2001
--- gnue/forms/src/GFForm.py    Tue Jan  1 13:32:42 2002
***************
*** 72,81 ****
  
      self._app = app
  
!     self._triggerns={}
!     self._triggerns['TRUE'] = 1
!     self._triggerns['FALSE'] = 0
!     self._triggerns['GFMsgBox'] = GFMsgBox
  
      # The "None" init gives datasources time to setup master/detail
      self._inits = [self.primaryInit, None, self.secondaryInit]
--- 72,82 ----
  
      self._app = app
  
!     self._triggerns={
!       'TRUE': 1,
!       'FALSE': 0,
!       'GFMsgBox' : GFMsgBox
!     }
  
      # The "None" init gives datasources time to setup master/detail
      self._inits = [self.primaryInit, None, self.secondaryInit]
Index: gnue/forms/src/GFObjects/GFEntry.py
diff -c gnue/forms/src/GFObjects/GFEntry.py:1.29 
gnue/forms/src/GFObjects/GFEntry.py:1.30
*** gnue/forms/src/GFObjects/GFEntry.py:1.29    Fri Dec 21 17:20:38 2001
--- gnue/forms/src/GFObjects/GFEntry.py Tue Jan  1 13:32:43 2002
***************
*** 105,126 ****
        self._uppercase = 1
      elif self.case == 'lower':
        self._lowercase = 1
!   #
!   # TODO: Commented out until after 0.1.0 release
!   #
!   #  if hasattr(self,'formatmask') and len(self.formatmask): 
!   #    self._formatmask = self.formatmask
!   #    self._inputmask = self.formatmask
!   #    self._displaymask = self.formatmask
!   #
!   #    if hasattr(self,'inputmask') and len(self.inputmask): 
!   #      self._inputmask = self.inputmask
!   #
!   #    if hasattr(self,'displaymask') and len(self.displaymask): 
!   #      self._displaymask = self.displaymask
!   #
!   #    self._maskHandler = formatMaskHandlers[self.typecast](
!   #        self._formatmask, self._inputmask, self._displaymask)
  
      self._cursorPosition = len(self._oldval)
      self._block = self.findParentOfType('GFBlock')
--- 105,124 ----
        self._uppercase = 1
      elif self.case == 'lower':
        self._lowercase = 1
! 
!     if hasattr(self,'formatmask') and len(self.formatmask):
!       self._formatmask = self.formatmask
!       self._inputmask = self.formatmask
!       self._displaymask = self.formatmask
! 
!       if hasattr(self,'inputmask') and len(self.inputmask):
!         self._inputmask = self.inputmask
! 
!       if hasattr(self,'displaymask') and len(self.displaymask):
!         self._displaymask = self.displaymask
! 
!       self._maskHandler = formatMaskHandlers[self.typecast](
!           self._formatmask, self._inputmask, self._displaymask)
  
      self._cursorPosition = len(self._oldval)
      self._block = self.findParentOfType('GFBlock')
***************
*** 293,299 ****
  
      return self._allowedValues
  
! # TODO: Commented out until after 0.1.0 release
! #formatMaskHandlers = { 'text':   FormatMasks.TextMask, 
! #                       'number': FormatMasks.NumberMask, 
! #                       'date':   FormatMasks.DateMask }
--- 291,296 ----
  
      return self._allowedValues
  
! formatMaskHandlers = { 'text':   FormatMasks.TextMask,
!                        'number': FormatMasks.NumberMask,
!                        'date':   FormatMasks.DateMask }