Update of /cvsroot/freevo/freevo/skins/xml/type1
In directory sc8-pr-cvs1:/tmp/cvs-serv27425
Modified Files:
barbieri.fxd blue1_big.fxd blue2.fxd
Log Message:
switch to the new info area
Index: barbieri.fxd
===================================================================
RCS file: /cvsroot/freevo/freevo/skins/xml/type1/barbieri.fxd,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** barbieri.fxd 27 Jun 2003 20:57:47 -0000 1.7
--- barbieri.fxd 29 Jun 2003 20:40:28 -0000 1.8
***************
*** 55,59 ****
<menu type="audio">
! <style image="audio list with cover view" />
<style text="audio"/>
</menu>
--- 55,59 ----
<menu type="audio">
! <style text="audio" image="audio list with cover view" />
<style text="audio"/>
</menu>
***************
*** 567,570 ****
--- 567,571 ----
<newline />
</if>
+ <goto_pos y="15" mode="relative" />
<if expression="album">
<text height="line_height" width="100"
***************
*** 575,588 ****
align="left" font="info value"
mode="hard" expression="album" />
! <if expression="year">
<text font="info value"> (</text>
<text height="line_height"
align="left" font="info value"
! mode="hard" expression="year" />
<text font="info value">)</text>
</if>
<newline />
</if>
! <if expression="track">
<text height="line_height" width="100"
align="right" font="info value"
--- 576,589 ----
align="left" font="info value"
mode="hard" expression="album" />
! <if expression="date">
<text font="info value"> (</text>
<text height="line_height"
align="left" font="info value"
! mode="hard" expression="date" />
<text font="info value">)</text>
</if>
<newline />
</if>
! <if expression="trackno">
<text height="line_height" width="100"
align="right" font="info value"
***************
*** 591,595 ****
<text height="line_height"
align="left" font="info value"
! mode="hard" expression="track" />
<newline />
</if>
--- 592,596 ----
<text height="line_height"
align="left" font="info value"
! mode="hard" expression="trackno" />
<newline />
</if>
Index: blue1_big.fxd
===================================================================
RCS file: /cvsroot/freevo/freevo/skins/xml/type1/blue1_big.fxd,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** blue1_big.fxd 2 May 2003 01:37:42 -0000 1.6
--- blue1_big.fxd 29 Jun 2003 20:40:28 -0000 1.7
***************
*** 245,255 ****
spacing="10" font="player">
<item type="default">
! Title: [EMAIL PROTECTED]@
! Artist: [EMAIL PROTECTED]@
! Album: [EMAIL PROTECTED]@ (@year@)
! Track: [EMAIL PROTECTED]@
!
! Length: [EMAIL PROTECTED]@
! Elapsed: [EMAIL PROTECTED]@
</item>
</content>
--- 245,311 ----
spacing="10" font="player">
<item type="default">
! <if expression="title">
! <text font="info title"
! width="max" height="line_height"
! mode="hard" align="left"
! expression="title" />
! <newline />
! </if>
! <if expression="artist">
! <text font="info tagline"
! width="max" height="line_height"
! mode="hard" align="left"
! expression="artist" />
! <newline />
! </if>
! <goto_pos y="15" mode="relative" />
! <if expression="album">
! <text height="line_height" width="100"
! align="right" font="info value"
! mode="hard">Album:</text>
! <goto_pos x="10" mode="relative" />
! <text height="line_height"
! align="left" font="info value"
! mode="hard" expression="album" />
! <if expression="date">
! <text font="info value"> (</text>
! <text height="line_height"
! align="left" font="info value"
! mode="hard" expression="date" />
! <text font="info value">)</text>
! </if>
! <newline />
! </if>
! <if expression="trackno">
! <text height="line_height" width="100"
! align="right" font="info value"
! mode="hard">Track:</text>
! <goto_pos x="10" mode="relative" />
! <text height="line_height"
! align="left" font="info value"
! mode="hard" expression="trackno" />
! <newline />
! </if>
! <goto_pos y="15" mode="relative" />
! <if expression="length">
! <text height="line_height" width="100"
! align="right" font="info value"
! mode="hard">Length:</text>
! <goto_pos x="10" mode="relative" />
! <text height="line_height"
! align="left" font="info value"
! mode="hard" expression="length" />
! <newline />
! </if>
! <if expression="elapsed">
! <text height="line_height" width="100"
! align="right" font="info value"
! mode="hard">Elapsed:</text>
! <goto_pos x="10" mode="relative" />
! <text height="line_height"
! align="left" font="info value"
! mode="hard" expression="elapsed" />
! <newline />
! </if>
</item>
</content>
***************
*** 257,260 ****
--- 313,317 ----
+
<!--
**********************************************
***************
*** 323,334 ****
spacing="10" font="tv">
<item type="default">
! @title@
! @sub_title@
! @start@ - @stop@
!
! @desc@
</item>
</content>
</layout>
</skin>
--- 380,429 ----
spacing="10" font="tv">
<item type="default">
! <if expression="title">
! <text font="info title"
! width="630" height="line_height"
! mode="hard" align="left"
! expression="title" />
! </if>
! <text font="info value"
! width="max" height="line_height"
! mode="hard" align="left" valign="center"
! expression="start" />
! <text font="info value"
! width="max" height="line_height"
! mode="hard" align="left" valign="center">-</text>
! <text font="info value"
! width="max" height="line_height"
! mode="hard" align="left" valign="center"
! expression="stop" />
! <newline />
! <if expression="sub_title">
! <text font="info tagline"
! width="max" height="line_height"
! mode="hard" align="left"
! expression="sub_title" />
! <newline />
! </if>
! <if expression="desc">
! <text font="info plot"
! width="max" height="line_height"
! mode="hard" align="left"
! expression="desc" />
! <newline />
! </if>
</item>
</content>
</layout>
+
+
+ <font label="info title" name="impact" size="24" color="0xffffff">
+ <shadow x="2" y="2" color="0x000000" visible="yes" />
+ </font>
+ <font label="info plot" name="timesbd" size="16" color="0xffffff" />
+ <font label="info tagline" name="Arial_Bold" size="16" color="0xffffff" />
+ <font label="info description" name="Arial_Bold" size="14" color="0xffffaa" />
+ <font label="info label" name="Arial_Bold" size="14" color="0xffffff" />
+ <font label="info value" name="Arial_Bold" size="14" color="0xffffaa" />
+
</skin>
Index: blue2.fxd
===================================================================
RCS file: /cvsroot/freevo/freevo/skins/xml/type1/blue2.fxd,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** blue2.fxd 20 Jun 2003 19:39:01 -0000 1.9
--- blue2.fxd 29 Jun 2003 20:40:28 -0000 1.10
***************
*** 104,170 ****
<font label="title small" name="Arial_Bold" size="22" color="0xffffff"/>
- <!-- info area -->
- <layout label="info">
- <content x="0" y="0" type="text" spacing="20" font="default">
- <item type="audio">
- Title: [EMAIL PROTECTED]@
- Artist: [EMAIL PROTECTED]@
- Album: [EMAIL PROTECTED]@ (@year@)
- Track: [EMAIL PROTECTED]@
- </item>
- <item type="video">
- @tagline@
-
- @plot@
- </item>
- <item type="image">
- Title: [EMAIL PROTECTED]@
- Geometry: [EMAIL PROTECTED]@[EMAIL PROTECTED]@
- Date: [EMAIL PROTECTED]@
-
- @description@
- </item>
- <item type="dir">
- Directory: [EMAIL PROTECTED]@
- @tagline@
-
- @plot@
- </item>
- <item type="playlist">
- This is a playlist.
- </item>
- <item type="track">
- Runtime: [EMAIL PROTECTED]@ min.
- @len_audio@ Audiotracks, @len_subtitles@ Subtitles, @chapters@ Chapter
- </item>
- </content>
- </layout>
-
- <!-- info area -->
- <layout label="video info">
- <content x="0" y="0" type="text" spacing="20" font="default">
- <item type="video">
- @tagline@
-
- @plot@
-
- Genre: [EMAIL PROTECTED]@
- Rating: [EMAIL PROTECTED]@
- Runtime: [EMAIL PROTECTED]@
- </item>
- <item type="dir">
- Directory: [EMAIL PROTECTED]@
- @tagline@
-
- @plot@
-
- Genre: [EMAIL PROTECTED]@
- Rating: [EMAIL PROTECTED]@
- Runtime: [EMAIL PROTECTED]@
- </item>
- </content>
- </layout>
-
-
<!-- listing area for audio with images -->
<layout label="audio list">
--- 104,107 ----
***************
*** 204,207 ****
--- 141,393 ----
</content>
</layout>
+
+
+
+ <layout label="info">
+ <content x="0" y="0" type="text" spacing="20" font="default">
+
+ <item type="audio">
+ <if expression="title">
+ <if expression="track">
+ <text height="line_height"
+ align="left" font="info title"
+ mode="hard" expression="track" />
+ <text font="info title"> - </text>
+ </if>
+ <text height="line_height"
+ align="left" font="info title"
+ mode="hard" expression="title" />
+ <newline />
+ </if>
+ <if expression="artist">
+ <text height="line_height" width="100"
+ align="right" font="info value"
+ mode="hard">Artist:</text>
+ <goto_pos x="10" mode="relative" />
+ <text height="line_height"
+ align="left" font="info value"
+ mode="hard" expression="artist" />
+ <newline />
+ </if>
+ <if expression="album">
+ <text height="line_height" width="100"
+ align="right" font="info value"
+ mode="hard">Album:</text>
+ <goto_pos x="10" mode="relative" />
+ <text height="line_height"
+ align="left" font="info value"
+ mode="hard" expression="album" />
+ <if expression="year">
+ <text font="info value"> (</text>
+ <text height="line_height"
+ align="left" font="info value"
+ mode="hard" expression="year" />
+ <text font="info value">)</text>
+ </if>
+ <newline />
+ </if>
+ </item>
+
+ <item type="video">
+ <if expression="tagline">
+ <text height="line_height"
+ align="left" font="info tagline"
+ expression="tagline" />
+ <newline />
+ </if>
+ <if expression="plot">
+ <text height="max" width="max"
+ align="left" font="info plot"
+ mode="soft"
+ expression="plot" />
+ <newline />
+ </if>
+ </item>
+
+ <item type="track">
+ <if expression="length">
+ <text height="line_height" width="100"
+ align="left" font="info label"
+ mode="hard">Runtime:</text>
+ <goto_pos x="10" mode="relative" />
+ <text height="line_height"
+ align="left" font="info value"
+ mode="hard" expression="length" />
+ <text font="info value"> min.</text>
+ <newline />
+ </if>
+ <text height="line_height"
+ align="left" font="info value"
+ mode="hard" expression="len(audio)" />
+ <text font="info value"> Audiotracks, </text>
+ <text height="line_height"
+ align="left" font="info value"
+ mode="hard" expression="len(subtitles)" />
+ <text font="info value"> Subtitles, </text>
+ <text height="line_height"
+ align="left" font="info value"
+ mode="hard" expression="chapters" />
+ <text font="info value"> Chapter</text>
+ </item>
+
+ <item type="image">
+ <if expression="name">
+ <text height="line_height" width="max"
+ align="left" font="info title"
+ mode="hard" expression="name" />
+ <newline />
+ </if>
+ <if expression="width and height">
+ <text height="line_height" width="100"
+ align="left" font="info label"
+ mode="hard">Geometry:</text>
+ <goto_pos x="10" mode="relative" />
+ <text height="line_height"
+ align="left" font="info value"
+ mode="hard" expression="width" />
+ <text height="line_height"
+ align="left" font="info value"
+ mode="hard">x</text>
+ <text height="line_height"
+ align="left" font="info value"
+ mode="hard" expression="height" />
+ <newline />
+ </if>
+ <if expression="date">
+ <text height="line_height" width="100"
+ align="left" font="info label"
+ mode="hard">Date:</text>
+ <goto_pos x="10" mode="relative" />
+ <text height="line_height"
+ align="left" font="info value"
+ mode="hard" expression="date" />
+ <newline />
+ </if>
+ <if expression="description">
+ <text font="info plot"
+ width="max" height="max"
+ mode="soft" align="left"
+ expression="description" />
+ <newline />
+ </if>
+ </item>
+
+ <item type="dir"/>
+
+ <item type="playlist">
+ <if expression="len(playlist)>0">
+ <text height="line_height"
+ align="left" font="info value"
+ mode="hard" expression="len(playlist)" />
+ <text height="line_height"
+ align="left" font="info value"
+ mode="hard"> items in this playlist</text>
+ <newline />
+ </if>
+ <if expression="len(playlist)==0">
+ <text height="line_height"
+ align="left" font="info value"
+ mode="hard">This playlist is empty!</text>
+ <newline />
+ </if>
+ </item>
+ </content>
+ </layout>
+
+
+
+
+
+ <layout label="video info">
+ <content x="0" y="0" type="text" spacing="20" font="default">
+ <item type="video">
+ <if expression="tagline">
+ <text font="info tagline"
+ width="max" height="line_height"
+ mode="hard" align="left"
+ expression="tagline" />
+ <newline />
+ </if>
+ <if expression="plot">
+ <goto_pos x="20" />
+ <text font="info plot"
+ width="max-40" height="max"
+ mode="soft" align="justified"
+ expression="plot" />
+ <newline />
+ </if>
+
+ <goto_pos y="10" mode="relative" />
+ <if expression="year">
+ <text height="line_height" width="100"
+ align="right" font="info value"
+ mode="hard">Year:</text>
+ <goto_pos x="10" mode="relative" />
+ <text height="line_height"
+ align="left" font="info value"
+ mode="hard" expression="year" />
+ <newline />
+ </if>
+ <if expression="genre">
+ <text height="line_height" width="100"
+ align="right" font="info value"
+ mode="hard">Genre:</text>
+ <goto_pos x="10" mode="relative" />
+ <text height="line_height"
+ align="left" font="info value"
+ mode="hard" expression="genre" />
+ <newline />
+ </if>
+ <if expression="rating">
+ <text height="line_height" width="100"
+ align="right" font="info value"
+ mode="hard">Rating:</text>
+ <goto_pos x="10" mode="relative" />
+ <text height="line_height"
+ align="left" font="info value"
+ mode="hard" expression="rating" />
+ <newline />
+ </if>
+
+ <goto_pos y="10" mode="relative" />
+ <if expression="length">
+ <text height="line_height" width="100"
+ align="right" font="info value"
+ mode="hard">Runtime:</text>
+ <goto_pos x="10" mode="relative" />
+ <text height="line_height"
+ align="left" font="info value"
+ mode="hard" expression="length" />
+ <newline />
+ </if>
+
+ <text height="line_height" width="100"
+ align="right" font="info value"
+ mode="hard">Type:</text>
+ <goto_pos x="10" mode="relative" />
+ <text height="line_height"
+ align="left" font="info value"
+ mode="hard" expression="type" />
+ <newline />
+
+ <if expression="copyright">
+ <text height="line_height" width="100"
+ align="right" font="info value"
+ mode="hard">Copyright:</text>
+ <goto_pos x="10" mode="relative" />
+ <text height="line_height"
+ align="left" font="info value"
+ mode="hard" expression="copyright" />
+ <newline />
+ </if>
+
+ </item>
+ <item type="default"/>
+ </content>
+ </layout>
+
+
+
+
</skin>
-------------------------------------------------------
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa00100006ave/direct;at.asp_061203_01/01
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
