commit-gnue
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

gnue common/src/FormatMasks/BaseMask.py common/...


From: Jason Cater
Subject: gnue common/src/FormatMasks/BaseMask.py common/...
Date: Tue, 10 Sep 2002 11:30:51 -0400

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/09/10 11:30:50

Modified files:
        common/src/FormatMasks: BaseMask.py DateMask.py 
        forms/src      : GFClient.py GFConfig.py GFDisplayHandler.py 
                         GFForm.py GFInstance.py GFParser.py 
        forms/src/GFObjects: GFBox.py GFEntry.py __init__.py 
Added files:
        forms/src/GFObjects: GFParameter.py 

Log message:
        merged forms-input-mask back into head (not completed); added support 
for command-line parameters

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/FormatMasks/BaseMask.py.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/FormatMasks/DateMask.py.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFClient.py.diff?tr1=1.46&tr2=1.47&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFConfig.py.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFDisplayHandler.py.diff?tr1=1.32&tr2=1.33&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFForm.py.diff?tr1=1.170&tr2=1.171&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFInstance.py.diff?tr1=1.56&tr2=1.57&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFParser.py.diff?tr1=1.69&tr2=1.70&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFObjects/GFParameter.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFObjects/GFBox.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFObjects/GFEntry.py.diff?tr1=1.66&tr2=1.67&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFObjects/__init__.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: gnue/common/src/FormatMasks/BaseMask.py
diff -c gnue/common/src/FormatMasks/BaseMask.py:1.17 
gnue/common/src/FormatMasks/BaseMask.py:1.18
*** gnue/common/src/FormatMasks/BaseMask.py:1.17        Sat Aug 24 21:05:26 2002
--- gnue/common/src/FormatMasks/BaseMask.py     Tue Sep 10 11:30:50 2002
***************
*** 50,99 ****
  #   ABMON_1 ... ABMON_12
  #   Return abbreviated name of the n-th month.
  
- monthNames = [_('January'),
-               _('February'),
-               _('March'),
-               _('April'),
-               _('May'),
-               _('June'),
-               _('July'),
-               _('August'),
-               _('September'),
-               _('October'),
-               _('November'),
-               _('December')]
- 
- monthAbbrevNames = [_('Jan'),
-                     _('Feb'),
-                     _('Mar'),
-                     _('Apr'),
-                     _('May'),
-                     _('Jun'),
-                     _('Jul'),
-                     _('Aug'),
-                     _('Sep'),
-                     _('Oct'),
-                     _('Nov'),
-                     _('Dec')]
- 
- weekdayNames = [_('Sunday'),
-                 _('Monday'),
-                 _('Tuesday'),
-                 _('Wednesday'),
-                 _('Thursday'),
-                 _('Friday'),
-                 _('Saturday')]
- 
- weekdayAbbrevNames = [_('Sun'),
-                       _('Mon'),
-                       _('Tue'),
-                       _('Wed'),
-                       _('Thu'),
-                       _('Fri'),
-                       _('Sat')]
- 
- predefinedDateLiterals = "-./: ,"
- 
  
  # This is a class for a mask literal element
  class Literal:
--- 50,55 ----
***************
*** 123,128 ****
--- 79,87 ----
    def __init__(self, outputMask, inputMask=None, outputMask2=None):
  
      self.outputHandlers  = self.parseMask(outputMask)
+     print "Creating mask handler: %s;%s" % (outputMask,inputMask)
+     print self.outputHandlers
+     
      if inputMask != None:
        self.inputHandlers = self.parseMask(inputMask)
      if outputMask2 != None:
Index: gnue/common/src/FormatMasks/DateMask.py
diff -c gnue/common/src/FormatMasks/DateMask.py:1.23 
gnue/common/src/FormatMasks/DateMask.py:1.24
*** gnue/common/src/FormatMasks/DateMask.py:1.23        Mon Jul 15 04:22:02 2002
--- gnue/common/src/FormatMasks/DateMask.py     Tue Sep 10 11:30:50 2002
***************
*** 58,63 ****
--- 58,80 ----
  from gnue.common.GDateTime import GDateTime, InvalidDate
  from FormatExceptions import *
  
+ 
+ # TODO: This is obviously not Internationalized!
+ monthNames = ['January','February','March','April','May','June',
+               'July','August','September','October','November','December']
+ 
+ monthAbbrevNames = ['Jan','Feb','Mar','Apr','May','Jun',
+                     'Jul','Aug','Sep','Oct','Nov','Dec']
+ 
+ weekdayNames = ['Sunday','Monday','Tuesday','Wednesday',
+                 'Thursday','Friday','Saturday']
+ 
+ weekdayAbbrevNames = ['Sun','Mon','Tue','Wed','Thu','Fri','Sat']
+ 
+ 
+ predefinedDateLiterals = "-./: ,"
+ 
+ 
  class DateLiteral (Literal):
    def addSelfToDate(self, value, date):
      pass
Index: gnue/forms/src/GFClient.py
diff -c gnue/forms/src/GFClient.py:1.46 gnue/forms/src/GFClient.py:1.47
*** gnue/forms/src/GFClient.py:1.46     Mon Jul  1 20:32:47 2002
--- gnue/forms/src/GFClient.py  Tue Sep 10 11:30:50 2002
***************
*** 16,22 ****
  # write to the Free Software Foundation, Inc., 59 Temple Place
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
! # Copyright 2000, 2001 Free Software Foundation
  #
  # FILE:
  # GFClient.py
--- 16,22 ----
  # write to the Free Software Foundation, Inc., 59 Temple Place
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
! # Copyright 2000-2002 Free Software Foundation
  #
  # FILE:
  # GFClient.py
***************
*** 75,81 ****
  
      self.ui_type = self.OPTIONS['user_interface']
  
!     if gConfig('disableSplash') == '1': 
        self.disableSplash = 1
      else:
        self.disableSplash = self.OPTIONS['splash_screen']
--- 75,81 ----
  
      self.ui_type = self.OPTIONS['user_interface']
  
!     if gConfig('disableSplash') == '1':
        self.disableSplash = 1
      else:
        self.disableSplash = self.OPTIONS['splash_screen']
***************
*** 104,109 ****
--- 104,128 ----
          self.handleStartupError (_("No Forms Definition File Specified."))
  
  
+     #
+     # Get the user supplied parameters
+     #
+     paramList = self.ARGUMENTS[1:]
+ 
+     userParameters = {}
+ 
+     for param in paramList:
+       psplit = string.split(param,'=',1)
+       if len(psplit) == 1:
+         self.handleStartupError ( \
+             'Parameter "%s" specified, but no value supplied.' % psplit[0] )
+       userParameters[string.lower(psplit[0])] = psplit[1]
+ 
+       GDebug.printMesg(2,'Param "%s"="%s" ' % \
+            (string.lower(psplit[0]), psplit[1]))
+ 
+ 
+ 
      # Initialize user interface (defaults to gui)
      #  If the DISPLAY var isn't set then switch to text
      uiloaded = 0
***************
*** 121,127 ****
            sys.exit()
  
      self.loadKeyMappings()
!     self.runForm(formfile, self.disableSplash)
  
  
    def loadKeyMappings(self):
--- 140,146 ----
            sys.exit()
  
      self.loadKeyMappings()
!     self.runForm(formfile, self.disableSplash, parameters=userParameters)
  
  
    def loadKeyMappings(self):
***************
*** 135,151 ****
      GFKeyMapper.KeyMapper.loadUserKeyMap(mapping)
  
  
!   def runFormFromTrigger(self, formFile):
!     self.runForm(formFile, disableSplash=1)
  
  
!   def runForm(self, formFile, disableSplash=0):
      try:
        #
        # Create the instance
        #
        instance = GFInstance(self, self.getNextSerialNumber(),
!           connections=self.connections, ui=self._ui, 
disableSplash=disableSplash)
        self._formInstances[instance.getSerialNumber()] = instance
  
        #
--- 154,171 ----
      GFKeyMapper.KeyMapper.loadUserKeyMap(mapping)
  
  
!   def runFormFromTrigger(self, formFile, parameters={}):
!     self.runForm(formFile, disableSplash=1, parameters=parameters)
  
  
!   def runForm(self, formFile, disableSplash=0, parameters={}):
      try:
        #
        # Create the instance
        #
        instance = GFInstance(self, self.getNextSerialNumber(),
!           connections=self.connections, ui=self._ui, 
disableSplash=disableSplash,
!           parameters=parameters)
        self._formInstances[instance.getSerialNumber()] = instance
  
        #
Index: gnue/forms/src/GFConfig.py
diff -c gnue/forms/src/GFConfig.py:1.15 gnue/forms/src/GFConfig.py:1.16
*** gnue/forms/src/GFConfig.py:1.15     Mon Aug 26 13:54:02 2002
--- gnue/forms/src/GFConfig.py  Tue Sep 10 11:30:50 2002
***************
*** 85,111 ****
      'Typecast'   : GTypecast.boolean,
      'Default'    : 1 },
  
!   { 'Name'       : 'dateFormatMaskEdit',
      'Type'       : 'Setting',
      'Comment'    : 'Mask for editing date/time fields (without qoutes).',
      'Description': 'Mask for editing date/time fields (without quotes).',
      'Typecast'   : GTypecast.text,
!     'Default'    : '%m/%d/%Y' }, # but %Y will be converted to %y anyway
  
!   { 'Name'       : 'dateFormatMaskView',
      'Type'       : 'Setting',
      'Comment'    : 'Mask for viewing date/time fields (without quotes).',
      'Description': 'Mask for viewing date/time fields (without quotes).',
      'Typecast'   : GTypecast.text,
      'Default'    : '%m/%d/%y' },
  
    { 'Name'       : 'Encoding',
      'Type'       : 'Setting',
      'Comment'    : 'Hack for db encoding',
      'Description': 'Hack for db encoding.',
      'Typecast'   : GTypecast.text,
      'Default'    : 'DEFAULT' },
!     
    { 'Name'       : 'formFontEncoding',
      'Type'       : 'Setting',
      'Comment'    : 'Font in forms encoding. Like iso8859-1, iso8859-13.',
--- 85,195 ----
      'Typecast'   : GTypecast.boolean,
      'Default'    : 1 },
  
!   { 'Name'       : 'DateEditMask',
      'Type'       : 'Setting',
      'Comment'    : 'Mask for editing date/time fields (without qoutes).',
      'Description': 'Mask for editing date/time fields (without quotes).',
      'Typecast'   : GTypecast.text,
!     'Default'    : '%m/%d/%Y' },
  
!   { 'Name'       : 'DateMask',
      'Type'       : 'Setting',
      'Comment'    : 'Mask for viewing date/time fields (without quotes).',
      'Description': 'Mask for viewing date/time fields (without quotes).',
      'Typecast'   : GTypecast.text,
      'Default'    : '%m/%d/%y' },
  
+   { 'Name'       : 'DateEditMask_Time',
+     'Type'       : 'Setting',
+     'Comment'    : 'Mask for editing date/time fields (without qoutes).',
+     'Description': 'Mask for editing date/time fields (without quotes).',
+     'Typecast'   : GTypecast.text,
+     'Default'    : '%h:%i:%s' },
+ 
+   { 'Name'       : 'DateMask_Time',
+     'Type'       : 'Setting',
+     'Comment'    : 'Mask for viewing date/time fields (without quotes).',
+     'Description': 'Mask for viewing date/time fields (without quotes).',
+     'Typecast'   : GTypecast.text,
+     'Default'    : '%h:%i:%s' },
+ 
+   { 'Name'       : 'DateEditMask_Timestamp',
+     'Type'       : 'Setting',
+     'Comment'    : 'Mask for editing date/time fields (without qoutes).',
+     'Description': 'Mask for editing date/time fields (without quotes).',
+     'Typecast'   : GTypecast.text,
+     'Default'    : '%m/%d/%Y %h:%i:%s' },
+ 
+   { 'Name'       : 'DateMask_Timestamp',
+     'Type'       : 'Setting',
+     'Comment'    : 'Mask for viewing date/time fields (without quotes).',
+     'Description': 'Mask for viewing date/time fields (without quotes).',
+     'Typecast'   : GTypecast.text,
+     'Default'    : '%m/%d/%Y %h:%i:%s' },
+ 
+   { 'Name'       : 'TextEditMask',
+     'Type'       : 'Setting',
+     'Comment'    : 'Mask for editing date/time fields (without qoutes).',
+     'Description': 'Mask for editing date/time fields (without quotes).',
+     'Typecast'   : GTypecast.text,
+     'Default'    : '' },
+ 
+   { 'Name'       : 'TextMask',
+     'Type'       : 'Setting',
+     'Comment'    : 'Mask for viewing date/time fields (without quotes).',
+     'Description': 'Mask for viewing date/time fields (without quotes).',
+     'Typecast'   : GTypecast.text,
+     'Default'    : '' },
+ 
+   { 'Name'       : 'NumberEditMask',
+     'Type'       : 'Setting',
+     'Comment'    : 'Mask for editing number fields (without qoutes).',
+     'Description': 'Mask for editing number fields (without quotes).',
+     'Typecast'   : GTypecast.text,
+     'Default'    : '#0.#' },
+ 
+   { 'Name'       : 'NumberMask',
+     'Type'       : 'Setting',
+     'Comment'    : 'Mask for viewing number fields (without quotes).',
+     'Description': 'Mask for viewing number fields (without quotes).',
+     'Typecast'   : GTypecast.text,
+     'Default'    : '#,##0.#' },
+ 
+   { 'Name'       : 'NumberEditMask_Money',
+     'Type'       : 'Setting',
+     'Comment'    : 'Mask for editing number fields (without qoutes).',
+     'Description': 'Mask for editing number fields (without quotes).',
+     'Typecast'   : GTypecast.text,
+     'Default'    : '#0.00' },
+ 
+   { 'Name'       : 'NumberMask_Money',
+     'Type'       : 'Setting',
+     'Comment'    : 'Mask for viewing number fields (without quotes).',
+     'Description': 'Mask for viewing number fields (without quotes).',
+     'Typecast'   : GTypecast.text,
+     'Default'    : '\\$#,##0.00' },
+ 
+   { 'Name'       : 'NumberEditMask_Integer',
+     'Type'       : 'Setting',
+     'Comment'    : 'Mask for editing number fields (without qoutes).',
+     'Description': 'Mask for editing number fields (without quotes).',
+     'Typecast'   : GTypecast.text,
+     'Default'    : '#0' },
+ 
+   { 'Name'       : 'NumberMask_Integer',
+     'Type'       : 'Setting',
+     'Comment'    : 'Mask for viewing number fields (without quotes).',
+     'Description': 'Mask for viewing number fields (without quotes).',
+     'Typecast'   : GTypecast.text,
+     'Default'    : '#,##0' },
+ 
    { 'Name'       : 'Encoding',
      'Type'       : 'Setting',
      'Comment'    : 'Hack for db encoding',
      'Description': 'Hack for db encoding.',
      'Typecast'   : GTypecast.text,
      'Default'    : 'DEFAULT' },
! 
    { 'Name'       : 'formFontEncoding',
      'Type'       : 'Setting',
      'Comment'    : 'Font in forms encoding. Like iso8859-1, iso8859-13.',
Index: gnue/forms/src/GFDisplayHandler.py
diff -c gnue/forms/src/GFDisplayHandler.py:1.32 
gnue/forms/src/GFDisplayHandler.py:1.33
*** gnue/forms/src/GFDisplayHandler.py:1.32     Mon Aug 26 13:54:02 2002
--- gnue/forms/src/GFDisplayHandler.py  Tue Sep 10 11:30:50 2002
***************
*** 480,486 ****
  #
  #
  class TextDisplayHandler(FieldDisplayHandler):
!   def __init__(self, entry, eventHandler, displayMask, inputMask, formatMask):
  ##    FieldDisplayHandler.__init__(self, entry, eventHandler,
  ##            TextMask.TextMask(displayMask, inputMask, formatMask))
      FieldDisplayHandler.__init__(self, entry, eventHandler, None)
--- 480,486 ----
  #
  #
  class TextDisplayHandler(FieldDisplayHandler):
!   def __init__(self, entry, eventHandler, displayMask, inputMask):
  ##    FieldDisplayHandler.__init__(self, entry, eventHandler,
  ##            TextMask.TextMask(displayMask, inputMask, formatMask))
      FieldDisplayHandler.__init__(self, entry, eventHandler, None)
Index: gnue/forms/src/GFForm.py
diff -c gnue/forms/src/GFForm.py:1.170 gnue/forms/src/GFForm.py:1.171
*** gnue/forms/src/GFForm.py:1.170      Sat Jun 15 17:15:08 2002
--- gnue/forms/src/GFForm.py    Tue Sep 10 11:30:50 2002
***************
*** 74,79 ****
--- 74,82 ----
      self._app = app
  
      self._triggerns={}
+     
+     # This will be set by GFInstance
+     self._parameters = {}
  
      # The "None" init gives datasources time to setup master/detail
      self._inits = [self.primaryInit, None, self.secondaryInit]
***************
*** 88,93 ****
--- 91,99 ----
                                
'setStatusText':{'function':self.triggerSetStatusText,
                                            'global': 1,
                                            },
+                               'getParameter':{'function':self.getParameter,
+                                           'global': 1,
+                                           },
                                }
  
  
***************
*** 174,179 ****
--- 180,202 ----
      elif object._type in TabStops and self._currentEntry == None and \
           not object.hidden and not object.readonly:
        self._currentEntry = object
+ 
+ 
+   #
+   # Get a user parameter. If parameter not specified, pull default value
+   #
+   def getParameter(self, parameter):
+     param = string.lower(parameter)
+     try:
+       return self._parameters[param]
+     except KeyError:
+       rv = None
+       for child in self._children:
+         if isinstance(child, GFParameter) and child._name == param:
+           rv = child.default
+           self._parameters[param] = rv
+           break
+     return rv
  
  
    #
Index: gnue/forms/src/GFInstance.py
diff -c gnue/forms/src/GFInstance.py:1.56 gnue/forms/src/GFInstance.py:1.57
*** gnue/forms/src/GFInstance.py:1.56   Thu Jul  4 14:53:04 2002
--- gnue/forms/src/GFInstance.py        Tue Sep 10 11:30:50 2002
***************
*** 44,50 ****
    #
    # Initialize the class
    #
!   def __init__(self, manager, serial, connections, ui, disableSplash):
  
      self.eventController = GFEventController()
  
--- 44,51 ----
    #
    # Initialize the class
    #
!   def __init__(self, manager, serial, connections, ui, disableSplash=0,
!                parameters={}):
  
      self.eventController = GFEventController()
  
***************
*** 55,60 ****
--- 56,62 ----
      self._serial = serial
      self._uimodule = ui
      self._disableSplash = disableSplash
+     self._parameters = parameters
  
      # Incoming events
      self.registerEventListeners( {
***************
*** 125,130 ****
--- 127,133 ----
    #
    def setForm(self, form):
      self._form = form
+     form._parameters = self._parameters
  
    #
    # Return this instance's serial number
Index: gnue/forms/src/GFObjects/GFBox.py
diff -c gnue/forms/src/GFObjects/GFBox.py:1.3 
gnue/forms/src/GFObjects/GFBox.py:1.4
*** gnue/forms/src/GFObjects/GFBox.py:1.3       Mon Oct  8 08:38:14 2001
--- gnue/forms/src/GFObjects/GFBox.py   Tue Sep 10 11:30:50 2002
***************
*** 12,22 ****
  # PURPOSE. See the GNU General Public License for more details.
  #
  # You should have received a copy of the GNU General Public 
! # License along with program; see the file COPYING. If not, 
! # write to the Free Software Foundation, Inc., 59 Temple Place 
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
! # Copyright 2000, 2001 Free Software Foundation
  #
  #
  # FILE:
--- 12,22 ----
  # PURPOSE. See the GNU General Public License for more details.
  #
  # You should have received a copy of the GNU General Public 
! # License along with program; see the file COPYING. If not,
! # write to the Free Software Foundation, Inc., 59 Temple Place
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
! # Copyright 2000-2002 Free Software Foundation
  #
  #
  # FILE:
Index: gnue/forms/src/GFObjects/GFEntry.py
diff -c gnue/forms/src/GFObjects/GFEntry.py:1.66 
gnue/forms/src/GFObjects/GFEntry.py:1.67
*** gnue/forms/src/GFObjects/GFEntry.py:1.66    Mon Aug 26 13:54:02 2002
--- gnue/forms/src/GFObjects/GFEntry.py Tue Sep 10 11:30:50 2002
***************
*** 60,67 ****
      self._allowedValues = None
      self._allowedValuesDescr = [""]
  
-     self._maskHandler = None
- 
      self._rows = 1
      self._gap = 0
  
--- 60,65 ----
***************
*** 148,155 ****
        self._lowercase = 1
  
      self._formatmask = ""
!     self._inputmask = ""
!     self._displaymask = ""
  
      self._block = self.findParentOfType('GFBlock')
  
--- 146,153 ----
        self._lowercase = 1
  
      self._formatmask = ""
!     self._inputmask = hasattr(self,'inputmask') and self.inputmask or ""
!     self._displaymask = hasattr(self,'displaymask') and self.displaymask or ""
  
      self._block = self.findParentOfType('GFBlock')
  
***************
*** 187,193 ****
        for field in [self.fk_key] + self._fk_descr:
          self._fk_datasource.referenceField(field, None)
  
- 
      if hasattr(self, 'queryDefault') and \
           self.queryDefault != None and \
           self._bound and \
--- 185,190 ----
***************
*** 198,218 ****
      # Create an appropriate display handler
      if self.style == 'checkbox':
        self._displayHandler = GFDisplayHandler.CheckboxDisplayHandler(self,
!                self._block._form._app.eventController, self._maskHandler)
      elif self.style == 'dropdown':
        self._displayHandler = GFDisplayHandler.DropdownDisplayHandler(self,
!                self._block._form._app.eventController, self._maskHandler)
      elif self.typecast == 'text':
        self._displayHandler = GFDisplayHandler.TextDisplayHandler(self,
                 self._block._form._app.eventController,
!                self._inputmask, self._displaymask, self._formatmask)
      elif self.typecast == 'number':
        self._displayHandler = GFDisplayHandler.NumberDisplayHandler(self,
                 self._block._form._app.eventController,
!                self._inputmask, self._displaymask)
      elif self.typecast == 'date':
        self._displayHandler = GFDisplayHandler.DateDisplayHandler(self,
!                self._block._form._app.eventController, self._inputmask, 
self._displaymask)
  
    def isQueryable(self):
      return self._queryable
--- 195,217 ----
      # Create an appropriate display handler
      if self.style == 'checkbox':
        self._displayHandler = GFDisplayHandler.CheckboxDisplayHandler(self,
!                self._block._form._app.eventController)
      elif self.style == 'dropdown':
        self._displayHandler = GFDisplayHandler.DropdownDisplayHandler(self,
!                self._block._form._app.eventController)
      elif self.typecast == 'text':
        self._displayHandler = GFDisplayHandler.TextDisplayHandler(self,
                 self._block._form._app.eventController,
!                self._displaymask, self._inputmask)
      elif self.typecast == 'number':
        self._displayHandler = GFDisplayHandler.NumberDisplayHandler(self,
                 self._block._form._app.eventController,
!                self._displaymask, self._inputmask)
      elif self.typecast == 'date':
        self._displayHandler = GFDisplayHandler.DateDisplayHandler(self,
!                self._block._form._app.eventController,
!                self._displaymask, self._inputmask)
! 
  
    def isQueryable(self):
      return self._queryable
Index: gnue/forms/src/GFObjects/__init__.py
diff -c gnue/forms/src/GFObjects/__init__.py:1.2 
gnue/forms/src/GFObjects/__init__.py:1.3
*** gnue/forms/src/GFObjects/__init__.py:1.2    Sat Jun 30 01:03:07 2001
--- gnue/forms/src/GFObjects/__init__.py        Tue Sep 10 11:30:50 2002
***************
*** 1,18 ****
  __all__ = [
        "GFBlock",
!       "GFDataSource",  
!       "GFLabel", 
!       "GFOption", 
        "GFScrollBar",
!       "GFBox", 
!       "GFDatabase",           
!       "GFMsgBox",      
!       "GFOptions",     
        "GFValue",
!       "GFButton", 
!       "GFEntry", 
!       "GFObj", 
!       "GFPage"
         ]
  
  for module in __all__:
--- 1,19 ----
  __all__ = [
        "GFBlock",
!       "GFDataSource",
!       "GFLabel",
!       "GFOption",
        "GFScrollBar",
!       "GFBox",
!       "GFDatabase",
!       "GFMsgBox",
!       "GFOptions",
        "GFValue",
!       "GFButton",
!       "GFEntry",
!       "GFObj",
!       "GFPage", 
!         "GFParameter"
         ]
  
  for module in __all__:
Index: gnue/forms/src/GFParser.py
diff -c gnue/forms/src/GFParser.py:1.69 gnue/forms/src/GFParser.py:1.70
*** gnue/forms/src/GFParser.py:1.69     Thu Jul  4 18:36:07 2002
--- gnue/forms/src/GFParser.py  Tue Sep 10 11:30:50 2002
***************
*** 190,196 ****
              'alignment': {
                 'Typecast': GTypecast.name, 
                 'ValueSet': { 
!                   'left': {}, 
                    'right': {}, 
                    'center': {} }, 
                 'Default': "left"}, 
--- 190,196 ----
              'alignment': {
                 'Typecast': GTypecast.name, 
                 'ValueSet': { 
!                   'left': {},
                    'right': {}, 
                    'center': {} }, 
                 'Default': "left"}, 
***************
*** 235,241 ****
                 'Typecast': GTypecast.whole },
              'readonly': {
                 'Typecast': GTypecast.boolean, 
!                'Default': 0   }, 
              'required': {
                 'Description': 'This object cannot have an empty value prior '
                                'to a commit.',
--- 235,241 ----
                 'Typecast': GTypecast.whole },
              'readonly': {
                 'Typecast': GTypecast.boolean, 
!                'Default': 0   },
              'required': {
                 'Description': 'This object cannot have an empty value prior '
                                'to a commit.',
***************
*** 460,466 ****
              'value': {
                 'Typecast': GTypecast.text } },
           'MixedContent': 1,
!          'SingleInstance': 1, 
           'ParentTags': ('options',) },
  
        'height': {
--- 460,466 ----
              'value': {
                 'Typecast': GTypecast.text } },
           'MixedContent': 1,
!          'SingleInstance': 1,
           'ParentTags': ('options',) },
  
        'height': {
***************
*** 559,564 ****
--- 559,566 ----
          updates={'datasource': {
                     'BaseClass': GFObjects.GFDataSource,
                     'ParentTags': ('form',) },
+                  'cparam': {
+                    'BaseClass': GFObjects.GFParameter }
                   }))
  
      #




reply via email to

[Prev in Thread] Current Thread [Next in Thread]