Author: duncan
Date: Fri Oct  5 15:20:33 2007
New Revision: 9926

Log:
Added update for geexbox theme from John


Added:
   branches/rel-1/freevo/share/icons/themes/geexbox/back.png   (contents, props 
changed)
   branches/rel-1/freevo/share/icons/themes/geexbox/recordinglater.png   
(contents, props changed)
   branches/rel-1/freevo/share/icons/themes/geexbox/recordingnow.png   
(contents, props changed)
   branches/rel-1/freevo/share/icons/themes/geexbox/status/
   branches/rel-1/freevo/share/icons/themes/geexbox/status/cd_audio.png   
(contents, props changed)
   branches/rel-1/freevo/share/icons/themes/geexbox/status/cd_inactive.png   
(contents, props changed)
   branches/rel-1/freevo/share/icons/themes/geexbox/status/cd_mixed.png   
(contents, props changed)
   branches/rel-1/freevo/share/icons/themes/geexbox/status/cd_video.png   
(contents, props changed)
   branches/rel-1/freevo/share/icons/themes/geexbox/status/newmail_active.png   
(contents, props changed)
   branches/rel-1/freevo/share/icons/themes/geexbox/status/newmail_dimmed.png   
(contents, props changed)
   
branches/rel-1/freevo/share/icons/themes/geexbox/status/television_active.png   
(contents, props changed)
   
branches/rel-1/freevo/share/icons/themes/geexbox/status/television_inactive.png 
  (contents, props changed)
   branches/rel-1/freevo/share/images/geexbox/back_image.png   (contents, props 
changed)
   branches/rel-1/freevo/share/images/geexbox/back_image.png.filepart   
(contents, props changed)
   branches/rel-1/freevo/share/images/geexbox/back_main-orig.png   (contents, 
props changed)
   branches/rel-1/freevo/share/images/geexbox/back_main.png   (contents, props 
changed)
   branches/rel-1/freevo/share/images/geexbox/back_movie.png   (contents, props 
changed)
   branches/rel-1/freevo/share/images/geexbox/back_music.png   (contents, props 
changed)
   branches/rel-1/freevo/share/images/geexbox/back_tv.png   (contents, props 
changed)
   branches/rel-1/freevo/share/images/geexbox/back_weather.png   (contents, 
props changed)
   branches/rel-1/freevo/share/images/geexbox/headlines.jpg   (contents, props 
changed)
   branches/rel-1/freevo/share/images/geexbox/image.png   (contents, props 
changed)
   branches/rel-1/freevo/share/images/geexbox/movie.png   (contents, props 
changed)
   branches/rel-1/freevo/share/images/geexbox/music.png   (contents, props 
changed)
   branches/rel-1/freevo/share/images/geexbox/shutdown.jpg   (contents, props 
changed)
   branches/rel-1/freevo/share/images/geexbox/tv.png   (contents, props changed)
   branches/rel-1/freevo/share/images/geexbox/weather.png   (contents, props 
changed)
   branches/rel-1/freevo/share/images/watermarks/mail.png   (contents, props 
changed)
Removed:
   branches/rel-1/freevo/share/icons/themes/geexbox/back_image.png
   branches/rel-1/freevo/share/icons/themes/geexbox/back_image.png.filepart
   branches/rel-1/freevo/share/icons/themes/geexbox/back_main-orig.png
   branches/rel-1/freevo/share/icons/themes/geexbox/back_main.png
   branches/rel-1/freevo/share/icons/themes/geexbox/back_movie.png
   branches/rel-1/freevo/share/icons/themes/geexbox/back_music.png
   branches/rel-1/freevo/share/icons/themes/geexbox/back_tv.png
   branches/rel-1/freevo/share/icons/themes/geexbox/back_weather.png
   branches/rel-1/freevo/share/icons/themes/geexbox/movie.png
   branches/rel-1/freevo/share/images/geexbox/recordinglater.png
   branches/rel-1/freevo/share/images/geexbox/recordingnow.png
Modified:
   branches/rel-1/freevo/share/images/reminder_watermark.png
   branches/rel-1/freevo/share/skins/main/geexbox.fxd

Added: branches/rel-1/freevo/share/icons/themes/geexbox/back.png
==============================================================================
Binary file. No diff available.

Added: branches/rel-1/freevo/share/icons/themes/geexbox/recordinglater.png
==============================================================================
Binary file. No diff available.

Added: branches/rel-1/freevo/share/icons/themes/geexbox/recordingnow.png
==============================================================================
Binary file. No diff available.

Added: branches/rel-1/freevo/share/icons/themes/geexbox/status/cd_audio.png
==============================================================================
Binary file. No diff available.

Added: branches/rel-1/freevo/share/icons/themes/geexbox/status/cd_inactive.png
==============================================================================
Binary file. No diff available.

Added: branches/rel-1/freevo/share/icons/themes/geexbox/status/cd_mixed.png
==============================================================================
Binary file. No diff available.

Added: branches/rel-1/freevo/share/icons/themes/geexbox/status/cd_video.png
==============================================================================
Binary file. No diff available.

Added: 
branches/rel-1/freevo/share/icons/themes/geexbox/status/newmail_active.png
==============================================================================
Binary file. No diff available.

Added: 
branches/rel-1/freevo/share/icons/themes/geexbox/status/newmail_dimmed.png
==============================================================================
Binary file. No diff available.

Added: 
branches/rel-1/freevo/share/icons/themes/geexbox/status/television_active.png
==============================================================================
Binary file. No diff available.

Added: 
branches/rel-1/freevo/share/icons/themes/geexbox/status/television_inactive.png
==============================================================================
Binary file. No diff available.

Added: branches/rel-1/freevo/share/images/geexbox/back_image.png
==============================================================================
Binary file. No diff available.

Added: branches/rel-1/freevo/share/images/geexbox/back_image.png.filepart
==============================================================================
Binary file. No diff available.

Added: branches/rel-1/freevo/share/images/geexbox/back_main-orig.png
==============================================================================
Binary file. No diff available.

Added: branches/rel-1/freevo/share/images/geexbox/back_main.png
==============================================================================
Binary file. No diff available.

Added: branches/rel-1/freevo/share/images/geexbox/back_movie.png
==============================================================================
Binary file. No diff available.

Added: branches/rel-1/freevo/share/images/geexbox/back_music.png
==============================================================================
Binary file. No diff available.

Added: branches/rel-1/freevo/share/images/geexbox/back_tv.png
==============================================================================
Binary file. No diff available.

Added: branches/rel-1/freevo/share/images/geexbox/back_weather.png
==============================================================================
Binary file. No diff available.

Added: branches/rel-1/freevo/share/images/geexbox/headlines.jpg
==============================================================================
Binary file. No diff available.

Added: branches/rel-1/freevo/share/images/geexbox/image.png
==============================================================================
Binary file. No diff available.

Added: branches/rel-1/freevo/share/images/geexbox/movie.png
==============================================================================
Binary file. No diff available.

Added: branches/rel-1/freevo/share/images/geexbox/music.png
==============================================================================
Binary file. No diff available.

Added: branches/rel-1/freevo/share/images/geexbox/shutdown.jpg
==============================================================================
Binary file. No diff available.

Added: branches/rel-1/freevo/share/images/geexbox/tv.png
==============================================================================
Binary file. No diff available.

Added: branches/rel-1/freevo/share/images/geexbox/weather.png
==============================================================================
Binary file. No diff available.

Modified: branches/rel-1/freevo/share/images/reminder_watermark.png
==============================================================================
Binary files. No diff available.

Added: branches/rel-1/freevo/share/images/watermarks/mail.png
==============================================================================
Binary file. No diff available.

Modified: branches/rel-1/freevo/share/skins/main/geexbox.fxd
==============================================================================
--- branches/rel-1/freevo/share/skins/main/geexbox.fxd  (original)
+++ branches/rel-1/freevo/share/skins/main/geexbox.fxd  Fri Oct  5 15:20:33 2007
@@ -1,38 +1,39 @@
 <?xml version="1.0" ?>
+<!DOCTYPE freevo-skin SYSTEM "../freevo-skin.dtd">
 <freevo>
+    <skin include="info" geometry="800x600">
+        
+        <!-- 
+       *******************************************************
+       ** DEFAULT AND GENERAL SETTINGS
+       ******************************************************* -->
 
-    <skin include="basic" geometry="800x600">
-
-        <!--
-        *******************************************************
-        ** DEFAULT AND GENERAL SETTINGS
-        ******************************************************* -->
-
-        <iconset theme="geexbox"/>
+       <iconset theme="geexbox"/>
+       <image label="background" filename="geexbox/back_main.png"/>
 
         <!-- Redefine of the type default -->
-        <menuset label="normal text style">
+       <menuset label="normal text style">
             <view x="20" y="100" width="300" height="300"/>
-
-            <listing layout="listing" x="330" y="150" width="420" height="470">
+           
+            <listing layout="listing" x="330" y="150" width="420" height="430">
                 <image filename="up.png" label="uparrow" x="760" y="110"/>
                 <image filename="down.png" label="downarrow" x="760" 
y="max-32"/>
             </listing>
-        </menuset>
+       </menuset>
+
 
         <!-- default without an image -->
         <menuset label="default no image" inherits="normal text style">
             <view visible="no"/>
             <listing x="20" width="730"/>
         </menuset>
-
+        
         <!-- default with description and image -->
         <menuset label="default description" inherits="normal text style">
             <listing height="350"/>
-            <info layout="description" visible="yes" x="20" y="460"
-            width="760" height="130"/>
+            <info layout="description" visible="yes" x="20" y="490" 
width="760" height="130"/>
         </menuset>
-
+        
         <!-- default with description without an image -->
         <menuset label="default description no image" inherits="default 
description">
             <view visible="no"/>
@@ -43,13 +44,11 @@
         <layout label="view">
             <content align="center" valign="center">
                 <item type="default">
-                    <rectangle size="0" bgcolor="0x080000000"
-                        radius="8" x="-10" y="-10"
-                        width="max+20" height="max+20"/>
+                    <rectangle size="0" bgcolor="0x080000000" radius="8" 
x="-10" y="-10" width="max+20" height="max+20"/>
                 </item>
             </content>
         </layout>
-
+        
         <layout label="view no border">
             <content align="center" valign="center">
                 <item type="default"/>
@@ -62,79 +61,70 @@
             <content type="text" spacing="2">
                 <item type="default" font="grey"/>
                 <item type="selected" font="white">
-                    <rectangle bgcolor="0x3d95d3" size="0"
-                               x="-10" y="-3" width="max+20"
-                               height="max+6" radius="15"/>
+                    <rectangle bgcolor="0x3d95d3" size="0" x="-10" y="-3" 
width="max+20" height="max+6" radius="15"/>
                 </item>
             </content>
         </layout>
-
+        
         <!-- default info area -->
         <layout label="description">
             <background>
                 <rectangle size="0" radius="10" bgcolor="0xaa000000"/>
             </background>
-            <content x="10" y="10" type="text" height="max-20" width="max-20"
-                spacing="20" font="default">
+            <content x="10" y="10" type="text" height="max-20" width="max-20" 
spacing="20" font="default">
                 <item type="default">
                     <if expression="description">
-                        <text font="info value" mode="soft" height="max"
-                            expression="description"/>
+                        <text font="info value" mode="soft" height="max" 
expression="description"/>
                     </if>
-                </item>
+                </item>        
             </content>
         </layout>
 
-        <image label="background_main" filename="back_main.png"/>
-        <image label="background_image" filename="back_image.png"/>
-        <image label="background_movie" filename="back_movie.png"/>
-        <image label="background_music" filename="back_music.png"/>
-        <image label="background_tv" filename="back_tv.png"/>
-        <image label="background_weather" filename="back_weather.png"/>
-        <image label="main_logo" filename="logo.png"/>
-        <image label="logo" filename="fake_logo.png"/>
-        <image label="panel" filename="panel.png"/>
-        <image label="panel2" filename="panel2.png"/>
-
-        <!--
-        *******************************************************
-        ** VIDEO MENU
-        ******************************************************* -->
+       <image label="background_main" filename="geexbox/back_main.png"/>
+       <image label="background_image" filename="geexbox/back_image.png"/>
+       <image label="background_movie" filename="geexbox/back_movie.png"/>
+       <image label="background_music" filename="geexbox/back_music.png"/>
+       <image label="background_tv" filename="geexbox/back_tv.png"/>
+       <image label="background_weather" filename="geexbox/back_weather.png"/>
+       <image label="main_logo" filename="geexbox/logo.png"/>
+       <image label="logo" filename="geexbox/logo.png"/>
+       <image label="panel" filename="geexbox/panel.png"/>
+       <image label="panel2" filename="geexbox/panel2.png"/>
+       <image label="shutdown" filename="geexbox/shutdown.jpg"/>
+        
+        <!-- 
+       *******************************************************
+       ** VIDEO MENU
+       ******************************************************* -->
 
         <menu type="video">
             <style text="text with info style"/>
         </menu>
-
+        
         <menuset label="video" inherits="normal text style">
             <screen layout="video screen"/>
             <title visible="no"/>
         </menuset>
-
+        
         <menuset label="text with info style" inherits="normal text style">
             <!-- 4. listing area: the list of all items -->
             <screen layout="video screen" visible="yes"/>
-            <view layout="view no border" x="45" y="125"
-                  width="260" height="230" align="left"/>
-            <listing x="30" y="400" width="710" height="200">
-                <image filename="up.png" label="uparrow"
-                       x="750" y="350"/>
-                <image filename="down.png" label="downarrow"
-                       x="750" y="max-32"/>
+            <view layout="view no border" x="45" y="125" width="260" 
height="230" align="left"/>
+            <listing x="30" y="350" width="710" height="200">
+                <image filename="up.png" label="uparrow" x="750" y="350"/>
+                <image filename="down.png" label="downarrow" x="750" 
y="max-32"/>
             </listing>
-            <info layout="video info"
-                  x="320" y="145" width="430" height="290"/>
+            <info layout="video info" x="320" y="105" width="430" 
height="240"/>
             <title visible="no"/>
         </menuset>
-
+        
         <layout label="video screen">
             <background>
-                <image image="background_movie" x="0" y="0"
-                       label="background_movie"/>
-                <image image="panel" label="panel_movie"
-                       x="10" y="125" width="770" height="250"/>
+                <image image="background_movie" x="0" y="0" 
label="background_movie"/>
+                <image image="panel" label="panel_movie" x="10" y="125" 
width="770" height="250"/>
             </background>
         </layout>
-
+        
         <layout label="video info">
             <content x="0" y="0" type="text" spacing="20" font="default">
                 <item type="video">
@@ -153,14 +143,14 @@
                     <if expression="tagline">
                         <text font="info tagline">"</text>
                         <text font="info tagline" expression="tagline"
-                            dim="no"/>
+                           dim="no"/>
                         <text font="info tagline">"</text>
                         <newline/>
                     </if>
                     <if expression="plot">
                         <goto_pos x="20" mode="relative"/>
-                        <text font="info plot" height="120" mode="soft"
-                            align="justified" expression="plot"/>
+                        <text font="info plot" height="120" mode="soft" 
+                           align="justified" expression="plot"/>
                         <newline/>
                     </if>
                     <goto_pos y="190" mode="absolute"/>
@@ -175,7 +165,7 @@
                         <newline/>
                     </if>
                 </item>
-
+                
                 <item type="dir">
                     <text font="info tagline" width="max" expression="name"/>
                     <newline/>
@@ -186,13 +176,13 @@
                     </if>
                     <if expression="plot">
                         <goto_pos x="10" mode="relative"/>
-                        <text font="info plot" height="max" mode="soft"
-                            align="justified" expression="plot"/>
+                        <text font="info plot" height="max" mode="soft" 
+                           align="justified" expression="plot"/>
                         <newline/>
                     </if>
                     <if expression="content and not plot">
-                        <text font="info plot" height="max" mode="soft"
-                            align="justified" expression="content"/>
+                        <text font="info plot" height="max" mode="soft" 
+                           align="justified" expression="content"/>
                         <newline/>
                     </if>
                     <if expression="not content and not plot">
@@ -215,7 +205,7 @@
                         <newline/>
                     </if>
                 </item>
-
+                
                 <item type="track">
                     <if expression="trackno">
                         <text font="info tagline">Track </text>
@@ -243,55 +233,50 @@
                         <newline/>
                     </if>
                 </item>
-
+                
             </content>
         </layout>
+        
 
+       <menuset label="full video screen">
+           <screen layout="video running screen"/>
+       </menuset>
 
-        <menuset label="full video screen">
-            <screen layout="video running screen"/>
-        </menuset>
-
-        <menuset label="small video screen">
-            <screen layout="video running screen"/>
-        </menuset>
+       <menuset label="small video screen">
+           <screen layout="video running screen"/>
+       </menuset>
 
         <layout label="video running screen">
             <background>
                 <image image="background" x="0" y="0" label="background" 
alpha="200"/>
-                <image filename="gant/movie.png" x="435" y="0" width="370"
-                    height="380" alpha="200"/>
+                <image filename="geexbox/movie.png" x="435" y="0" width="370" 
height="380" alpha="200"/>
             </background>
         </layout>
+        
 
-
-        <!--
-        *******************************************************
-        ** AUDIO MENU
-        ******************************************************* -->
+        <!-- 
+       *******************************************************
+       ** AUDIO MENU
+       ******************************************************* -->
 
         <menu type="audio">
             <style text="audio"/>
         </menu>
-
+        
         <menuset label="audio" inherits="normal text style">
             <screen layout="audio screen"/>
-            <view layout="view no border"
-                  x="45" y="110" width="260" height="250"/>
-            <info layout="audio info"
-                  x="45" y="450" width="273" height="180"/>
+            <view layout="view no border" x="39" y="145" width="260" 
height="250"/>
+            <info layout="audio info" x="40" y="415" width="260" height="180"/>
             <title visible="no"/>
         </menuset>
-
+        
         <layout label="audio screen">
             <background>
-                <image image="background_music"
-                       x="0" y="0" label="background_music"/>
-                <image image="panel2" label="panel_audio"
-                       x="12" y="125" width="290" height="475"/>
+                <image image="background_music" x="0" y="0" 
label="background_music"/>
+                <image image="panel2" label="panel_audio" x="12" y="125" 
width="290" height="475"/>
             </background>
         </layout>
-
+        
         <layout label="audio info">
             <content x="0" y="0" type="text" spacing="20" font="default">
                 <!-- audio dir -->
@@ -308,7 +293,7 @@
                         <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"/>
@@ -324,12 +309,12 @@
                         <text font="info value"> Items</text>
                         <newline/>
                     </if>
-                    <if expression="content">
-                        <text font="info value" expression="content"
-                            height="max" mode="soft"/>
-                    </if>
+                   <if expression="content">
+                       <text font="info value" expression="content" 
+                           height="max" mode="soft"/>
+                   </if>
                 </item>
-
+                
                 <item type="audio">
                     <if expression="artist">
                         <text font="info tagline" expression="artist"/>
@@ -343,20 +328,20 @@
                         <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"/>
+                            <text font="info value" expression="description" 
+                               height="max" mode="soft"/>
                         </if>
                     </if>
-
-                    <if expression="parent(audio_advanced_sort)">
+                   
+                   <if expression="parent(audio_advanced_sort)">
                         <text font="info value">Track </text>
                         <text font="info value" expression="trackno"/>
-                        <if expression="trackof">
-                            <text font="info value"> of </text>
-                            <text font="info value" expression="trackof"/>
-                        </if>
+                       <if expression="trackof">
+                           <text font="info value"> of </text>
+                           <text font="info value" expression="trackof"/>
+                       </if>
                         <newline/>
-                    </if>
+                   </if>
 
                     <if expression="date">
                         <text font="info value" expression="date"/>
@@ -367,7 +352,7 @@
                         <newline/>
                     </if>
                 </item>
-
+                
                 <item type="audiocd">
                     <if expression="title">
                         <text font="info tagline" expression="title"/>
@@ -385,69 +370,60 @@
                 </item>
             </content>
         </layout>
-
-
-        <!--
-        *******************************************************
-        ** IMAGE MENU
-        ******************************************************* -->
+        
+        
+        <!-- 
+       *******************************************************
+       ** IMAGE MENU
+       ******************************************************* -->
 
         <menu type="image">
             <style image="image" text="normal text style (image)"/>
             <style text="normal text style (image)"/>
         </menu>
-
+        
         <menuset label="image" inherits="normal text style">
             <screen layout="image screen"/>
-            <listing y="110" x="60" height="430" width="700"
-                     layout="image list"/>
-            <info layout="image info"
-                  x="20" y="525" width="700" height="60"/>
+            <listing y="110" x="60" height="430" width="700" layout="image 
list"/>
+            <info layout="image info" x="20" y="540" width="700" height="60"/>
             <view visible="no"/>
             <title visible="no"/>
         </menuset>
-
+        
         <menuset label="normal text style (image)" inherits="normal text 
style">
             <screen layout="image screen" visible="yes"/>
-        </menuset>
+       </menuset>
 
         <layout label="image screen">
             <background>
-                <image image="background_image" label="background_image"
-                       x="0" y="0"/>
-                <image filename="frame.png" label="frame_image"
-                       x="10" y="520" width="790" height="70"/>
+                <image image="background_image" label="background_image" x="0" 
y="0"/>
+                <image filename="frame.png" label="frame_image" x="10" y="520" 
width="790" height="70"/>
             </background>
         </layout>
-
+        
         <!-- listing area for image with images (preview) -->
         <layout label="image list">
             <content type="image" spacing="0">
-                <item type="default" width="140" height="115" align="center"
-                    valign="center">
+                <item type="default" width="140" height="115" align="center" 
valign="center">
                     <shadow x="5" y="5" color="0xaa000000" visible="yes"/>
                 </item>
-                <item type="selected" width="140" height="115"
-                    align="center" valign="center">
+                <item type="selected" width="140" height="115" align="center" 
valign="center">
                     <shadow x="5" y="5" color="0xaa000000" visible="yes"/>
-                    <rectangle color="0x00ffffff" bgcolor="0xffffffffff" 
size="2" x="-8"
-                        y="-8" width="max+16" height="max+16"/>
+                    <rectangle color="0x00ffffff" bgcolor="0xffffffffff" 
size="2" x="-8" y="-8" width="max+16" height="max+16"/>
                 </item>
             </content>
         </layout>
-
+        
         <layout label="image info">
-            <content x="10" y="10" type="text" height="max-20" width="max-20"
-                spacing="15" font="default">
+            <content x="10" y="10" type="text" height="max-20" width="max-20" 
spacing="15" font="default">
                 <item type="default">
                     <text font="info tagline" expression="name"/>
                     <newline/>
                     <if expression="description">
-                        <text font="info plot" height="max" mode="soft"
-                            expression="description"/>
+                        <text font="info plot" height="max" mode="soft" 
expression="description"/>
                         <newline/>
                     </if>
-                </item>
+               </item>
 
                 <item type="dir">
                     <text font="info tagline" width="max" expression="name"/>
@@ -456,7 +432,7 @@
                     <text font="info value"> Items</text>
                     <!-- other values are num_play_items and num_dir_items -->
                 </item>
-
+               
                 <item type="playlist">
                     <text font="info tagline" width="max" expression="name"/>
                     <newline/>
@@ -464,7 +440,7 @@
                     <text font="info value"> Items</text>
                     <!-- other values are num_play_items and num_dir_items -->
                 </item>
-
+               
                 <item type="image">
                     <text font="info tagline" expression="name"/>
                     <goto_pos x="50" mode="relative"/>
@@ -473,8 +449,8 @@
                     </if>
                     <newline/>
                     <if expression="description">
-                        <text font="info plot" height="max" mode="soft"
-                            expression="description"/>
+                        <text font="info plot" height="max" mode="soft" 
+                           expression="description"/>
                         <newline/>
                     </if>
                     <if expression="not description">
@@ -491,96 +467,86 @@
                 </item>
             </content>
         </layout>
+        
 
-
-        <!--
-        *******************************************************
-        ** MAIN MENU
-        ******************************************************* -->
+        <!-- 
+       *******************************************************
+       ** MAIN MENU
+       ******************************************************* -->
 
         <main imagedir="geexbox">
-            <item label="tv" name="Watch TV"
-                  image="tv.png" />
-            <item label="video" name="Watch a Movie"
-                  image="movie.png" />
-            <item label="audio" name="Listen to Music"
-                  image="music.png" />
-            <item label="image" name="Look at Pictures"
-                  image="image.png" />
-            <item label="weather" name="Weather Forecast"
-                  image="weather.png" />
+            <item label="tv" name="Watch TV" image="tv.png" />
+            <item label="video" name="Watch a Movie" image="movie.png" />
+            <item label="audio" name="Listen to Music" image="music.png" />
+            <item label="image" name="Look at Pictures" image="image.png" />
+           <item label="headlines" name="Headlines" image="headlines.jpg" />
+            <item label="weather" name="Weather Forecast" image="weather.png" 
/>
         </main>
 
         <!-- definition of the main menu -->
-        <menuset label="main menu" y="0">
+        <menuset label="main menu" x="0" y="0">
             <screen layout="screen watermark" visible="yes">
                 <area x="0" y="0" width="800" height="600"/>
             </screen>
-            <listing layout="list_main"
-                      x="20" y="220" width="380" height="390"/>
+            <listing layout="list_main" x="20" y="160" width="380" 
height="420"/>
             <view visible="no"/>
         </menuset>
-
+        
         <layout label="screen watermark">
             <background>
-                <image image="background_main" label="background_main"
-                       x="0" y="1" />
-                <image x="362" y="112" width="438" height="372"
-                       label="watermark"/>
+               <image image="background_main" x="0" y="0" 
label="background_main"/>
+                <image x="362" y="112" width="438" height="372" 
label="watermark"/>
                 <image image="main_logo" x="70" y="25" width="285" 
height="167" label="main_logo"/>
             </background>
         </layout>
-
+        
         <!-- main menu listing area -->
         <layout label="list_main">
             <content align="left" type="text" spacing="5">
                 <item type="default" font="main"/>
                 <item type="selected" font="main selected">
-                    <rectangle bgcolor="0x3d95d3" size="0" y="-5" x="-10"
-                        width="240" height="max+10" radius="15"/>
+                    <rectangle bgcolor="0x3d95d3" size="0" y="-5" x="-10" 
width="240" height="max+10" radius="15"/>
                 </item>
             </content>
         </layout>
 
-        <!--
-        *******************************************************
-        ** TV DEFINITIONS
-        ******************************************************* -->
+        <!-- 
+       *******************************************************
+       ** TV DEFINITIONS
+       ******************************************************* -->
 
 
         <layout label="tv screen">
             <background>
-                <image image="background_tv" x="0" y="0" 
label="background_tv"/>
+                   <image image="background_tv" x="0" y="0" 
label="background_tv"/>
             </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"
-                    filename="up.png"/>
-                <image x="765" y="max-32" width="32" height="32" 
label="downarrow"
-                    filename="down.png"/>
+            <title visible="no" x="40" y="40"/>
+           <info visible="no" layout="tv info" x="10" y="90" width="780" 
height="30"/>
+           <listing layout="tv listing" x="10" y="120" width="750" 
height="440">
+               <rectangle size="490" x="0" y="110" bgcolor="0x80000000" 
radius="10" width="max"/>
+                <image x="765" y="150" width="32" height="32" label="uparrow" 
filename="up.png"/>
+                <image x="765" y="max-32" width="32" height="32" 
label="downarrow" filename="down.png"/>
                 <image width="16" height="16" label="leftarrow" 
filename="left.png"/>
                 <image width="16" height="16" label="rightarrow" 
filename="right.png"/>
             </listing>
         </menuset>
-
+        
         <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="tv">
+            <content x="10" y="10" height="max-20" width="max-20" type="text" 
spacing="10" font="tv">
                 <item type="default">
                     <if expression="title">
                         <text font="tv title" width="550" expression="title"/>
                     </if>
-                    <text font="tv time" width="max" align="right" 
expression="time"/>
+                   <text font="tv time" width="max" align="right" 
expression="time"/>
                     <newline/>
                     <if expression="subtitle">
                         <text font="info tagline">"</text>
@@ -589,112 +555,100 @@
                         <newline/>
                     </if>
                     <if expression="description">
-                        <text font="info plot" height="max" mode="soft"
-                            expression="description"/>
+                        <text font="info plot" height="max" mode="soft" 
expression="description"/>
                         <newline/>
                     </if>
                 </item>
             </content>
         </layout>
+        
 
-
-        <!-- tv main menu -->
+       <!-- tv main menu -->
 
         <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">
+                <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="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>
+                       <text font="tv title" width="max" 
height="-1">Recordserver not found</text>
+                   </if>
                 </item>
             </content>
         </layout>
 
-        <!-- program details -->
+       <!-- program details -->
 
         <menu type="tv program menu">
-            <style text="text with program info style"/>
+           <style text="text with program info style"/>
         </menu>
 
         <menu type="tv favorite menu">
-            <style text="text with program info style"/>
+           <style text="text with program info style"/>
         </menu>
 
-        <menuset label="text with program info style"
-            inherits="tv main menu">
+        <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>
+                <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>
+       </layout>
 
 
-        <!-- normal menus in tv -->
+       <!-- 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"/>
+                <rectangle size="0" bgcolor="0x80000000" radius="10" x="10" 
y="90" width="780" height="250"/>
+               <image filename="tv.png" x="435" y="230" width="370" 
height="380"/>
+               <listing label="listing" y="130" height="340"/>
             </background>
         </layout>
-
+        
 
         <!-- fonts -->
 
@@ -706,34 +660,29 @@
         <font label="tv title" name="Arial_Bold" size="16" color="0xffffff"/>
         <font label="comingup" name="Arial_Bold" size="14" color="0xffffff"/>
 
-        <!--
-        *******************************************************
-        ** AUDIO PLAYER DEFINITIONS
-        ******************************************************* -->
-
+        <!-- 
+       *******************************************************
+       ** AUDIO PLAYER DEFINITIONS
+       ******************************************************* -->
+        
         <player>
-            <screen layout="player screen"
-                    x="0" y="0" width="800" height="600"/>
-            <info layout="player info blurr"
-                  x="400" y="170" width="375" height="330"/>
-            <view layout="player blurr"
-                  x="30" y="120" width="360" height="350"/>
+            <screen layout="player screen" x="0" y="0" width="800" 
height="600"/>
+            <info layout="player info blurr" x="400" y="170" width="375" 
height="330"/>
+            <view layout="player blurr" x="27" y="140" width="360" 
height="350"/>
             <title visible="no"/>
         </player>
-
+        
         <layout label="player screen">
             <background>
-                <image image="background_music"
-                       x="0" y="0" label="background_music" />
-                <image filename="frame.png"
-                       x="5" y="130" width="max-10" height="390"/>
+                <image image="background_music" x="0" y="0" 
label="background_music" />
+                <image filename="frame.png" x="5" y="130" width="max-10" 
height="390"/>
             </background>
         </layout>
-
+        
         <layout label="player blurr">
             <content align="center" valign="center"/>
         </layout>
-
+        
         <layout label="player info blurr">
             <content>
                 <item type="default">
@@ -792,63 +741,59 @@
                 </item>
             </content>
         </layout>
-
+        
         <font label="player" name="Arial_Bold" size="18" color="0xffffff">
             <shadow visible="yes" color="0x000000" border="yes"/>
         </font>
         <font label="player title" name="Arial_Bold" size="18" 
color="0xffffff"/>
         <font label="player artist" name="Arial_Bold" size="16" 
color="0xffffff"/>
         <font label="player info"   name="Arial_Bold" size="14" 
color="0xffffff"/>
+        
 
-
-        <!--
-        *******************************************************
-        ** Splashscreen
-        ******************************************************* -->
-
+        <!-- 
+       *******************************************************
+       ** Splashscreen
+       ******************************************************* -->
+        
         <splashscreen>
             <screen layout="screen"/>
             <content layout="splashscreen" x="0" y="0" width="800" 
height="600"/>
         </splashscreen>
-
+        
         <layout label="splashscreen">
             <background>
-                <image filename="blurrsplash.jpg"/>
+                <image filename="back_main.png"/>
             </background>
             <content x="30" y="400" width="740" font="splashscreen font" 
spacing="10"/>
         </layout>
-
+        
         <font label="splashscreen font" name="Arial_Bold" size="20" 
color="0xffffff"/>
-
-
-
-        <!--
-        *******************************************************
-        ** POPUP DEFINITIONS
-        ******************************************************* -->
+        
+        
+       
+        <!-- 
+       *******************************************************
+       ** POPUP DEFINITIONS
+       ******************************************************* -->
 
         <layout label="popup">
             <background>
                 <rectangle x="5" y="5" size="0" bgcolor="0xa0000000" 
radius="5"/>
-                <rectangle width="max-5" height="max-5" color="0x000000" 
size="2"
-                    bgcolor="0xffffff" radius="5"/>
-                <rectangle x="5" y="5" width="max-15" height="max-15" 
color="0x000000"
-                    size="2" bgcolor="widget background" radius="5"/>
+                <rectangle width="max-5" height="max-5" color="0x000000" 
size="2" bgcolor="0xffffff" radius="5"/>
+                <rectangle x="5" y="5" width="max-15" height="max-15" 
color="0x000000" size="2" bgcolor="widget background" radius="5"/>
             </background>
             <content x="15" y="15" width="max-35" height="max-35">
-                <!-- special button settings -->
+               <!-- special button settings -->
                 <item type="button">
-                    <rectangle color="0x000000" bgcolor="widget item 
background"
-                        size="2" radius="6"/>
+                    <rectangle color="0x000000" bgcolor="widget item 
background" size="2" radius="6"/>
                 </item>
-                 <!-- special settings for selected buttons -->
+               <!-- special settings for selected buttons -->
                 <item type="button selected">
-                    <rectangle color="0x000000" bgcolor="widget selected 
background"
-                        size="2" radius="6"/>
+                    <rectangle color="0x000000" bgcolor="widget selected 
background" size="2" radius="6"/>
                 </item>
-            </content>
+           </content>
         </layout>
-
+        
         <font label="widget" name="Arial_Bold" size="14">
             <shadow visible="yes" color="0x000000" border="yes"/>
         </font>
@@ -856,13 +801,13 @@
         <font label="selected widget" name="Arial_Bold" size="14">
             <shadow visible="yes" color="0x000000" border="yes"/>
         </font>
+        
 
-
-        <!--
-        *******************************************************
-        ** FONT DEFINITIONS
-        ******************************************************* -->
-
+        <!-- 
+       *******************************************************
+       ** FONT DEFINITIONS
+       ******************************************************* -->
+        
         <font label="default" name="Arial_Bold" size="16" color="0xffffff">
             <shadow visible="yes" color="0x000000" border="yes"/>
         </font>
@@ -871,7 +816,7 @@
         </font>
         <font label="title" name="Arial_Bold" size="18" color="0xffffff">
             <shadow visible="yes" color="0x000000" border="yes"/>
-
+           
         </font>
         <font label="subtitle" name="Arial_Bold" size="18" color="0xffffff">
             <shadow visible="yes" color="0x000000" border="yes"/>
@@ -895,17 +840,17 @@
             <shadow visible="yes" color="0x000000" border="yes"/>
         </font>
 
-
+        
         <!-- info area -->
         <font label="info plot"    name="Arial_Bold" size="13" 
color="0xffffff"/>
         <font label="info tagline" name="Arial_Bold" size="16" 
color="0xffffff"/>
         <font label="info label"   name="Arial_Bold" size="14" 
color="0xffffff"/>
         <font label="info value"   name="Arial_Bold" size="14" 
color="0xffffff"/>
-
+        
         <font label="clock"   name="Arial_Bold" size="16" color="0xffffff"/>
-
+        
         <!-- Basic Fonts -->
-
+        
         <font label="small0"  name="Arial_Bold" size="12" color="default0">
             <shadow visible="yes" color="0x000000" border="yes"/>
         </font>
@@ -915,7 +860,7 @@
         <font label="small2"  name="Arial_Bold" size="12" color="default2">
             <shadow visible="yes" color="0x000000" border="yes"/>
         </font>
-
+        
         <font label="medium0" name="Arial_Bold" size="16" color="default0">
             <shadow visible="yes" color="0x000000" border="yes"/>
         </font>
@@ -925,7 +870,7 @@
         <font label="medium2" name="Arial_Bold" size="16" color="default2">
             <shadow visible="yes" color="0x000000" border="yes"/>
         </font>
-
+        
         <font label="large0"  name="Arial_Bold" size="20" color="default0">
             <shadow visible="yes" color="0x000000" border="yes"/>
         </font>
@@ -935,7 +880,7 @@
         <font label="large2"  name="Arial_Bold" size="20" color="default2">
             <shadow visible="yes" color="0x000000" border="yes"/>
         </font>
-
+        
         <font label="huge0"  name="Arial_Bold" size="28" color="default0">
             <shadow visible="yes" color="0x000000" border="yes"/>
         </font>
@@ -945,11 +890,11 @@
         <font label="huge2"  name="Arial_Bold" size="28" color="default2">
             <shadow visible="yes" color="0x000000" border="yes"/>
         </font>
-
+        
         <color label="default0" value="0xffffff"/>
         <color label="default1" value="0xffffaa"/>
         <color label="default2" value="0xcccccc"/>
-
+        
     </skin>
 </freevo>
 <!-- Keep this comment at the end of the file

-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog

Reply via email to