Update of /cvsroot/freevo/freevo/share/skins/main
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14306
Modified Files:
blurr2.fxd
Log Message:
o Fix some overlapping areas
o print item numbers for audio playlists
o print description for audio if given (e.g. webradio)
o print name in audio info area if we have neither album nor artist
Index: blurr2.fxd
===================================================================
RCS file: /cvsroot/freevo/freevo/share/skins/main/blurr2.fxd,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** blurr2.fxd 13 Feb 2004 20:29:13 -0000 1.40
--- blurr2.fxd 14 Feb 2004 19:33:52 -0000 1.41
***************
*** 71,75 ****
<menu type="audio">
! <style text="audio"/>
</menu>
--- 71,75 ----
<menu type="audio">
! <style text="audio"/>
</menu>
***************
*** 92,96 ****
<menuset label="audio" inherits="normal text style">
<screen layout="audio screen"/>
! <view layout="view" x="15" y="90" width="280" height="300" align="center"/>
<info layout="audio info" x="28" y="370" width="273" height="190"/>
</menuset>
--- 92,96 ----
<menuset label="audio" inherits="normal text style">
<screen layout="audio screen"/>
! <view layout="view" x="15" y="90" width="280" height="270"/>
<info layout="audio info" x="28" y="370" width="273" height="190"/>
</menuset>
***************
*** 190,194 ****
<content x="0" y="0" type="text" spacing="20" font="default">
<!-- audio dir -->
! <item type="default">
<if expression="display_type == 'audio' and artist">
<text font="info tagline" expression="artist"/>
--- 190,194 ----
<content x="0" y="0" type="text" spacing="20" font="default">
<!-- audio dir -->
! <item type="default">
<if expression="display_type == 'audio' and artist">
<text font="info tagline" expression="artist"/>
***************
*** 196,211 ****
</if>
<if expression="display_type == 'audio' and album">
! <text font="info value" height="max" expression="album" mode="soft" />
<newline/>
</if>
! <if expression="display_type == 'audio' and year">
! <text font="info value" expression="year"/>
<newline/>
! </if>
<if expression="display_type == 'audio' and length">
<text font="info value" expression="length"/>
</if>
! </item>
! <item type="audio">
<if expression="artist">
<text font="info tagline" expression="artist"/>
--- 196,224 ----
</if>
<if expression="display_type == 'audio' and album">
! <text font="info value" expression="album" mode="soft" />
<newline/>
</if>
! <if expression="not album and not artist">
! <text font="info tagline" expression="name" mode="soft" />
<newline/>
! </if>
! <if expression="display_type == 'audio' and year">
! <if expression="album or artist">
! <text font="info value" expression="year"/>
! <newline/>
! </if>
! </if>
<if expression="display_type == 'audio' and length">
<text font="info value" expression="length"/>
+ <newline/>
</if>
! <if expression="type == 'playlist'">
! <text font="info value" width="max" expression="len(playlist)"/>
! <text font="info value"> Items</text>
! <newline/>
! </if>
! </item>
!
! <item type="audio">
<if expression="artist">
<text font="info tagline" expression="artist"/>
***************
*** 216,222 ****
<newline/>
</if>
<if expression="date">
! <text font="info value" expression="date"/>
! <newline/>
</if>
<if expression="length">
--- 229,242 ----
<newline/>
</if>
+ <if expression="not album and not artist">
+ <text font="info tagline" expression="name" mode="soft" />
+ <newline/>
+ <if expression="description"> <!-- e.g. webradio -->
+ <text font="info value" expression="description" height="max"
mode="soft"/>
+ </if>
+ </if>
<if expression="date">
! <text font="info value" expression="date"/>
! <newline/>
</if>
<if expression="length">
***************
*** 226,231 ****
</item>
! <item type="audiocd">
! <if expression="title">
<text font="info tagline" expression="title"/>
<newline/>
--- 246,251 ----
</item>
! <item type="audiocd">
! <if expression="title">
<text font="info tagline" expression="title"/>
<newline/>
***************
*** 414,418 ****
<!-- default view area -->
<layout label="view">
! <content align="center" valign="middle">
<item type="default">
<rectangle size="0" bgcolor="0x80000000" radius="8" x="-10" y="-10"
--- 434,438 ----
<!-- default view area -->
<layout label="view">
! <content align="center" valign="center">
<item type="default">
<rectangle size="0" bgcolor="0x80000000" radius="8" x="-10" y="-10"
***************
*** 500,505 ****
<player>
<screen layout="player screen" x="0" y="0" width="800" height="600"/>
! <info layout="player info blurr" x="350" y="110" width="550" height="360"/>
! <view layout="player blurr" x="20" y="120" width="420" height="340"/>
<title visible="no"/>
</player>
--- 520,525 ----
<player>
<screen layout="player screen" x="0" y="0" width="800" height="600"/>
! <info layout="player info blurr" x="400" y="140" width="375" height="330"/>
! <view layout="player blurr" x="30" y="120" width="360" height="350"/>
<title visible="no"/>
</player>
***************
*** 515,526 ****
<layout label="player blurr">
! <content type="text" spacing="10">
! <item type="default" align="right">
! </item>
! </content>
</layout>
<layout label="player info blurr">
! <content x="70" y="30" height="max" width="max-130" type="text" spacing="10">
<item type="default">
<if expression="title">
--- 535,543 ----
<layout label="player blurr">
! <content align="center" valign="center"/>
</layout>
<layout label="player info blurr">
! <content>
<item type="default">
<if expression="title">
-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
