r5731 - in trunk/gnue-forms/src: . GFObjects uidrivers/curses/widgets/form

[jcater]

Author: jcater
Date: 2004-04-16 18:12:41 -0500 (Fri, 16 Apr 2004)
New Revision: 5731

Modified:
   trunk/gnue-forms/src/GFObjects/GFField.py
   trunk/gnue-forms/src/GFParser.py
   trunk/gnue-forms/src/uidrivers/curses/widgets/form/widget.py
   trunk/gnue-forms/src/uidrivers/curses/widgets/form/wrappers.py
Log:
added support for <field rtrim="Y" ltrim="Y">, which strips spaces from user 
input; note: rstrip is turned on by default, so if you want to keep trailing 
spaces, you must specify rtrim="N".

Modified: trunk/gnue-forms/src/GFObjects/GFField.py
===================================================================
--- trunk/gnue-forms/src/GFObjects/GFField.py   2004-04-16 20:13:35 UTC (rev 
5730)
+++ trunk/gnue-forms/src/GFObjects/GFField.py   2004-04-16 23:12:41 UTC (rev 
5731)
@@ -49,6 +49,8 @@
     self.case="mixed"
     self.style="default"
     self.defaultToLast = False
+    self.rtrim = False
+    self.ltrim = False
 
     # Runtime variables
     self._uppercase = False
@@ -233,6 +235,17 @@
 
     if value == None:       value = ''
 
+    if self.rtrim:
+      try:
+        value = string.rstrip(value)
+      except:
+        pass
+    if self.ltrim:
+      try:
+        value = string.lstrip(value)
+      except:
+        pass
+
     # TODO: check to see if this is still needed
     #CheckBox does not work if comment following "if" block (ra3vat)
     if self.style == 'checkbox' and value == '':      value = 0
@@ -278,6 +291,17 @@
       # Not initialized yet.
       return
 
+    if self.rtrim:
+      try:
+        value = string.rstrip(value)
+      except:
+        pass
+    if self.ltrim:
+      try:
+        value = string.lstrip(value)
+      except:
+        pass
+
     if mode == 'query':
       self._block._queryValues[self] = value
 

Modified: trunk/gnue-forms/src/GFParser.py
===================================================================
--- trunk/gnue-forms/src/GFParser.py    2004-04-16 20:13:35 UTC (rev 5730)
+++ trunk/gnue-forms/src/GFParser.py    2004-04-16 23:12:41 UTC (rev 5731)
@@ -419,7 +419,7 @@
                'Description': 'Trim extraneous space at end '
                               'of user input.',
                'Typecast': GTypecast.boolean,
-               'Default': False } },
+               'Default': True } },
          'ParentTags': ('block',),
          'Description': 'TODO' },
 
@@ -633,7 +633,7 @@
                'Description': 'The name of the block that this ties to.' },
             'mimetype':        {
                'Typecast': GTypecast.name,
-               'Required': True,               
+               'Required': True,
                'Description': 'TODO' },
             'type':        {
                'Typecast': GTypecast.name,
@@ -850,7 +850,7 @@
     #
     copy._deepcopy_dispatch[types.FunctionType] = copy._deepcopy_atomic
     copy._deepcopy_dispatch[types.ClassType] = copy._deepcopy_atomic
-    copy._deepcopy_dispatch[type(int)] = copy._deepcopy_atomic                 
           
+    copy._deepcopy_dispatch[type(int)] = copy._deepcopy_atomic
     dialog=copy.deepcopy(xmlElements['form'])
     dialog['Required'] = False
     dialog['SingleInstance'] = False
@@ -908,16 +908,16 @@
 #
 #######################################################
 
-class xmlFormsHandler (GParser.xmlHandler): 
+class xmlFormsHandler (GParser.xmlHandler):
   """
   This class is called by the XML parser to
   process the .GFD file.
   """
   def __init__(self):
-    
 
+
     GParser.xmlHandler.__init__(self)
-    
+
     # This is a temp thing until we figure out
     # how to better do layout namespaces
     self.xmlNamespaceAttributesAsPrefixes = True

Modified: trunk/gnue-forms/src/uidrivers/curses/widgets/form/widget.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/curses/widgets/form/widget.py        
2004-04-16 20:13:35 UTC (rev 5730)
+++ trunk/gnue-forms/src/uidrivers/curses/widgets/form/widget.py        
2004-04-16 23:12:41 UTC (rev 5731)
@@ -54,17 +54,17 @@
     #sys.exit()
 
     SIO = GetSIO()  # get handle to the existing screen interface object
-    
+
     self.mainWindow = ScreenContainer(SIO)
     self.containerFrame = self.mainWindow
-    
+
     # The window in which pages will be rendered
     if object._layout.tabbed != 'none':
       self._wrapper = wrappers.TabbedWrapper(self)
-  
+
     else:
-      self._wrapper = wrappers.PlainWrapper(self)    
-    
+      self._wrapper = wrappers.PlainWrapper(self)
+
     newWidget = self._wrapper.pane
 
 

Modified: trunk/gnue-forms/src/uidrivers/curses/widgets/form/wrappers.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/curses/widgets/form/wrappers.py      
2004-04-16 20:13:35 UTC (rev 5730)
+++ trunk/gnue-forms/src/uidrivers/curses/widgets/form/wrappers.py      
2004-04-16 23:12:41 UTC (rev 5731)
@@ -45,10 +45,10 @@
     Frame.__init__(self, frame, y, x, formHeight, formWidth)
     ##wxScrolledWindow.__init__(self, frame, -1)
     self.spacerpane = Frame(self,y, x, formHeight, formWidth)
-    
 
+
     ##EVT_SIZE(self.frame, self.OnFrameSize)
-    
+
     ##self.layoutSize = wxSize(formWidth*uiform._uiDriver.widgetWidth,
     ##                  formHeight*uiform._uiDriver.widgetHeight)
     self._fitted = 0
@@ -87,8 +87,8 @@
       else:
         p.Show()
 
-                         
 
+
 #
 # Notebook pages
 #
@@ -99,7 +99,7 @@
     x = y = 0
 ##    self.pane = notebook = Frame(self.spacerpane,y, x, self._formHeight, 
self._formWidth)
     self.pane = self.frame
-         
+
 ##     self.pane = notebook = wxNotebook(self.spacerpane,-1, #wxPoint(6,6),
 ##                                       style=tabstyle)
 ##     self.notebooksizer = sizer1 = wxNotebookSizer(notebook)
@@ -183,7 +183,7 @@
     x = y = 1
     newWidget = Frame(self.pane,y, x, self._formHeight, self._formWidth, 
border=0, dropshadow=0)
 ##     newWidget = wxPanel(self.pane, -1,  size=self.layoutSize)
-     
+
     # Only show first page
     if not self._fitted:
       newWidget.Show()
@@ -210,10 +210,10 @@
 ##       else:
 ##         p.Show(1)
 
-        
+
 _tabStyles = {'top':0,
               'left':1,
               'right':2,
               'bottom':3,
                              }
- 
+