Update of /cvsroot/freevo/freevo/share/skins/main
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5540/share/skins/main
Modified Files:
blurr.fxd
Log Message:
fix coming up and other parts of the tv menu
Index: blurr.fxd
===================================================================
RCS file: /cvsroot/freevo/freevo/share/skins/main/blurr.fxd,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** blurr.fxd 6 Jan 2005 19:08:28 -0000 1.23
--- blurr.fxd 7 Jan 2005 20:41:04 -0000 1.24
***************
*** 527,540 ****
<!-- GUIDE -->
- <menu type="tv">
- <style text="text with tv info style"/>
- </menu>
-
<menuset label="tv menu">
<screen layout="screen" x="0" y="0" width="800" height="600"/>
<title visible="no"/>
! <info layout="tv info" x="10" y="80" width="760" height="140"/>
<listing layout="tv listing" x="10" y="240" width="750"
height="350">
<image x="765" y="240" width="32" height="32" label="uparrow"
--- 527,544 ----
+ <layout label="tv screen">
+ <background>
+ <image image="background" x="0" y="0" label="background"/>
+ <image filename="gant/tv.png" x="435" y="230" width="370"
+ height="380"/>
+ </background>
+ </layout>
+
<!-- GUIDE -->
<menuset label="tv menu">
<screen layout="screen" x="0" y="0" width="800" height="600"/>
<title visible="no"/>
! <info layout="tv info" x="10" y="90" width="780" height="140"/>
<listing layout="tv listing" x="10" y="240" width="750"
height="350">
<image x="765" y="240" width="32" height="32" label="uparrow"
***************
*** 578,590 ****
<menu type="tv main menu">
! <style text="text with tv info style (main)"/>
</menu>
! <menuset label="text with tv info style (main)" inherits="text with
info style">
<screen layout="tv screen" visible="yes"/>
! <info layout="tv extended info" x="30" y="100" width="740"
height="230"/>
<view visible="no"/>
</menuset>
<!-- program details -->
--- 582,633 ----
<menu type="tv main menu">
! <style text="tv main menu"/>
</menu>
! <menuset label="tv main menu" inherits="text with info style">
<screen layout="tv screen" visible="yes"/>
! <info layout="tv main menu info" x="10" y="90" width="780"
height="250"/>
<view visible="no"/>
</menuset>
+ <layout label="tv main menu info">
+ <background>
+ <rectangle size="0" bgcolor="0x80000000" radius="10" x="0"
y="0"
+ width="max" height="max"/>
+ </background>
+ <content x="10" y="10" type="text" height="max-20" width="max-20"
+ spacing="20" font="default">
+ <item type="default">
+ <if expression="recordserver">
+ <if expression="running">
+ <text font="tv title" width="max"
+ height="-1">Currently recording:</text>
+ <newline/>
+ <goto_pos y="20" mode="relative"/>
+ <text font="comingup" width="max" height="max"
+ expression="running" mode="soft"/>
+ <newline/>
+ <goto_pos y="30" mode="relative"/>
+ </if>
+ <if expression="comingup">
+ <text font="tv title" width="max"
+ height="-1">Next recordings:</text>
+ <newline/>
+ <goto_pos y="20" mode="relative"/>
+ <text font="comingup" width="max" height="max"
+ expression="comingup" mode="soft"/>
+ </if>
+ <if expression="not comingup and not running">
+ <text font="tv title" width="max"
+ height="-1">Nothing scheduled</text>
+ </if>
+ </if>
+ <if expression="not recordserver">
+ <text font="tv title" width="max"
+ height="-1">Recordserver not found</text>
+ </if>
+ </item>
+ </content>
+ </layout>
<!-- program details -->
***************
*** 594,598 ****
</menu>
-
<menu type="tv favorite menu">
<style text="text with program info style"/>
--- 637,640 ----
***************
*** 600,641 ****
<menuset label="text with program info style"
! inherits="text with tv info style (main)">
<listing y="230" height="340"/>
! <info layout="tv program info" x="10" y="80" width="780"
height="125"/>
</menuset>
- <!-- old stuff ? -->
! <menu type="tv manual record menu">
! <style text="text with manual record info style"/>
! </menu>
! <menuset label="tv" inherits="normal text style">
! <view visible="no"/>
! <listing x="100" width="680">
! <image label="uparrow" x="290" y="110"/>
! <image label="downarrow" x="max-32" y="520"/>
! </listing>
! <screen layout="tv menu screen"/>
! </menuset>
<menuset label="text with tv info style" inherits="text with info
style">
! <screen layout="tv screen" visible="yes"/>
</menuset>
! <menuset label="text with favorite info style"
! inherits="text with tv info style (main)">
! <info layout="tv favorite info"/>
! </menuset>
!
! <menuset label="text with manual record info style"
! inherits="text with tv info style (main)">
! <info layout="tv manual record info"/>
! </menuset>
!
! <layout label="tv screen">
<background>
<image image="background" x="0" y="0" label="background"/>
<image filename="gant/tv.png" x="435" y="230" width="370"
height="380"/>
--- 642,674 ----
<menuset label="text with program info style"
! inherits="tv main menu">
<listing y="230" height="340"/>
! <info layout="tv program info" x="10" y="90" width="780"
height="130"/>
</menuset>
+ <layout label="tv program info">
+ <background>
+ <rectangle size="0" bgcolor="0x80000000" radius="10" x="0"
y="0"
+ width="max" height="max"/>
+ </background>
+ <content x="10" y="10" width="max-20" height="max-20"/>
+ </layout>
! <!-- normal menus in tv -->
! <menu type="tv">
! <style text="text with tv info style"/>
! </menu>
<menuset label="text with tv info style" inherits="text with info
style">
! <screen layout="tv screen with background" visible="yes"/>
</menuset>
! <layout label="tv screen with background">
<background>
<image image="background" x="0" y="0" label="background"/>
+ <rectangle size="0" bgcolor="0x80000000" radius="10" x="10"
y="90"
+ width="780" height="250"/>
<image filename="gant/tv.png" x="435" y="230" width="370"
height="380"/>
***************
*** 643,662 ****
</layout>
! <layout label="tv extended info">
! <content x="0" y="0" type="text" spacing="20" font="default">
! <item type="default">
! <text font="comingup" width="max" height="max"
! expression="function:comingup" mode="soft"/>
! </item>
! </content>
! </layout>
!
! <layout label="tv program info">
! <background>
! <rectangle size="0" bgcolor="0x80000000" radius="10" x="0"
y="0"
! width="max" height="max"/>
! </background>
! <content x="10" y="10" width="max-20" height="max-20"/>
! </layout>
<font label="tv" name="Arial_Bold" size="14" color="0xffffff"/>
--- 676,681 ----
</layout>
!
! <!-- fonts -->
<font label="tv" name="Arial_Bold" size="14" color="0xffffff"/>
-------------------------------------------------------
The SF.Net email is sponsored by: Beat the post-holiday blues
Get a FREE limited edition SourceForge.net t-shirt from ThinkGeek.
It's fun and FREE -- well, almost....http://www.thinkgeek.com/sfshirt
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
