gnue/forms/src GFDisplayHandler.py GFForm.py GF...

[James Thompson]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     James Thompson <address@hidden> 03/03/23 22:39:18

Modified files:
        forms/src      : GFDisplayHandler.py GFForm.py GFInstance.py 
                         GFParser.py 
        forms/src/GFObjects: GFImage.py 
Added files:
        forms/src/uidrivers/wx/widgets: image.py 

Log message:
        forms <image> support

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFDisplayHandler.py.diff?tr1=1.47&tr2=1.48&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFForm.py.diff?tr1=1.236&tr2=1.237&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFInstance.py.diff?tr1=1.101&tr2=1.102&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFParser.py.diff?tr1=1.105&tr2=1.106&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFObjects/GFImage.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/wx/widgets/image.py?rev=1.1

Patches:
Index: gnue/forms/src/GFDisplayHandler.py
diff -c gnue/forms/src/GFDisplayHandler.py:1.47 
gnue/forms/src/GFDisplayHandler.py:1.48
*** gnue/forms/src/GFDisplayHandler.py:1.47     Mon Mar 17 23:28:10 2003
--- gnue/forms/src/GFDisplayHandler.py  Sun Mar 23 22:39:18 2003
***************
*** 32,37 ****
--- 32,39 ----
  from gnue.common.apps import GDebug
  from gnue.common import events
  
+ import Image
+ 
  try:
    from mx.DateTime import DateTime
  except ImportError:
***************
*** 912,914 ****
--- 914,930 ----
  class ImageDisplayHandler(FieldDisplayHandler):
    def __init__(self, entry, eventHandler):
      FieldDisplayHandler.__init__(self, entry, eventHandler, None)
+ 
+   def _buildDisplayHelper(self, value, editing):
+     if string.lower(self.entry.type) == 'url':
+       try:
+         im = Image.open(value)
+       except IOError:
+         im = Image.new("RGB",(1,1,))
+     
+     return im
+ #    if value == None:
+ #      return ""
+ #    else:
+ #      return "%s" % value
+     
Index: gnue/forms/src/GFForm.py
diff -c gnue/forms/src/GFForm.py:1.236 gnue/forms/src/GFForm.py:1.237
*** gnue/forms/src/GFForm.py:1.236      Sat Mar 15 20:53:17 2003
--- gnue/forms/src/GFForm.py    Sun Mar 23 22:39:18 2003
***************
*** 710,716 ****
      
      
    def __refreshDisplay(self, object):
!     if object._type == 'GFEntry':
        self.dispatchEvent('updateENTRY',object, _form=self)
  
  
--- 710,716 ----
      
      
    def __refreshDisplay(self, object):
!     if object._type == 'GFEntry' or object._type == "GFImage":
        self.dispatchEvent('updateENTRY',object, _form=self)
  
  
Index: gnue/forms/src/GFInstance.py
diff -c gnue/forms/src/GFInstance.py:1.101 gnue/forms/src/GFInstance.py:1.102
*** gnue/forms/src/GFInstance.py:1.101  Sat Mar 15 20:53:17 2003
--- gnue/forms/src/GFInstance.py        Sun Mar 23 22:39:18 2003
***************
*** 780,786 ****
    def changeFocus(self, event):
      if not event._form.endEditing():
        return
!     if event.data._type=='GFEntry':
        if not event.data._navigable:
          # is it possible ever to get into non-navigable field?
          return
--- 780,786 ----
    def changeFocus(self, event):
      if not event._form.endEditing():
        return
!     if event.data._type=='GFEntry' or event.data._type=='GFImage':
        if not event.data._navigable:
          # is it possible ever to get into non-navigable field?
          return
Index: gnue/forms/src/GFObjects/GFImage.py
diff -c gnue/forms/src/GFObjects/GFImage.py:1.2 
gnue/forms/src/GFObjects/GFImage.py:1.3
*** gnue/forms/src/GFObjects/GFImage.py:1.2     Mon Mar 17 23:28:10 2003
--- gnue/forms/src/GFObjects/GFImage.py Sun Mar 23 22:39:18 2003
***************
*** 84,102 ****
      self._page._entryList.append(self)
      
      self._form = self._block._form
                                          
      self._displayHandler = GFDisplayHandler.ImageDisplayHandler(self,
                                                                  
self._form._instance.eventController)
-       
-     #print "INITING IMAGE"
-     #self._block = 
self.findParentOfType('GFForm')._logic._blockMap[self.block]
-     #self._field = self._block._fieldMap[self.field]
-     #self._field._entryList.append(self)
-     #        
-     #print "Block, _field, field", self._block, self._field, self.field
- 
- 
- 
  
  
  
--- 84,98 ----
      self._page._entryList.append(self)
      
      self._form = self._block._form
+ 
+     self._navigable = 0 # self.navigable
                                          
      self._displayHandler = GFDisplayHandler.ImageDisplayHandler(self,
                                                                  
self._form._instance.eventController)
  
+   # TODO: Conversion:  Does this belong here or not?
+   def getValue(self, *args, **parms):
+     return self._field.getValue(*args, **parms)
+      
  
  
Index: gnue/forms/src/GFParser.py
diff -c gnue/forms/src/GFParser.py:1.105 gnue/forms/src/GFParser.py:1.106
*** gnue/forms/src/GFParser.py:1.105    Sat Mar 15 20:53:17 2003
--- gnue/forms/src/GFParser.py  Sun Mar 23 22:39:18 2003
***************
*** 553,559 ****
                 'Typecast': GTypecast.name,
                 'ValueSet': {
                    'URL': {},
!                   'BINARY': {} },
                 'Default': "URL",
                 'Description': 'TODO' },
              'focusorder': {
--- 553,559 ----
                 'Typecast': GTypecast.name,
                 'ValueSet': {
                    'URL': {},
!                   'PIL': {} },
                 'Default': "URL",
                 'Description': 'TODO' },
              'focusorder': {