Update of /cvsroot/freevo/freevo/skins/dischi1
In directory sc8-pr-cvs1:/tmp/cvs-serv17325
Modified Files:
listing_area.py skin_dischi1.py xml_skin.py
Log Message:
small bugfixes for loading a new skin
Index: listing_area.py
===================================================================
RCS file: /cvsroot/freevo/freevo/skins/dischi1/listing_area.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** listing_area.py 23 Mar 2003 11:38:49 -0000 1.15
--- listing_area.py 23 Mar 2003 21:40:31 -0000 1.16
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.16 2003/03/23 21:40:31 dischi
+ # small bugfixes for loading a new skin
+ #
# Revision 1.15 2003/03/23 11:38:49 dischi
# fixed some alignments
***************
*** 380,385 ****
if menuw.menu_items[-1] != menu.choices[-1] and area.images['downarrow']:
self.draw_image(area.images['downarrow'].filename,
area.images['downarrow'])
! except IndexError:
! # empty menu
pass
--- 383,388 ----
if menuw.menu_items[-1] != menu.choices[-1] and area.images['downarrow']:
self.draw_image(area.images['downarrow'].filename,
area.images['downarrow'])
! except:
! # empty menu / missing images
pass
Index: skin_dischi1.py
===================================================================
RCS file: /cvsroot/freevo/freevo/skins/dischi1/skin_dischi1.py,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** skin_dischi1.py 23 Mar 2003 19:57:11 -0000 1.41
--- skin_dischi1.py 23 Mar 2003 21:40:31 -0000 1.42
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.42 2003/03/23 21:40:31 dischi
+ # small bugfixes for loading a new skin
+ #
# Revision 1.41 2003/03/23 19:57:11 dischi
# Moved skin xml files to skins/xml/type1 and all stuff for blue_round2 to
***************
*** 326,334 ****
if dir and os.path.isfile(os.path.join(dir, 'folder.fxd')):
! settings.load(os.path.join(dir, 'folder.fxd'), copy_content)
return settings
elif dir and os.path.isfile(dir):
! settings.load(dir, copy_content)
return settings
return None
--- 329,337 ----
if dir and os.path.isfile(os.path.join(dir, 'folder.fxd')):
! settings.load(os.path.join(dir, 'folder.fxd'), copy_content, clear=TRUE)
return settings
elif dir and os.path.isfile(dir):
! settings.load(dir, copy_content, clear=TRUE)
return settings
return None
Index: xml_skin.py
===================================================================
RCS file: /cvsroot/freevo/freevo/skins/dischi1/xml_skin.py,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** xml_skin.py 23 Mar 2003 20:50:07 -0000 1.30
--- xml_skin.py 23 Mar 2003 21:40:32 -0000 1.31
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.31 2003/03/23 21:40:32 dischi
+ # small bugfixes for loading a new skin
+ #
# Revision 1.30 2003/03/23 20:50:07 dischi
# bugfix
***************
*** 756,760 ****
! def load(self, file, copy_content = 0, prepare = TRUE):
"""
load and parse the skin file
--- 759,763 ----
! def load(self, file, copy_content = 0, prepare = TRUE, clear=FALSE):
"""
load and parse the skin file
***************
*** 794,797 ****
--- 797,811 ----
if include:
+ if clear:
+ self._layout = {}
+ self._font = {}
+ self._color = {}
+ self._menuset = {}
+ self._menu = {}
+ self._popup = ''
+ self._player = XML_player()
+ self._tv = XML_tv()
+ self._mainmenu = XML_mainmenu()
+
self.load(include, copy_content, prepare = FALSE)
-------------------------------------------------------
This SF.net email is sponsored by:Crypto Challenge is now open!
Get cracking and register here for some mind boggling fun and
the chance of winning an Apple iPod:
http://ads.sourceforge.net/cgi-bin/redirect.pl?thaw0031en
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
