Update of /cvsroot/freevo/freevo/src/tv
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30143
Modified Files:
tvguide.py
Log Message:
Patch from James A. Laska to make the TV Guide behave intuitively when
clicking on a future program. As you would expect, it now pops up the record
dialog.
Index: tvguide.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/tv/tvguide.py,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** tvguide.py 6 Feb 2004 20:55:28 -0000 1.23
--- tvguide.py 16 Feb 2004 18:10:54 -0000 1.24
***************
*** 10,13 ****
--- 10,18 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.24 2004/02/16 18:10:54 outlyer
+ # Patch from James A. Laska to make the TV Guide behave intuitively when
+ # clicking on a future program. As you would expect, it now pops up the record
+ # dialog.
+ #
# Revision 1.23 2004/02/06 20:55:28 dischi
# move debug to 2
***************
*** 210,223 ****
elif event == em.TV_START_RECORDING:
! if self.selected.scheduled:
! program_display.ProgramDisplay(parent=self, context='recording',
! prog=self.selected).show()
! else:
! program_display.ProgramDisplay(parent=self,
prog=self.selected).show()
elif event == em.MENU_SELECT or event == em.PLAY:
tvlockfile = config.FREEVO_CACHEDIR + '/record'
! if os.path.exists(tvlockfile):
# XXX: In the future add the options to watch what we are
# recording or cencel it and watch TV.
--- 215,232 ----
elif event == em.TV_START_RECORDING:
! self.event_RECORD()
! self.menuw.refresh()
elif event == em.MENU_SELECT or event == em.PLAY:
tvlockfile = config.FREEVO_CACHEDIR + '/record'
! # jlaska -- START
! # Check if the selected program is >7 min in the future
! # if so, bring up the record dialog
! now = time.time() + (7*60)
! if self.selected.start > now:
! self.event_RECORD()
! # jlaska -- END
! elif os.path.exists(tvlockfile):
# XXX: In the future add the options to watch what we are
# recording or cencel it and watch TV.
***************
*** 226,232 ****
tvlockfile + '.', height=200).show()
return TRUE
!
! self.hide()
! self.player('tv', self.selected.channel_id)
elif event == em.PLAY_END:
--- 235,241 ----
tvlockfile + '.', height=200).show()
return TRUE
! else:
! self.hide()
! self.player('tv', self.selected.channel_id)
elif event == em.PLAY_END:
***************
*** 343,346 ****
--- 352,361 ----
pass
+ def event_RECORD(self):
+ if self.selected.scheduled:
+ program_display.ProgramDisplay(parent=self, context='recording',
+ prog=self.selected).show()
+ else:
+ program_display.ProgramDisplay(parent=self, prog=self.selected).show()
def event_RIGHT(self):
start_time = self.start_time
-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
