Update of /cvsroot/freevo/freevo/src/skins/main
In directory sc8-pr-cvs1:/tmp/cvs-serv5537
Modified Files:
listing_area.py screen.py skin_utils.py xml_skin.py
Log Message:
add border support for Font
Index: listing_area.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/skins/main/listing_area.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** listing_area.py 14 Dec 2003 17:39:52 -0000 1.15
--- listing_area.py 1 Jan 2004 17:41:05 -0000 1.16
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.16 2004/01/01 17:41:05 dischi
+ # add border support for Font
+ #
# Revision 1.15 2003/12/14 17:39:52 dischi
# Change TRUE and FALSE to True and False; vfs fixes
***************
*** 356,372 ****
season = 0
episode = 0
- font = val.font.font
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]:
! season = max(season,
font.stringsize(c.show_name[1]))
! episode = max(episode,
font.stringsize(c.show_name[2]))
else:
all_tvs = False
if all_tvs and choice.image:
! tvs_w = font.stringsize('x') + season + episode
else:
! tvs_w = font.stringsize('%s x' % sn[0]) + season +
episode
last_tvs = (sn[0], tvs_w)
--- 359,376 ----
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]:
! season = max(season,
! val.font.stringsize(c.show_name[1]))
! 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:
! tvs_w = val.font.stringsize('%s x' % sn[0]) + season +
episode
last_tvs = (sn[0], tvs_w)
Index: screen.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/skins/main/screen.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** screen.py 1 Jan 2004 15:53:18 -0000 1.6
--- screen.py 1 Jan 2004 17:41:05 -0000 1.7
***************
*** 7,10 ****
--- 7,13 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.7 2004/01/01 17:41:05 dischi
+ # add border support for Font
+ #
# Revision 1.6 2004/01/01 15:53:18 dischi
# move the shadow code into osd.py
***************
*** 206,217 ****
ellipses in self.drawlist.text:
if self.in_update(x1, y1, x2, y2, update_area):
if font.shadow.visible:
! shadow = (font.shadow.x, font.shadow.y, font.shadow.color)
! else:
! shadow = None
osd.drawstringframed(text, x1, y1, x2 - x1, height, font.font,
! font.color, None, align_h = align_h,
align_v = align_v, mode=mode,
! shadow=shadow, ellipses=ellipses,
layer=layer)
for x0, y0, x1, y1 in update_area:
--- 209,224 ----
ellipses in self.drawlist.text:
if self.in_update(x1, y1, x2, y2, update_area):
+ shadow = None
+ border = None
if font.shadow.visible:
! if font.shadow.border:
! border = font.shadow.color
! else:
! shadow = (font.shadow.x, font.shadow.y,
font.shadow.color)
osd.drawstringframed(text, x1, y1, x2 - x1, height, font.font,
! font.color, font.bgcolor, align_h = align_h,
align_v = align_v, mode=mode,
! shadow=shadow, border_color=border,
! ellipses=ellipses, layer=layer)
for x0, y0, x1, y1 in update_area:
Index: skin_utils.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/skins/main/skin_utils.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** skin_utils.py 29 Nov 2003 11:27:41 -0000 1.9
--- skin_utils.py 1 Jan 2004 17:41:05 -0000 1.10
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.10 2004/01/01 17:41:05 dischi
+ # add border support for Font
+ #
# Revision 1.9 2003/11/29 11:27:41 dischi
# move objectcache to util
***************
*** 226,230 ****
pass
! mod_x = width - font.font.stringsize(l[3])
if mod_x < 0:
mod_x = 0
--- 229,233 ----
pass
! mod_x = width - font.stringsize(l[3])
if mod_x < 0:
mod_x = 0
Index: xml_skin.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/skins/main/xml_skin.py,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** xml_skin.py 1 Jan 2004 12:25:07 -0000 1.23
--- xml_skin.py 1 Jan 2004 17:41:05 -0000 1.24
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.24 2004/01/01 17:41:05 dischi
+ # add border support for Font
+ #
# Revision 1.23 2004/01/01 12:25:07 dischi
# store version information and list of depending files
***************
*** 303,306 ****
--- 306,310 ----
'name' : ('font', 0),
'visible' : ('visible', 0),
+ 'border' : ('visible', 0),
'icon' : ('str', 0),
}
***************
*** 785,792 ****
"""
def __init__(self, label):
! XML_data.__init__(self, ('name', 'size', 'color'))
self.label = label
! self.shadow = XML_data(('visible', 'color', 'x', 'y'))
self.shadow.visible = False
def parse(self, node, scale, current_dir):
--- 789,797 ----
"""
def __init__(self, label):
! XML_data.__init__(self, ('name', 'size', 'color', 'bgcolor'))
self.label = label
! self.shadow = XML_data(('visible', 'color', 'x', 'y', 'border'))
self.shadow.visible = False
+ self.shadow.border = False
def parse(self, node, scale, current_dir):
***************
*** 796,799 ****
--- 801,813 ----
self.shadow.parse(subnode, scale, current_dir)
+ def stringsize(self, text):
+ size = self.font.stringsize(text)
+ if self.shadow.visible:
+ if self.shadow.border:
+ return size + (self.size / 10) * 2
+ else:
+ return size + abs(self.shadow.x)
+ return size
+
def prepare(self, color, search_dirs=None, image_names=None, scale=1.0):
if color.has_key(self.color):
-------------------------------------------------------
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
