Update of /cvsroot/freevo/freevo/src/skins/main
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1453/skins/main
Modified Files:
area.py info_area.py listing_area.py
Log Message:
more unicode fixes
Index: area.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/skins/main/area.py,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** area.py 23 Feb 2004 15:32:12 -0000 1.35
--- area.py 27 Feb 2004 20:15:03 -0000 1.36
***************
*** 28,31 ****
--- 28,34 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.36 2004/02/27 20:15:03 dischi
+ # more unicode fixes
+ #
# Revision 1.35 2004/02/23 15:32:12 dischi
# fix translation/unicode bug
***************
*** 730,738 ****
return 0,0
! if isinstance(image, str):
if isinstance(val, tuple):
! image = self.loadimage(image, val[2:])
else:
! image = self.loadimage(image, val)
if not image:
--- 733,741 ----
return 0,0
! if isstring(image):
if isinstance(val, tuple):
! image = self.loadimage(String(image), val[2:])
else:
! image = self.loadimage(String(image), val)
if not image:
Index: info_area.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/skins/main/info_area.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** info_area.py 23 Feb 2004 16:34:27 -0000 1.19
--- info_area.py 27 Feb 2004 20:15:03 -0000 1.20
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.20 2004/02/27 20:15:03 dischi
+ # more unicode fixes
+ #
# Revision 1.19 2004/02/23 16:34:27 dischi
# better skin i18n support
***************
*** 297,301 ****
if exp:
exp = eval(exp, {'attr': item.getattr}, function_calls)
! if type( exp ) != unicode and type( exp )!= str:
exp = str( exp )
if exp:
--- 300,304 ----
if exp:
exp = eval(exp, {'attr': item.getattr}, function_calls)
! if not isstring(exp):
exp = str( exp )
if exp:
Index: listing_area.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/skins/main/listing_area.py,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** listing_area.py 24 Feb 2004 21:20:30 -0000 1.25
--- listing_area.py 27 Feb 2004 20:15:03 -0000 1.26
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.26 2004/02/27 20:15:03 dischi
+ # more unicode fixes
+ #
# Revision 1.25 2004/02/24 21:20:30 dischi
# unicode fix
***************
*** 406,411 ****
x_mod, table_text[i] = text_or_icon(settings,
table_text[i],
table_x, table_w,
val.font)
! if not (isinstance(table_text[i], str) or
! isinstance(table_text[i], unicode)):
self.drawimage(table_text[i], (table_x + x_mod, y0 +
vskip))
table_text[i] = ''
--- 409,413 ----
x_mod, table_text[i] = text_or_icon(settings,
table_text[i],
table_x, table_w,
val.font)
! if not isstring(table_text[i]):
self.drawimage(table_text[i], (table_x + x_mod, y0 +
vskip))
table_text[i] = ''
-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
