Update of /cvsroot/freevo/freevo/WIP/Barbieri
In directory sc8-pr-cvs1:/tmp/cvs-serv2486/WIP/Barbieri
Modified Files:
info_area.py
Log Message:
Some fixes
Index: info_area.py
===================================================================
RCS file: /cvsroot/freevo/freevo/WIP/Barbieri/info_area.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** info_area.py 27 Jun 2003 19:49:55 -0000 1.12
--- info_area.py 27 Jun 2003 22:08:54 -0000 1.13
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.13 2003/06/27 22:08:54 gsbarbieri
+ # Some fixes
+ #
# Revision 1.12 2003/06/27 19:49:55 gsbarbieri
# TV Guide and vertical alignment now works!
***************
*** 124,128 ****
if i.y + i.height > self.content.height:
break
- #print "(%s,%s) -> %sx%s: %s" % (i.x, i.y, i.width, i.height, i.text )
self.write_text( i.text,
i.font, self.content,
--- 127,130 ----
***************
*** 154,167 ****
"""
if self.infoitem is not self.last_item or self.infoitem != self.last_item:
! if hasattr( self.infoitem, 'info_type') and \
! self.content.types.has_key( self.infoitem.info_type ):
! val = self.content.types[ self.infoitem.info_type ]
! elif hasattr( self.infoitem, 'type' ) and \
! self.content.types.has_key( self.infoitem.type ):
! val = self.content.types[ self.infoitem.type ]
! else:
! val = self.content.types[ 'default' ]
if not hasattr( val, 'fcontent' ):
--- 156,167 ----
"""
if self.infoitem is not self.last_item or self.infoitem != self.last_item:
! key = 'default'
! if hasattr( self.infoitem, 'info_type'):
! key = self.infoitem.info_type
! elif hasattr( self.infoitem, 'type' ):
! key = self.infoitem.type
! val = self.content.types[ key ]
if not hasattr( val, 'fcontent' ):
***************
*** 345,354 ****
else:
element.width = min( m_width, r.width )
!
! if isinstance( element.height, int ):
! if element.height <= 0:
! element.height = min( m_height, r.height )
else:
element.height = min( m_height, r.height )
x += element.width
--- 345,357 ----
else:
element.width = min( m_width, r.width )
!
! if isinstance( element.height, int ) or element.height ==
'line_height':
! if element.height <= 0 or element.height == 'line_height':
! element.height = osd.stringsize( element.text,
! element.font.name,
! element.font.size)[ 1 ]
else:
element.height = min( m_height, r.height )
+
x += element.width
-------------------------------------------------------
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa00100006ave/direct;at.asp_061203_01/01
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
