Author: duncan
Date: Tue Jan 2 10:07:31 2007
New Revision: 8903
Modified:
branches/rel-1/freevo/ChangeLog
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:
[ 1626075 ] Distinguish programmes in the EPG that are currently showing
Changes applied
Modified: branches/rel-1/freevo/ChangeLog
==============================================================================
--- branches/rel-1/freevo/ChangeLog (original)
+++ branches/rel-1/freevo/ChangeLog Tue Jan 2 10:07:31 2007
@@ -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 currently playing (F#1626075)
* 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)
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 Tue Jan 2 10:07:31 2007
@@ -506,6 +506,10 @@
y="-5" width="max+10" height="max+10"/>
</item>
+ <item type="current" font="tv highlight">
+ <rectangle bgcolor="0xff000000" color="0x000000" size="1"
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>
@@ -647,6 +651,7 @@
<shadow visible="yes" color="0x000000" x="1" y="1"/>
</font>
<font label="tv grey" name="VeraBd.ttf" size="16" color="0xa0bbbbbb"/>
+ <font label="tv highlight" name="VeraBd.ttf" size="16"
color="0xa0eeee00"/>
<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 Tue Jan 2 10:07:31 2007
@@ -627,6 +627,7 @@
<shadow visible="no" color="0x000000" border="yes"/>
</font>
<font label="tv grey" name="Arial_Bold" size="14" color="0xa0bbbbbb"/>
+ <font label="tv highlight" name="VeraBd.ttf" size="14"
color="0xa0eeee00"/>
<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 Tue Jan 2
10:07:31 2007
@@ -621,6 +621,7 @@
<shadow visible="no" color="0x000000" border="yes"/>
</font>
<font label="tv grey" name="Arial_Bold" size="14" color="0xa0bbbbbb"/>
+ <font label="tv highlight" name="VeraBd.ttf" size="14"
color="0xa0eeee00"/>
<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 Tue Jan 2
10:07:31 2007
@@ -77,8 +77,10 @@
scheduled_val = content.types['scheduled']
overlap_val = content.types['overlap']
past_val = content.types['past']
+ current_val = content.types['current']
- self.all_vals = label_val, head_val, selected_val, default_val,
scheduled_val, overlap_val, past_val
+ self.all_vals = label_val, head_val, selected_val, default_val,
scheduled_val, overlap_val,\
+ past_val, current_val
font_h = max(selected_val.font.h, default_val.font.h, label_val.font.h)
@@ -169,7 +171,8 @@
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, past_val = self.all_vals
+ label_val, head_val, selected_val, default_val, scheduled_val,
overlap_val,\
+ past_val, current_val = self.all_vals
leftarrow = None
if area.images['leftarrow']:
@@ -323,7 +326,9 @@
val = overlap_val
elif prg.scheduled:
val = scheduled_val
- elif prg.start < now_time:
+ elif now_time >= prg.start and now_time <= prg.stop:
+ val = current_val
+ elif now_time > prg.stop:
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
