Update of /cvsroot/freevo/freevo/src/skins/main
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13514/skins/main
Modified Files:
xml_skin.py
Log Message:
Fixes for OSD_EXTRA_FONT:
o Filesystems are case sensitive; we can't arbitrarily set them to lower.
o If we're using the extra font path for osd.py, we need to use it in xml_skin
Index: xml_skin.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/skins/main/xml_skin.py,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** xml_skin.py 8 Feb 2004 18:45:49 -0000 1.30
--- xml_skin.py 12 Feb 2004 03:32:41 -0000 1.31
***************
*** 10,13 ****
--- 10,19 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.31 2004/02/12 03:32:41 outlyer
+ # Fixes for OSD_EXTRA_FONT:
+ #
+ # o Filesystems are case sensitive; we can't arbitrarily set them to lower.
+ # o If we're using the extra font path for osd.py, we need to use it in xml_skin
+ #
# Revision 1.30 2004/02/08 18:45:49 dischi
# font shadow fixes
***************
*** 190,198 ****
else:
# '.ttf' is the default extension
! font = os.path.join(config.FONT_DIR, node.attrs[('', attr)] +
! '.ttf').encode(config.LOCALE)
! if not os.path.isfile(font):
! font = os.path.join(config.FONT_DIR, node.attrs[('', attr)] +
! '.TTF').encode(config.LOCALE)
if not font:
print "skin error: can find font >%s<" % font
--- 196,211 ----
else:
# '.ttf' is the default extension
!
! fontpath = config.OSD_EXTRA_FONT_PATH
! fontpath.append(config.FONT_DIR)
!
! for path in fontpath:
! font = os.path.join(path, node.attrs[('', attr)] +
! '.ttf').encode(config.LOCALE)
! if font: break
! font = os.path.join(path, node.attrs[('', attr)] +
! '.TTF').encode(config.LOCALE)
! if font: break
!
if not font:
print "skin error: can find font >%s<" % font
-------------------------------------------------------
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
