Update of /cvsroot/freevo/freevo/skins/dischi1
In directory sc8-pr-cvs1:/tmp/cvs-serv18731
Modified Files:
blue1_big.xml info_area.py
Log Message:
Added tv info area. After that day of work, I needed to do something
that has a result
Index: blue1_big.xml
===================================================================
RCS file: /cvsroot/freevo/freevo/skins/dischi1/blue1_big.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** blue1_big.xml 8 Mar 2003 19:54:11 -0000 1.14
--- blue1_big.xml 11 Mar 2003 20:26:48 -0000 1.15
***************
*** 324,332 ****
</screen>
<title visible="no"/>
! <view layout="player view" visible="no">
! <area x="430" y="200" width="420" height="360"/>
</view>
! <info layout="player info" visible="no">
! <area x="-50" y="80" width="550" height="300"/>
</info>
<listing layout="tv listing" visible="yes">
--- 324,332 ----
</screen>
<title visible="no"/>
! <view layout="tv view" visible="no">
! <area x="10" y="10" width="420" height="190"/>
</view>
! <info layout="tv info" visible="yes">
! <area x="10" y="10" width="420" height="190"/>
</info>
<listing layout="tv listing" visible="yes">
***************
*** 341,345 ****
</layout>
! <!-- default listing area -->
<layout label="tv listing">
<content x="10" type="text" spacing="0">
--- 341,345 ----
</layout>
! <!-- tv listing area -->
<layout label="tv listing">
<content x="10" type="text" spacing="0">
***************
*** 368,371 ****
--- 368,386 ----
</layout>
+ <!-- tv listing area -->
+ <layout label="tv info">
+ <background>
+ <rectangle size="0" bgcolor="0x80000000" radius="10" width="max"/>
+ </background>
+ <content x="10" y="10" height="max-20" width="max-20" type="text"
+ spacing="10" font="white">
+ <item type="default">
+ @title@
+
+ @desc@
+ Test
+ </item>
+ </content>
+ </layout>
</skin>
Index: info_area.py
===================================================================
RCS file: /cvsroot/freevo/freevo/skins/dischi1/info_area.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** info_area.py 7 Mar 2003 17:28:18 -0000 1.3
--- info_area.py 11 Mar 2003 20:26:48 -0000 1.4
***************
*** 10,13 ****
--- 10,17 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.4 2003/03/11 20:26:48 dischi
+ # Added tv info area. After that day of work, I needed to do something
+ # that has a result
+ #
# Revision 1.3 2003/03/07 17:28:18 dischi
# small fixes
***************
*** 86,90 ****
item = self.item
! if content.types.has_key(item.type):
val = content.types[item.type]
else:
--- 90,94 ----
item = self.item
! if hasattr(item, 'type') and content.types.has_key(item.type):
val = content.types[item.type]
else:
***************
*** 146,150 ****
else:
table[0] += [ line ]
! table[1] += [ ' ' ]
x0 = content.x
--- 150,154 ----
else:
table[0] += [ line ]
! table[1] += [ '' ]
x0 = content.x
***************
*** 152,172 ****
y_spacing = osd.stringsize('Arj', font=font.name, ptsize=font.size)[1] * 1.1
! for col in table:
! w = 0
! txt = ''
!
! for row in col:
! w = max(w, osd.stringsize(row, font=font.name, ptsize=font.size)[0])
! if x0 + w > content.x + content.width:
! w = content.x + content.width - x0
! y0 = content.y
! for row in col:
! if row:
! self.write_text(row, font, content, x=x0, y=y0, width= w + 10,
height=-1, mode='hard')
y0 += y_spacing
-
- x0 += w + content.spacing
self.last_item = self.item
--- 156,180 ----
y_spacing = osd.stringsize('Arj', font=font.name, ptsize=font.size)[1] * 1.1
! w = 0
! for row in table[0]:
! w = max(w, osd.stringsize(row, font=font.name, ptsize=font.size)[0])
! if x0 + w > content.x + content.width:
! w = content.x + content.width - x0
! y0 = content.y
! for i in range(0,len(table[0])):
! if table[0][i] and not table[1][i]:
! rec = self.write_text(table[0][i], font, content, x=x0, y=y0,
width=w,
! height=content.height + content.y - y0,
mode='soft')
! y0 += rec[3]-rec[1]
! else:
! if table[0][i]:
! self.write_text(table[0][i], font, content, x=x0, y=y0, width=w,
! height=-1, mode='hard')
! if table[1][i]:
! self.write_text(table[1][i], font, content,
x=x0+w+content.spacing, y=y0,
! width=content.width - w - content.spacing,
height=-1, mode='hard')
y0 += y_spacing
self.last_item = self.item
-------------------------------------------------------
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
