Author: duncan
Date: Mon Nov 26 16:22:30 2007
New Revision: 10161

Log:
[ 1835256 ] Geexbox TV menu bug
Patch from Evan Hisey applied


Modified:
   branches/rel-1-7/freevo/ChangeLog
   branches/rel-1-7/freevo/share/skins/main/geexbox.fxd
   branches/rel-1/freevo/ChangeLog
   branches/rel-1/freevo/share/skins/main/geexbox.fxd

Modified: branches/rel-1-7/freevo/ChangeLog
==============================================================================
--- branches/rel-1-7/freevo/ChangeLog   (original)
+++ branches/rel-1-7/freevo/ChangeLog   Mon Nov 26 16:22:30 2007
@@ -25,6 +25,7 @@
  * Renamed plug-in audio.playlist to audio.playlists (B#1834140)
  * Fixed audioscrobbler killing the auto shutdown feature (F#1831371)
  * Fixed helper plugins, not allowing tuples as arguments (B#1832837)
+ * Fixed geexbox skin TV menu reporting record server status (B#1835256)
  * Fixed itv plug-in, having "No player for this item found" 
(B#1833018,B#1833829)
  * Fixed lastfm plug-in path using /tmp to use FREEVO_CACHEDIR (B#1834488)
  * Fixed oneclick weather plug-in not handling bad icon data (B#1834275)

Modified: branches/rel-1-7/freevo/share/skins/main/geexbox.fxd
==============================================================================
--- branches/rel-1-7/freevo/share/skins/main/geexbox.fxd        (original)
+++ branches/rel-1-7/freevo/share/skins/main/geexbox.fxd        Mon Nov 26 
16:22:30 2007
@@ -581,28 +581,7 @@
             </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>
+                    <text font="info tagline" width="max" height="max" 
expression="function:comingup" mode="soft"/>    
                 </item>
             </content>
         </layout>

Modified: branches/rel-1/freevo/ChangeLog
==============================================================================
--- branches/rel-1/freevo/ChangeLog     (original)
+++ branches/rel-1/freevo/ChangeLog     Mon Nov 26 16:22:30 2007
@@ -29,6 +29,7 @@
  * Updated webserver media library (F#1835346)
  * Renamed plug-in audio.playlist to audio.playlists (B#1834140)
  * Fixed audioscrobbler killing the auto shutdown feature (F#1831371)
+ * Fixed geexbox skin TV menu reporting record server status (B#1835256)
  * Fixed helper plugins, not allowing tuples as arguments (B#1832837)
  * Fixed itv plug-in, having "No player for this item found" 
(B#1833018,B#1833829)
  * Fixed lastfm plug-in path using /tmp to use FREEVO_CACHEDIR (B#1834488)

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  Mon Nov 26 16:22:30 2007
@@ -581,28 +581,7 @@
             </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>
+                    <text font="info tagline" width="max" height="max" 
expression="function:comingup" mode="soft"/>    
                 </item>
             </content>
         </layout>

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog

Reply via email to