Update of /cvsroot/freevo/freevo/src/tv In directory sc8-pr-cvs1:/tmp/cvs-serv31018
Modified Files: Tag: new_record tv.py tvguide.py Log Message: Committing to a branch tag: new_record These changes enable the new program recording / informations popups which use record_server. Index: tv.py =================================================================== RCS file: /cvsroot/freevo/freevo/src/tv/tv.py,v retrieving revision 1.13 retrieving revision 1.13.2.1 diff -C2 -d -r1.13 -r1.13.2.1 *** tv.py 2 Jun 2003 21:29:22 -0000 1.13 --- tv.py 3 Jun 2003 02:11:48 -0000 1.13.2.1 *************** *** 10,13 **** --- 10,18 ---- # ----------------------------------------------------------------------- # $Log$ + # Revision 1.13.2.1 2003/06/03 02:11:48 rshortt + # Committing to a branch tag: new_record + # These changes enable the new program recording / informations popups which + # use record_server. + # # Revision 1.13 2003/06/02 21:29:22 outlyer # Changed the "Schedule Editor" to show up in the TV Submenu, along with "Guide" and *************** *** 77,82 **** from gui.PopupBox import PopupBox - import record_schedule - # Set to 1 for debug output DEBUG = config.DEBUG --- 82,85 ---- *************** *** 87,93 **** import plugin ! from record_schedule import ScheduleEdit ! ! m = ScheduleEdit() --- 90,94 ---- import plugin ! import program_display, program_search, view_favorites *************** *** 124,131 **** DirItem(config.DIR_RECORD, None, name = 'Recorded Shows', display_type='tv'), ! menu.MenuItem('Scheduled Recordings',action=self.view_schedule) ] menuw.pushmenu(menu.Menu('TV MAIN MENU', items, item_types = 'tv')) def get_start_time(self): ttime = time.localtime() --- 125,151 ---- DirItem(config.DIR_RECORD, None, name = 'Recorded Shows', display_type='tv'), ! menu.MenuItem('Scheduled Recordings', ! action=self.view_schedule), ! menu.MenuItem('Search Guide', action=self.show_search), ! menu.MenuItem('View Favorites', action=self.show_favorites) ] ! menuw.pushmenu(menu.Menu('TV MAIN MENU', items, item_types = 'tv')) + def show_search(self, arg, menuw): + program_search.ProgramSearch().show() + return + + + def show_favorites(self, arg, menuw): + view_favorites.ViewFavorites().show() + return + + + def view_schedule(self, arg, menuw): + program_display.ScheduledRecordings().show() + return + + def get_start_time(self): ttime = time.localtime() *************** *** 141,147 **** return time.mktime(stime) - def view_schedule(self,arg, menuw): - m.main_menu() - return def start_tvguide(self, arg, menuw): --- 161,164 ---- Index: tvguide.py =================================================================== RCS file: /cvsroot/freevo/freevo/src/tv/tvguide.py,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -C2 -d -r1.8 -r1.8.2.1 *** tvguide.py 30 May 2003 03:40:39 -0000 1.8 --- tvguide.py 3 Jun 2003 02:11:48 -0000 1.8.2.1 *************** *** 10,13 **** --- 10,18 ---- # ----------------------------------------------------------------------- # $Log$ + # Revision 1.8.2.1 2003/06/03 02:11:48 rshortt + # Committing to a branch tag: new_record + # These changes enable the new program recording / informations popups which + # use record_server. + # # Revision 1.8 2003/05/30 03:40:39 outlyer # CVS has very weird merging behaviour. Both Rob and I made the same bugfix *************** *** 65,69 **** import epg_xmltv as epg, epg_types ! import record_video skin = skin.get_singleton() # Create the Skin object --- 70,74 ---- import epg_xmltv as epg, epg_types ! import program_display skin = skin.get_singleton() # Create the Skin object *************** *** 73,76 **** --- 78,82 ---- FALSE = 0 + DEBUG = 1 CHAN_NO_DATA = 'This channel has no data loaded' *************** *** 93,101 **** def eventhandler(self, event): ! if hasattr(self, 'event_%s' % event): ! eval('self.event_%s()' % event) ! self.menuw.refresh() ! ! elif event == em.MENU_UP: self.event_UP() self.menuw.refresh() --- 99,105 ---- def eventhandler(self, event): ! if DEBUG: print 'TVGUIDE EVENT is %s' % event ! ! if event == em.MENU_UP: self.event_UP() self.menuw.refresh() *************** *** 121,127 **** self.menuw.refresh() ! elif event == em.TV_START_RECORDING: ! record_video.main_menu(self.selected) ! elif event == em.MENU_SELECT or event == em.PLAY: self.hide() --- 125,131 ---- self.menuw.refresh() ! elif event == em.MENU_SUBMENU or event == em.TV_START_RECORDING: ! program_display.ProgramDisplay(prog=self.selected).show() ! elif event == em.MENU_SELECT or event == em.PLAY: self.hide() ------------------------------------------------------- This SF.net email is sponsored by: eBay Get office equipment for less on eBay! http://adfarm.mediaplex.com/ad/ck/711-11697-6916-5 _______________________________________________ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog