X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/5f45eb94454f5787d87725c9d2a73cecc84eda11..3c0244c041cbfda462b2c84132410d5ffa3232da:/lib/python/Screens/InfoBarGenerics.py diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py index 58c12696..9a884449 100644 --- a/lib/python/Screens/InfoBarGenerics.py +++ b/lib/python/Screens/InfoBarGenerics.py @@ -342,6 +342,8 @@ class InfoBarSimpleEventView: class InfoBarEPG: """ EPG - Opens an EPG list when the showEPGList action fires """ def __init__(self): + self.dlg_stack = [ ] + self.bouquetSel = None self["EPGActions"] = HelpableActionMap(self, "InfobarEPGActions", { "showEventInfo": (self.openEventView, _("show EPG...")), @@ -357,8 +359,7 @@ class InfoBarEPG: self.servicelist.setCurrentSelection(service) #select the service in servicelist self.servicelist.zap() - def openBouquetEPG(self, bouquet, withCallback=True): - ptr=eEPGCache.getInstance() + def getBouquetServices(self, bouquet): services = [ ] servicelist = eServiceCenter.getInstance().list(bouquet) if not servicelist is None: @@ -369,16 +370,37 @@ class InfoBarEPG: if service.flags: #ignore non playable services continue services.append(ServiceReference(service)) + return services + + def openBouquetEPG(self, bouquet, withCallback=True): + services = self.getBouquetServices(bouquet) if len(services): self.epg_bouquet = bouquet if withCallback: - self.session.openWithCallback(self.closed, EPGSelection, services, self.zapToService) + self.dlg_stack.append(self.session.openWithCallback(self.closed, EPGSelection, services, self.zapToService, None, self.changeBouquetCB)) else: - self.session.open(EPGSelection, services, self.zapToService) + self.session.open(EPGSelection, services, self.zapToService, None, self.changeBouquetCB) - def closed(self, ret): + def changeBouquetCB(self, direction, epg): + if self.bouquetSel: + if direction > 0: + self.bouquetSel.down() + else: + self.bouquetSel.up() + bouquet = self.bouquetSel.getCurrent() + services = self.getBouquetServices(bouquet) + if len(services): + self.epg_bouquet = bouquet + epg.setServices(services) + + def closed(self, ret=False): + closedScreen = self.dlg_stack.pop() + if self.bouquetSel and closedScreen == self.bouquetSel: + self.bouquetSel = None if ret: - self.close(ret) + dlgs=len(self.dlg_stack) + assert dlgs>0 + self.dlg_stack[dlgs-1].close(dlgs > 1) def openMultiServiceEPG(self, withCallback=True): bouquets = self.servicelist.getBouquetList() @@ -388,16 +410,19 @@ class InfoBarEPG: cnt = len(bouquets) if cnt > 1: # show bouquet list if withCallback: - self.session.openWithCallback(self.closed, BouquetSelector, bouquets, self.openBouquetEPG) + self.bouquetSel = self.session.openWithCallback(self.closed, BouquetSelector, bouquets, self.openBouquetEPG, enableWrapAround=True) + self.dlg_stack.append(self.bouquetSel) else: - self.session.open(BouquetSelector, bouquets, self.openBouquetEPG) + self.bouquetSel = self.session.open(BouquetSelector, bouquets, self.openBouquetEPG, enableWrapAround=True) elif cnt == 1: self.openBouquetEPG(bouquets[0][1], withCallback) def openSingleServiceEPG(self): ref=self.session.nav.getCurrentlyPlayingServiceReference() - ptr=eEPGCache.getInstance() - self.session.openWithCallback(self.closed, EPGSelection, ref) + self.session.open(EPGSelection, ref) + + def openSimilarList(self, eventid, refstr): + self.session.open(EPGSelection, refstr, None, eventid) def openEventView(self): self.epglist = [ ] @@ -419,7 +444,7 @@ class InfoBarEPG: if ptr: self.epglist.append(ptr) if len(self.epglist) > 0: - self.session.open(EventViewEPGSelect, self.epglist[0], ServiceReference(ref), self.eventViewCallback, self.openSingleServiceEPG, self.openMultiServiceEPG) + self.dlg_stack.append(self.session.openWithCallback(self.closed, EventViewEPGSelect, self.epglist[0], ServiceReference(ref), self.eventViewCallback, self.openSingleServiceEPG, self.openMultiServiceEPG, self.openSimilarList)) else: print "no epg for the service avail.. so we show multiepg instead of eventinfo" self.openMultiServiceEPG(False) @@ -561,7 +586,7 @@ class InfoBarSeek: def getSeek(self): service = self.session.nav.getCurrentService() if service is None: - return False + return None seek = service.seek() @@ -857,7 +882,7 @@ class InfoBarTimeshift: def getTimeshift(self): service = self.session.nav.getCurrentService() - return service.timeshift() + return service and service.timeshift() def startTimeshift(self): print "enable timeshift" @@ -976,24 +1001,26 @@ class InfoBarExtensions: self.session.openWithCallback(self.extensionCallback, ChoiceBox, title=_("Please choose an extension..."), list = list) def extensionCallback(self, answer): - if answer[1] == "pipon": - self.session.nav.stopService() - self.pip = self.session.instantiateDialog(PictureInPicture) - #self.pip.show() - - newservice = self.session.nav.getCurrentlyPlayingServiceReference() - self.pipservice = eServiceCenter.getInstance().play(newservice) - if self.pipservice and not self.pipservice.setTarget(1): - self.pipservice.start() - self.pipshown = True - else: + if answer is not None: + if answer[1] == "pipon": + self.session.nav.stopService() + self.pip = self.session.instantiateDialog(PictureInPicture) + #self.pip.show() + + newservice = self.session.nav.getCurrentlyPlayingServiceReference() + self.pipservice = eServiceCenter.getInstance().play(newservice) + if self.pipservice and not self.pipservice.setTarget(1): + self.pipservice.start() + self.pipshown = True + else: + self.pipservice = None + del self.pip + + elif answer[1] == "pipoff": + #self.pip.hide() self.pipservice = None del self.pip - - elif answer[1] == "pipoff": - #self.pip.hide() - del self.pip - self.pipshown = False + self.pipshown = False from RecordTimer import parseEvent @@ -1065,11 +1092,16 @@ class InfoBarInstantRecord: return False def recordQuestionCallback(self, answer): + print "pre:\n", self.recording + if answer is None or answer[1] == "no": return list = [] - for x in self.recording: - if x.dontSave: + recording = self.recording[:] + for x in recording: + if not x in self.session.nav.RecordTimer.timer_list: + self.recording.remove(x) + elif x.dontSave and x.isRunning(): list.append(TimerEntryComponent(x, False)) if answer[1] == "changeduration": @@ -1090,6 +1122,8 @@ class InfoBarInstantRecord: self.selectedEntry = len(self.recording) self.session.openWithCallback(self.inputCallback, InputBox, title=_("How many minutes do you want to record?"), text="5", maxSize=False, type=Input.NUMBER) self.startInstantRecording(limitEvent = limitEvent) + + print "after:\n", self.recording def changeDuration(self, entry): if entry is not None: