Author: duncan
Date: Wed Feb 6 13:40:56 2008
New Revision: 10343
Log:
[ 1886621 ] Scheduled to Record and favorite icons for Tv Guide
Update from Adam Charrett applied
Added:
branches/rel-1-7/freevo/share/images/recording.png (contents, props
changed)
branches/rel-1-7/freevo/share/images/star.png (contents, props changed)
branches/rel-1/freevo/share/images/recording.png (contents, props changed)
branches/rel-1/freevo/share/images/star.png (contents, props changed)
Modified:
branches/rel-1-7/freevo/ChangeLog
branches/rel-1-7/freevo/share/skins/main/basic.fxd
branches/rel-1-7/freevo/src/skins/main/info_area.py
branches/rel-1-7/freevo/src/tv/tvguide.py
branches/rel-1/freevo/ChangeLog
branches/rel-1/freevo/share/skins/main/basic.fxd
branches/rel-1/freevo/src/skins/main/info_area.py
branches/rel-1/freevo/src/tv/tvguide.py
Modified: branches/rel-1-7/freevo/ChangeLog
==============================================================================
--- branches/rel-1-7/freevo/ChangeLog (original)
+++ branches/rel-1-7/freevo/ChangeLog Wed Feb 6 13:40:56 2008
@@ -13,6 +13,17 @@
svn co svn://svn.freevo.org/freevo/branches/rel-1/freevo freevo-1.x
+== Release 1.7.7 (2008-??-??) ==
+--------------------------------
+
+ * Updated tv guide with scheduled to record and favorite icons (F#1886621)
+ * Fixed the main program to cause a crash when local_conf.py is invalid
(B#1886624)
+
+== Release 1.7.6.1 (2008-02-05) ==
+----------------------------------
+
+ * Fixed config so that it does not crash freevo (B#1888107)
+
== Release 1.7.6 (2008-02-03) ==
--------------------------------
Added: branches/rel-1-7/freevo/share/images/recording.png
==============================================================================
Binary file. No diff available.
Added: branches/rel-1-7/freevo/share/images/star.png
==============================================================================
Binary file. No diff available.
Modified: branches/rel-1-7/freevo/share/skins/main/basic.fxd
==============================================================================
--- branches/rel-1-7/freevo/share/skins/main/basic.fxd (original)
+++ branches/rel-1-7/freevo/share/skins/main/basic.fxd Wed Feb 6 13:40:56 2008
@@ -547,7 +547,14 @@
<content x="10" y="10" height="max-20" width="max-20" type="text"
spacing="10" font="tv">
<item type="default">
- <goto_pos x="600" mode="relative"/>
+ <if expression="scheduled">
+ <img src="recording.png" />
+ <goto_pos x="32" mode="relative"/>
+ </if>
+ <if expression="favorite">
+ <img src="star.png" />
+ </if>
+ <goto_pos x="600" mode="absolute"/>
<text font="tv time" valign="center" expression="start"/>
<text font="tv time" valign="center">-</text>
<text font="tv time" valign="center" expression="stop"/>
Modified: branches/rel-1-7/freevo/src/skins/main/info_area.py
==============================================================================
--- branches/rel-1-7/freevo/src/skins/main/info_area.py (original)
+++ branches/rel-1-7/freevo/src/skins/main/info_area.py Wed Feb 6 13:40:56 2008
@@ -338,6 +338,7 @@
# Tag: <img>
#
elif isinstance( element, xml_skin.FormatImg ):
+ element = copy.copy( element )
# Image is a float object
if element.x == None:
element.x = x
Modified: branches/rel-1-7/freevo/src/tv/tvguide.py
==============================================================================
--- branches/rel-1-7/freevo/src/tv/tvguide.py (original)
+++ branches/rel-1-7/freevo/src/tv/tvguide.py Wed Feb 6 13:40:56 2008
@@ -120,17 +120,21 @@
self.last_update = time.time()
self.scheduled_programs = []
self.overlap_programs = []
+ self.favorite_programs = []
(got_schedule, schedule) = ri.getScheduledRecordings()
util.misc.comingup(None, (got_schedule, schedule))
if got_schedule:
progs = schedule.getProgramList()
+
for k in progs:
prog = progs[k]
self.scheduled_programs.append(prog.str2utf())
if prog.overlap:
self.overlap_programs.append(prog.str2utf())
+ if hasattr(prog, 'isFavorite' ) and prog.isFavorite:
+ self.favorite_programs.append(prog.str2utf())
### event handler
@@ -340,6 +344,11 @@
p.overlap = TRUE
else:
p.overlap = FALSE
+
+ if p in self.favorite_programs:
+ p.favorite = TRUE
+ else:
+ p.favorite = FALSE
except:
pass
Modified: branches/rel-1/freevo/ChangeLog
==============================================================================
--- branches/rel-1/freevo/ChangeLog (original)
+++ branches/rel-1/freevo/ChangeLog Wed Feb 6 13:40:56 2008
@@ -13,6 +13,20 @@
svn co svn://svn.freevo.org/freevo/branches/rel-1/freevo freevo-1.x
+== Release 1.8.0rc3 (2008-??-??) ==
+--------------------------------
+
+== Release 1.7.7 (2008-??-??) ==
+--------------------------------
+
+ * Updated tv guide with scheduled to record and favorite icons (F#1886621)
+ * Fixed the main program to cause a crash when local_conf.py is invalid
(B#1886624)
+
+== Release 1.7.6.1 (2008-02-05) ==
+----------------------------------
+
+ * Fixed config so that it does not crash freevo (B#1888107)
+
== Release 1.8.0rc2 (2008-02-03) ==
--------------------------------
Added: branches/rel-1/freevo/share/images/recording.png
==============================================================================
Binary file. No diff available.
Added: branches/rel-1/freevo/share/images/star.png
==============================================================================
Binary file. No diff available.
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 Wed Feb 6 13:40:56 2008
@@ -547,7 +547,14 @@
<content x="10" y="10" height="max-20" width="max-20" type="text"
spacing="10" font="tv">
<item type="default">
- <goto_pos x="600" mode="relative"/>
+ <if expression="scheduled">
+ <img src="recording.png" />
+ <goto_pos x="32" mode="relative"/>
+ </if>
+ <if expression="favorite">
+ <img src="star.png" />
+ </if>
+ <goto_pos x="600" mode="absolute"/>
<text font="tv time" valign="center" expression="start"/>
<text font="tv time" valign="center">-</text>
<text font="tv time" valign="center" expression="stop"/>
Modified: branches/rel-1/freevo/src/skins/main/info_area.py
==============================================================================
--- branches/rel-1/freevo/src/skins/main/info_area.py (original)
+++ branches/rel-1/freevo/src/skins/main/info_area.py Wed Feb 6 13:40:56 2008
@@ -339,6 +339,7 @@
# Tag: <img>
#
elif isinstance( element, xml_skin.FormatImg ):
+ element = copy.copy( element )
# Image is a float object
if element.x == None:
element.x = x
Modified: branches/rel-1/freevo/src/tv/tvguide.py
==============================================================================
--- branches/rel-1/freevo/src/tv/tvguide.py (original)
+++ branches/rel-1/freevo/src/tv/tvguide.py Wed Feb 6 13:40:56 2008
@@ -120,17 +120,21 @@
self.last_update = time.time()
self.scheduled_programs = []
self.overlap_programs = []
+ self.favorite_programs = []
(got_schedule, schedule) = ri.getScheduledRecordings()
util.misc.comingup(None, (got_schedule, schedule))
if got_schedule:
progs = schedule.getProgramList()
+
for k in progs:
prog = progs[k]
self.scheduled_programs.append(prog.str2utf())
if prog.overlap:
self.overlap_programs.append(prog.str2utf())
+ if hasattr(prog, 'isFavorite' ) and prog.isFavorite:
+ self.favorite_programs.append(prog.str2utf())
### event handler
@@ -340,6 +344,11 @@
p.overlap = TRUE
else:
p.overlap = FALSE
+
+ if p in self.favorite_programs:
+ p.favorite = TRUE
+ else:
+ p.favorite = FALSE
except:
pass
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
