Update of /cvsroot/freevo/freevo/skins/dischi1
In directory sc8-pr-cvs1:/tmp/cvs-serv14329
Modified Files:
blue1_big.xml blue1_small.xml listing.py skin_dischi1.py
xml_skin.py
Added Files:
blue_round1.xml
Log Message:
blue_round1.xml working
--- NEW FILE: blue_round1.xml ---
<?xml version="1.0" ?>
<freevo>
<!--
This is the blue round 1 skin
It includes blue_round1 for the background, some fonts and the main
menu style
-->
<skin include="blue1_small" geometry="800x600">
<!-- Redefine of the type default -->
<menu type="default">
<!-- screen0 is already defined in blue1_big -->
<screen layout="screen0" visible="yes"/>
<!--
title0 is already defined in blue1_big, but there will
is a new definition of the font from the layout (white big)
-->
<title layout="title0" visible="yes">
<area x="10" y="10" width="780" height="60"/>
</title>
<!-- unsupported -->
<view layout="view0" visible="yes">
<area x="560" y="115" width="200" height="300"/>
</view>
<listing layout="transparent listing" visible="yes">
<area x="10" y="130" width="550" height="450"/>
</listing>
<info visible="no"/>
</menu>
<!--
the main menu isn't redefined, the area is the same.
But there is a new define of list_main later
-->
<!-- ********************************************** -->
<!-- LAYOUT DEFINITIONS -->
<!-- default listing area -->
<layout label="transparent listing">
<background>
<rectangle size="0" bgcolor="0x80000000" radius="10"/>
</background>
<content x="20" y="20" width="max-40" height="max-40" type="text"
spacing="2">
<item type="default" font="white shadow1"/>
<item type="selected" font="white shadow1">
<rectangle bgcolor="0xff000000" size="0" x="-5" y="-3" width="max+10"
height="max+6" radius="5"/>
</item>
</content>
</layout>
<!-- redefine the main menu listing area -->
<layout label="list_main">
<content type="text" spacing="10">
<item type="default" font="white shadow1 big"/>
<item type="selected" font="white shadow3 big">
<rectangle bgcolor="0xa0000000" size="0" y="-5" x="-10"
width="max+20" height="max+10" radius="5"/>
</item>
</content>
</layout>
<!-- ********************************************** -->
<!-- FONT DEFINITIONS -->
<font label="white shadow1">
<definition name="bluehigh" color="0xffffff" size="20"/>
<shadow visible="yes" color="0x00000000" x="1" y="1"/>
</font>
<font label="white shadow1 big">
<definition name="bluehigh" size="44" color="0xffffff"/>
<shadow visible="yes" color="0xaa000000" x="1" y="1"/>
</font>
<font label="white shadow3 big">
<definition name="bluehigh" size="44" color="0xffffff"/>
<shadow visible="yes" color="0x000000" x="3" y="3"/>
</font>
<!-- this font is used by the title -->
<font label="white big">
<definition name="oliversb" size="29" color="0xffffff"/>
<shadow visible="yes" color="0x80000000" x="3" y="3"/>
</font>
</skin>
</freevo>
Index: blue1_big.xml
===================================================================
RCS file: /cvsroot/freevo/freevo/skins/dischi1/blue1_big.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** blue1_big.xml 26 Feb 2003 19:59:26 -0000 1.4
--- blue1_big.xml 26 Feb 2003 21:21:10 -0000 1.5
***************
*** 25,34 ****
with their dimensions. We point to a layout with the details
-->
! <menu type="all">
<screen layout="screen0" visible="yes">
<area x="0" y="0" width="800" height="600"/>
</screen>
<title layout="title0" visible="yes">
! <area x="10" y="10" width="780" height="50"/>
</title>
<view layout="view0" visible="yes">
--- 25,34 ----
with their dimensions. We point to a layout with the details
-->
! <menu type="default">
<screen layout="screen0" visible="yes">
<area x="0" y="0" width="800" height="600"/>
</screen>
<title layout="title0" visible="yes">
! <area x="10" y="10" width="780" height="60"/>
</title>
<view layout="view0" visible="yes">
***************
*** 66,70 ****
<!-- title -->
<layout label="title0">
! <content x="210" type="menu" font="main" align="center"/>
</layout>
--- 66,70 ----
<!-- title -->
<layout label="title0">
! <content x="210" type="menu" font="white big" align="center"/>
</layout>
***************
*** 72,77 ****
<layout label="list0">
<content type="text" spacing="2">
! <item type="default" font="list"/>
! <item type="selected" font="list selected">
<rectangle bgcolor="0xa0000000" size="0" x="-5" y="-3" width="max+10"
height="max+6"/>
--- 72,77 ----
<layout label="list0">
<content type="text" spacing="2">
! <item type="default" font="grey"/>
! <item type="selected" font="white">
<rectangle bgcolor="0xa0000000" size="0" x="-5" y="-3" width="max+10"
height="max+6"/>
***************
*** 83,88 ****
<layout label="list_main">
<content type="text" spacing="10">
! <item type="default" font="main"/>
! <item type="selected" font="main selected">
<rectangle bgcolor="0xa0000000" size="0" y="-5" x="-10"
width="max+20" height="max+10"/>
--- 83,88 ----
<layout label="list_main">
<content type="text" spacing="10">
! <item type="default" font="grey big"/>
! <item type="selected" font="white big">
<rectangle bgcolor="0xa0000000" size="0" y="-5" x="-10"
width="max+20" height="max+10"/>
***************
*** 96,115 ****
<!-- FONT DEFINITIONS -->
! <font label="list">
<definition name="Arial_Bold" size="20" color="0xdddddd"/>
<shadow visible="no"/>
</font>
! <font label="list selected">
<definition name="Arial_Bold" size="20" color="0xffffff"/>
<shadow visible="no"/>
</font>
! <font label="main">
<definition name="Arial_Bold" size="35" color="0xdddddd"/>
<shadow visible="no"/>
</font>
! <font label="main selected">
<definition name="Arial_Bold" size="35" color="0xffffff"/>
<shadow visible="no"/>
--- 96,115 ----
<!-- FONT DEFINITIONS -->
! <font label="grey">
<definition name="Arial_Bold" size="20" color="0xdddddd"/>
<shadow visible="no"/>
</font>
! <font label="white">
<definition name="Arial_Bold" size="20" color="0xffffff"/>
<shadow visible="no"/>
</font>
! <font label="grey big">
<definition name="Arial_Bold" size="35" color="0xdddddd"/>
<shadow visible="no"/>
</font>
! <font label="white big">
<definition name="Arial_Bold" size="35" color="0xffffff"/>
<shadow visible="no"/>
Index: blue1_small.xml
===================================================================
RCS file: /cvsroot/freevo/freevo/skins/dischi1/blue1_small.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** blue1_small.xml 26 Feb 2003 19:18:53 -0000 1.1
--- blue1_small.xml 26 Feb 2003 21:21:10 -0000 1.2
***************
*** 14,30 ****
-->
! <font label="list">
<definition size="16"/>
</font>
! <font label="list selected">
<definition size="16"/>
</font>
! <font label="main">
<definition size="30"/>
</font>
! <font label="main selected">
<definition size="30"/>
</font>
--- 14,30 ----
-->
! <font label="grey">
<definition size="16"/>
</font>
! <font label="white">
<definition size="16"/>
</font>
! <font label="grey big">
<definition size="30"/>
</font>
! <font label="white big">
<definition size="30"/>
</font>
Index: listing.py
===================================================================
RCS file: /cvsroot/freevo/freevo/skins/dischi1/listing.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** listing.py 26 Feb 2003 19:59:26 -0000 1.4
--- listing.py 26 Feb 2003 21:21:11 -0000 1.5
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.5 2003/02/26 21:21:11 dischi
+ # blue_round1.xml working
+ #
# Revision 1.4 2003/02/26 19:59:26 dischi
# title area in area visible=(yes|no) is working
***************
*** 110,114 ****
content = self.calc_geometry(layout.content, copy_object=TRUE)
! items_w = area.width - content.spacing
items_h = 0
--- 113,117 ----
content = self.calc_geometry(layout.content, copy_object=TRUE)
! items_w = content.width
items_h = 0
***************
*** 155,164 ****
self.area_val, self.layout = backup
! items_w += content.spacing
! items_h += content.spacing
# return cols, rows, item_w, item_h
! return (content.width/items_w, content.height/items_h,
! items_w, items_h, -hskip, -vskip)
--- 158,178 ----
self.area_val, self.layout = backup
! items_w
! items_h
!
! cols = 0
! rows = 0
!
! while (cols + 1) * (items_w + content.spacing) - \
! content.spacing <= content.width:
! cols += 1
!
! while (rows + 1) * (items_h + content.spacing) - \
! content.spacing <= content.height:
! rows += 1
# return cols, rows, item_w, item_h
! return (cols, rows, items_w + content.spacing,
! items_h + content.spacing, -hskip, -vskip)
***************
*** 184,191 ****
self.get_items_geometry(settings, menu)
! x0 = area.x + content.spacing
! y0 = area.y + content.spacing
! width = content.width - 2 * content.spacing
for choice in menuw.menu_items:
--- 198,205 ----
self.get_items_geometry(settings, menu)
! x0 = content.x
! y0 = content.y
! width = content.width
for choice in menuw.menu_items:
Index: skin_dischi1.py
===================================================================
RCS file: /cvsroot/freevo/freevo/skins/dischi1/skin_dischi1.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** skin_dischi1.py 26 Feb 2003 19:59:26 -0000 1.20
--- skin_dischi1.py 26 Feb 2003 21:21:11 -0000 1.21
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.21 2003/02/26 21:21:11 dischi
+ # blue_round1.xml working
+ #
# Revision 1.20 2003/02/26 19:59:26 dischi
# title area in area visible=(yes|no) is working
***************
*** 158,163 ****
return
! self.write_text(text, settings.font[content.font], content, height=-1,
! mode='hard')
###############################################################################
--- 161,165 ----
return
! self.write_text(text, settings.font[content.font], content, mode='hard')
###############################################################################
Index: xml_skin.py
===================================================================
RCS file: /cvsroot/freevo/freevo/skins/dischi1/xml_skin.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** xml_skin.py 26 Feb 2003 19:59:27 -0000 1.13
--- xml_skin.py 26 Feb 2003 21:21:12 -0000 1.14
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.14 2003/02/26 21:21:12 dischi
+ # blue_round1.xml working
+ #
# Revision 1.13 2003/02/26 19:59:27 dischi
# title area in area visible=(yes|no) is working
***************
*** 96,100 ****
val = 0
! if scale:
val = scale*int(val)
if max:
--- 99,104 ----
val = 0
! # scale, but not small values, they may be 0 after scaling
! if scale and int(val) > 4:
val = scale*int(val)
if max:
***************
*** 383,387 ****
XML_data.parse(self, subnode, scale, current_dir)
if subnode.name == u'shadow':
! self.shadow.parse(node, scale, current_dir)
def __cmp__(self, other):
--- 387,391 ----
XML_data.parse(self, subnode, scale, current_dir)
if subnode.name == u'shadow':
! self.shadow.parse(subnode, scale, current_dir)
def __cmp__(self, other):
***************
*** 398,405 ****
def __init__(self):
self.menu = {}
!
! self.menu_types = ( 'default', 'main', 'video', 'audio', 'image' )
! for t in self.menu_types:
! self.menu[t] = [ XML_menu(), ]
self.layout = {}
--- 402,406 ----
def __init__(self):
self.menu = {}
! self.menu['default'] = [ XML_menu(), ]
self.layout = {}
***************
*** 416,430 ****
if node.name == u'menu':
! type = attr_str(node, "type", "all")
! if type == "all":
! if copy_content:
! self.menu = copy.deepcopy(self.menu)
! for t in self.menu_types:
! for e in self.menu[t]:
! e.parse(node, scale, c_dir)
! if type in self.menu:
! display = attr_int(node, 'display', 0)
! self.menu[type][display].parse(node, scale, c_dir)
if node.name == u'layout':
--- 417,427 ----
if node.name == u'menu':
! type = attr_str(node, "type", "default")
! if not type in self.menu:
! self.menu[type] = copy.deepcopy(self.menu['default'])
!
! display = attr_int(node, 'display', 0)
! self.menu[type][display].parse(node, scale, c_dir)
if node.name == u'layout':
-------------------------------------------------------
This SF.net email is sponsored by: Scholarships for Techies!
Can't afford IT training? All 2003 ictp students receive scholarships.
Get hands-on training in Microsoft, Cisco, Sun, Linux/UNIX, and more.
www.ictp.com/training/sourceforge.asp
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
