Author: duncan
Date: Wed Feb 6 13:56:58 2008
New Revision: 10345
Log:
[ 1886568 ] programitem time nonsense
Patch from Henne Vogelsang applied
Modified:
branches/rel-1-7/freevo/ChangeLog
branches/rel-1-7/freevo/src/tv/programitem.py
branches/rel-1-7/freevo/src/tv/tvguide.py
branches/rel-1/freevo/ChangeLog
branches/rel-1/freevo/src/tv/programitem.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:56:58 2008
@@ -17,6 +17,7 @@
--------------------------------
* Updated tv guide with scheduled to record and favorite icons (F#1886621)
+ * Updated tv program to stop reporting that a program is over (F#1886568)
* Fixed the main program to cause a crash when local_conf.py is invalid
(B#1886624)
== Release 1.7.6.1 (2008-02-05) ==
Modified: branches/rel-1-7/freevo/src/tv/programitem.py
==============================================================================
--- branches/rel-1-7/freevo/src/tv/programitem.py (original)
+++ branches/rel-1-7/freevo/src/tv/programitem.py Wed Feb 6 13:56:58 2008
@@ -46,7 +46,7 @@
from gui.PopupBox import PopupBox
from gui.AlertBox import AlertBox
-
+from gui.ConfirmBox import ConfirmBox
class ProgramItem(Item):
"""
@@ -162,16 +162,12 @@
if self.prog.start > now + (7*60):
if menuw: menuw.show()
# this program is in the future
- msgtext = _('Sorry, you cannot watch this program now. ')
- msgtext+= _('It starts in the future.')
- AlertBox(text=msgtext).show()
- return
- elif self.prog.stop < now:
- if menuw: menuw.show()
- # this program is already over
- msgtext = _('Sorry, you cannot watch this progam now. ')
- msgtext+= _('This program is already over.')
- AlertBox(text=msgtext).show()
+ if self.scheduled:
+ msgtext= _('Do you want to remove the Program from the record
schedule?')
+ else:
+ msgtext = _('This Program is in the future. Do you want to
record it?')
+
+ ConfirmBox(text=msgtext, handler=lambda:
self.toggle_rec(menuw=menuw), default_choice=1).show()
return
else:
# check if the device is free
@@ -200,7 +196,6 @@
"""
ShowProgramDetails(menuw, self)
-
def toggle_rec(self, arg=None, menuw=None):
"""
schedule or unschedule this program, depending on its current status
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:56:58 2008
@@ -127,7 +127,7 @@
if got_schedule:
progs = schedule.getProgramList()
-
+
for k in progs:
prog = progs[k]
self.scheduled_programs.append(prog.str2utf())
@@ -344,7 +344,7 @@
p.overlap = TRUE
else:
p.overlap = FALSE
-
+
if p in self.favorite_programs:
p.favorite = TRUE
else:
Modified: branches/rel-1/freevo/ChangeLog
==============================================================================
--- branches/rel-1/freevo/ChangeLog (original)
+++ branches/rel-1/freevo/ChangeLog Wed Feb 6 13:56:58 2008
@@ -20,6 +20,7 @@
--------------------------------
* Updated tv guide with scheduled to record and favorite icons (F#1886621)
+ * Updated tv program to stop reporting that a program is over (F#1886568)
* Fixed the main program to cause a crash when local_conf.py is invalid
(B#1886624)
== Release 1.7.6.1 (2008-02-05) ==
Modified: branches/rel-1/freevo/src/tv/programitem.py
==============================================================================
--- branches/rel-1/freevo/src/tv/programitem.py (original)
+++ branches/rel-1/freevo/src/tv/programitem.py Wed Feb 6 13:56:58 2008
@@ -46,7 +46,7 @@
from gui.PopupBox import PopupBox
from gui.AlertBox import AlertBox
-
+from gui.ConfirmBox import ConfirmBox
class ProgramItem(Item):
"""
@@ -165,16 +165,12 @@
if self.prog.start > now + (7*60):
if menuw: menuw.show()
# this program is in the future
- msgtext = _('Sorry, you cannot watch this program now. ')
- msgtext+= _('It starts in the future.')
- AlertBox(text=msgtext).show()
- return
- elif self.prog.stop < now:
- if menuw: menuw.show()
- # this program is already over
- msgtext = _('Sorry, you cannot watch this progam now. ')
- msgtext+= _('This program is already over.')
- AlertBox(text=msgtext).show()
+ if self.scheduled:
+ msgtext= _('Do you want to remove the Program from the record
schedule?')
+ else:
+ msgtext = _('This Program is in the future. Do you want to
record it?')
+
+ ConfirmBox(text=msgtext, handler=lambda:
self.toggle_rec(menuw=menuw), default_choice=1).show()
return
else:
# check if the device is free
@@ -204,7 +200,6 @@
_debug_('show_description(arg=%r, menuw=%r)' % (arg, menuw), 2)
ShowProgramDetails(menuw, self)
-
def toggle_rec(self, arg=None, menuw=None):
"""
schedule or unschedule this program, depending on its current status
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:56:58 2008
@@ -127,7 +127,7 @@
if got_schedule:
progs = schedule.getProgramList()
-
+
for k in progs:
prog = progs[k]
self.scheduled_programs.append(prog.str2utf())
@@ -344,7 +344,7 @@
p.overlap = TRUE
else:
p.overlap = FALSE
-
+
if p in self.favorite_programs:
p.favorite = TRUE
else:
-------------------------------------------------------------------------
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
