Author: duncan
Date: Mon Jan  1 22:47:53 2007
New Revision: 8901

Modified:
   branches/rel-1/freevo/ChangeLog
   branches/rel-1/freevo/Docs/CREDITS
   branches/rel-1/freevo/share/skins/main/basic.fxd
   branches/rel-1/freevo/share/skins/main/blurr.fxd
   branches/rel-1/freevo/share/skins/main/mediaportal.fxd
   branches/rel-1/freevo/src/skins/main/tvlisting_area.py

Log:
[ 1625774 ] Allow distinguishing of already started programmes in EPG
Patch from Andrew Flegg applied


Modified: branches/rel-1/freevo/ChangeLog
==============================================================================
--- branches/rel-1/freevo/ChangeLog     (original)
+++ branches/rel-1/freevo/ChangeLog     Mon Jan  1 22:47:53 2007
@@ -11,7 +11,7 @@
 (F)eature requests http://sourceforge.net/tracker/?group_id=46652&atid=446898
 
 
-== Release 1.7.0 (2006-12-15) ==
+== Release 1.7.0 (2007-01-02) ==
 --------------------------------
 
 svn export svn://svn.freevo.org/freevo/branches/rel-1/freevo freevo-1.x
@@ -46,6 +46,7 @@
  * Updated multimail plug-in for Maildir support (F#1594915)
  * Updated recordserver to allow automatic deleting of old recordings when low 
on disk space (F#1594630)
  * Updated recordserver and tv guide to detect and show overlapping recordings 
(F#1625305)
+ * Updated tv guide to show when programmes are in the past (F#1625774)
  * Updated tv mplayer plug-in to pause live tv and change channels without 
stopping for dvb (F#1610656)
  * Updated video player to allow commands before and after playback (F#1602956)
  * Updated weather translations, with spanish weather translations (F#1621819)

Modified: branches/rel-1/freevo/Docs/CREDITS
==============================================================================
--- branches/rel-1/freevo/Docs/CREDITS  (original)
+++ branches/rel-1/freevo/Docs/CREDITS  Mon Jan  1 22:47:53 2007
@@ -60,6 +60,9 @@
 Occasional contributors:
 ------------------------
 
+Andrew Flegg <[EMAIL PROTECTED]>
+o Skin additions, anamorphic and past
+
 Don Locke <[EMAIL PROTECTED]>
 o Music Player Daemon (MPD) plug-in
 

Modified: branches/rel-1/freevo/share/skins/main/basic.fxd
==============================================================================
--- branches/rel-1/freevo/share/skins/main/basic.fxd    (original)
+++ branches/rel-1/freevo/share/skins/main/basic.fxd    Mon Jan  1 22:47:53 2007
@@ -505,6 +505,10 @@
                    <rectangle bgcolor="0xeb8123" size="1" color="0x000000" 
x="-5"
                        y="-5" width="max+10" height="max+10"/>
                </item>
+
+                <item type="past" font="tv grey">
+                    <rectangle bgcolor="0xff000000" color="0x000000" size="1" 
x="-5" y="-5" width="max+10" height="max+10"/>
+                </item>
                
            </content>
        </layout>
@@ -642,6 +646,7 @@
        <font label="tv selected" name="VeraBd.ttf" size="16" color="0xffff66">
            <shadow visible="yes" color="0x000000" x="1" y="1"/>
        </font>
+        <font label="tv grey" name="VeraBd.ttf" size="16" color="0xa0bbbbbb"/>
        <font label="tv time" name="VeraBd.ttf" size="14" color="0xffffaa"/>
        <font label="tv title" name="VeraBd.ttf" size="24" color="0xffffff">
            <shadow x="2" y="2" color="0x000000" visible="yes"/>

Modified: branches/rel-1/freevo/share/skins/main/blurr.fxd
==============================================================================
--- branches/rel-1/freevo/share/skins/main/blurr.fxd    (original)
+++ branches/rel-1/freevo/share/skins/main/blurr.fxd    Mon Jan  1 22:47:53 2007
@@ -626,6 +626,7 @@
         <font label="tv selected" name="Arial_Bold" size="14" color="0x164668">
             <shadow visible="no" color="0x000000" border="yes"/>
         </font>
+        <font label="tv grey" name="Arial_Bold" size="14" color="0xa0bbbbbb"/>
         <font label="tv time" name="Arial_Bold" size="14" color="0xffffff"/>
         <font label="tv title" name="Arial_Bold" size="16" color="0xffffff"/>
 

Modified: branches/rel-1/freevo/share/skins/main/mediaportal.fxd
==============================================================================
--- branches/rel-1/freevo/share/skins/main/mediaportal.fxd      (original)
+++ branches/rel-1/freevo/share/skins/main/mediaportal.fxd      Mon Jan  1 
22:47:53 2007
@@ -620,6 +620,7 @@
         <font label="tv selected" name="Arial_Bold" size="14" color="0x164668">
             <shadow visible="no" color="0x000000" border="yes"/>
         </font>
+        <font label="tv grey" name="Arial_Bold" size="14" color="0xa0bbbbbb"/>
         <font label="tv time" name="Arial_Bold" size="14" color="0xffffff"/>
         <font label="tv title" name="Arial_Bold" size="16" color="0xffffff"/>
 

Modified: branches/rel-1/freevo/src/skins/main/tvlisting_area.py
==============================================================================
--- branches/rel-1/freevo/src/skins/main/tvlisting_area.py      (original)
+++ branches/rel-1/freevo/src/skins/main/tvlisting_area.py      Mon Jan  1 
22:47:53 2007
@@ -76,8 +76,9 @@
         default_val   = content.types['default']
         scheduled_val = content.types['scheduled']
         overlap_val   = content.types['overlap']
+        past_val      = content.types['past']
 
-        self.all_vals = label_val, head_val, selected_val, default_val, 
scheduled_val, overlap_val
+        self.all_vals = label_val, head_val, selected_val, default_val, 
scheduled_val, overlap_val, past_val
         
         font_h = max(selected_val.font.h, default_val.font.h, label_val.font.h)
 
@@ -168,7 +169,7 @@
         font_h, label_width, label_txt_width, y0, num_rows, item_h, head_h = \
                 self.get_items_geometry(settings, menu)[:-1]
 
-        label_val, head_val, selected_val, default_val, scheduled_val, 
overlap_val = self.all_vals
+        label_val, head_val, selected_val, default_val, scheduled_val, 
overlap_val, past_val = self.all_vals
 
         leftarrow = None
         if area.images['leftarrow']:
@@ -252,6 +253,7 @@
         start_time = to_listing[0][1]
         stop_time = to_listing[0][-1]
         stop_time += (col_time*60)
+        now_time = time.time()
 
         # selected program:
         selected_prog = to_listing[1]
@@ -321,6 +323,8 @@
                         val = overlap_val
                     elif prg.scheduled:
                         val = scheduled_val
+                    elif prg.start < now_time:
+                        val = past_val
                     else:
                         val = default_val
 

-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog

Reply via email to