gnue/forms/src GFDisplayHandler.py uidrivers/wx...

[James Thompson]

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

Modified files:
        forms/src      : GFDisplayHandler.py 
        forms/src/uidrivers/wx/widgets: image.py 

Log message:
        more <image> stuff

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFDisplayHandler.py.diff?tr1=1.51&tr2=1.52&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/wx/widgets/image.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: gnue/forms/src/GFDisplayHandler.py
diff -c gnue/forms/src/GFDisplayHandler.py:1.51 
gnue/forms/src/GFDisplayHandler.py:1.52
*** gnue/forms/src/GFDisplayHandler.py:1.51     Mon Mar 24 21:42:26 2003
--- gnue/forms/src/GFDisplayHandler.py  Mon Mar 24 23:22:53 2003
***************
*** 28,33 ****
--- 28,34 ----
  
  import sys, string, types
  
+ from gnue.common.utils.FileUtils import openResource
  from gnue.common.formatting import DateMask, TextMask, NumberMask
  from gnue.common.apps import GDebug
  from gnue.common import events
***************
*** 926,938 ****
    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
      
--- 927,937 ----
    def _buildDisplayHelper(self, value, editing):
      if string.lower(self.entry.type) == 'url':
        try:
+         # TODO: PIL doesn't like our openResource
+         #im = Image.open(openResource(value))
          im = Image.open(value)
        except IOError:
          im = Image.new("RGB",(1,1,))
      
      return im
      
Index: gnue/forms/src/uidrivers/wx/widgets/image.py
diff -c gnue/forms/src/uidrivers/wx/widgets/image.py:1.2 
gnue/forms/src/uidrivers/wx/widgets/image.py:1.3
*** gnue/forms/src/uidrivers/wx/widgets/image.py:1.2    Mon Mar 24 21:42:26 2003
--- gnue/forms/src/uidrivers/wx/widgets/image.py        Mon Mar 24 23:22:53 2003
***************
*** 65,72 ****
      imageWidth = png.GetWidth()
      imageHeight = png.GetHeight()
      self.imageWindow = wxStaticBitmap(self.pane, -1, png,
!                                wxPoint(object.Char__x*event.widgetWidth,
!                                        
(object.Char__y+spacer+(spacer*object._gap))*event.widgetHeight),
                                 wxSize(imageWidth,imageHeight))
      #self.imageWindow = wxStaticBitmap(self.pane, -1, png,
      #                           wxPoint(object.Char__x*event.widgetWidth,
--- 65,72 ----
      imageWidth = png.GetWidth()
      imageHeight = png.GetHeight()
      self.imageWindow = wxStaticBitmap(self.pane, -1, png,
!                                wxPoint(0,0), 
#object.Char__x*event.widgetWidth,
!                                              
#(object.Char__y+spacer+(spacer*object._gap))*event.widgetHeight),
                                 wxSize(imageWidth,imageHeight))
      #self.imageWindow = wxStaticBitmap(self.pane, -1, png,
      #                           wxPoint(object.Char__x*event.widgetWidth,
***************
*** 77,84 ****
      return self.imageWindow
      
    def OnFrameSize(self, event):
!     self.pane.SetSize(self.pane.GetClientSize())
!     self.fixScrollbars()
  
    def onPaint(self,event):
      self.imageWindow.Refresh()
--- 77,85 ----
      return self.imageWindow
      
    def OnFrameSize(self, event):
!     pass
!     #self.pane.SetSize(self.pane.GetClientSize())
!     #self.fixScrollbars()
  
    def onPaint(self,event):
      self.imageWindow.Refresh()