Update of /cvsroot/freevo/freevo/src/skins/main In directory sc8-pr-cvs1:/tmp/cvs-serv18624
Modified Files: listing_area.py Log Message: fix tv show listing Index: listing_area.py =================================================================== RCS file: /cvsroot/freevo/freevo/src/skins/main/listing_area.py,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** listing_area.py 1 Jan 2004 17:41:05 -0000 1.16 --- listing_area.py 4 Jan 2004 18:17:24 -0000 1.17 *************** *** 10,13 **** --- 10,16 ---- # ----------------------------------------------------------------------- # $Log$ + # Revision 1.17 2004/01/04 18:17:24 dischi + # fix tv show listing + # # Revision 1.16 2004/01/01 17:41:05 dischi # add border support for Font *************** *** 258,264 **** height = vspace - content.spacing ! last_tvs = ('', 0) ! all_tvs = True ! for choice in menuw.menu_items: --- 261,267 ---- height = vspace - content.spacing ! last_tvs = ('', 0) ! all_tvs = True ! tvs_shortname = True for choice in menuw.menu_items: *************** *** 359,363 **** season = 0 episode = 0 ! for c in menuw.menu_items: if c.type == 'video' and hasattr(c,'tv_show') and \ c.tv_show and c.show_name[0] == sn[0]: --- 362,366 ---- season = 0 episode = 0 ! for c in menu.choices: if c.type == 'video' and hasattr(c,'tv_show') and \ c.tv_show and c.show_name[0] == sn[0]: *************** *** 366,373 **** episode = max(episode, val.font.stringsize(c.show_name[2])) else: all_tvs = False ! if all_tvs and choice.image: tvs_w = val.font.stringsize('x') + season + episode else: --- 369,381 ---- episode = max(episode, val.font.stringsize(c.show_name[2])) + if tvs_shortname and not c.image: + tvs_shortname = False else: all_tvs = False ! if all_tvs and not tvs_shortname and len(menu.choices) > 5: ! tvs_shortname = True ! ! if all_tvs and tvs_shortname: tvs_w = val.font.stringsize('x') + season + episode else: *************** *** 383,387 **** y=y0 + vskip, width=100, height=-1, align_h='right', mode='hard') ! if all_tvs and choice.image: text = '%sx' % sn[1] else: --- 391,395 ---- y=y0 + vskip, width=100, height=-1, align_h='right', mode='hard') ! if all_tvs and tvs_shortname: text = '%sx' % sn[1] else: ------------------------------------------------------- This SF.net email is sponsored by: IBM Linux Tutorials. Become an expert in LINUX or just sharpen your skills. Sign up for IBM's Free Linux Tutorials. Learn everything from the bash shell to sys admin. Click now! http://ads.osdn.com/?ad_id=1278&alloc_id=3371&op=click _______________________________________________ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog