Update of /cvsroot/freevo/freevo/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3555
Modified Files:
main.py item.py menu.py
Log Message:
fix watermark problem once and for all
Index: main.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/main.py,v
retrieving revision 1.113
retrieving revision 1.114
diff -C2 -d -r1.113 -r1.114
*** main.py 11 Feb 2004 11:09:40 -0000 1.113
--- main.py 12 Feb 2004 16:26:57 -0000 1.114
***************
*** 11,14 ****
--- 11,17 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.114 2004/02/12 16:26:57 dischi
+ # fix watermark problem once and for all
+ #
# Revision 1.113 2004/02/11 11:09:40 dischi
# cachetime checking not working right now
***************
*** 179,182 ****
--- 182,188 ----
items += p.items(self)
+ for i in items:
+ i.is_mainmenu_item = True
+
mainmenu = menu.Menu(_('Freevo Main Menu'), items, item_types='main',
umount_all = 1)
menuw.pushmenu(mainmenu)
Index: item.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/item.py,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** item.py 8 Feb 2004 17:39:39 -0000 1.65
--- item.py 12 Feb 2004 16:26:59 -0000 1.66
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.66 2004/02/12 16:26:59 dischi
+ # fix watermark problem once and for all
+ #
# Revision 1.65 2004/02/08 17:39:39 dischi
# small cosmetic fixes
***************
*** 229,235 ****
if parent:
self.image = parent.image
! if self.image and isinstance(self.image, str) and \
! self.image.startswith(config.IMAGE_DIR) and \
! self.image.find('watermark') > 0:
self.image = None
self.skin_fxd = parent.skin_fxd
--- 232,236 ----
if parent:
self.image = parent.image
! if hasattr(parent, 'is_mainmenu_item'):
self.image = None
self.skin_fxd = parent.skin_fxd
Index: menu.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/menu.py,v
retrieving revision 1.84
retrieving revision 1.85
diff -C2 -d -r1.84 -r1.85
*** menu.py 6 Feb 2004 20:42:55 -0000 1.84
--- menu.py 12 Feb 2004 16:27:06 -0000 1.85
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.85 2004/02/12 16:27:06 dischi
+ # fix watermark problem once and for all
+ #
# Revision 1.84 2004/02/06 20:42:55 dischi
# fix LEFT and RIGHT for tv guide
***************
*** 349,357 ****
for i in items:
! try:
! if not i.image and item.image.find('images/watermarks/') == -1:
! i.image = item.image
! except:
! pass
if hasattr(item, 'display_type'):
i.display_type = item.display_type
--- 352,357 ----
for i in items:
! if not hasattr(item, 'is_mainmenu_item'):
! i.image = item.image
if hasattr(item, 'display_type'):
i.display_type = item.display_type
-------------------------------------------------------
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
