X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FEpgSelection.py;h=b40f445f1022a2c821786e176db4774f63d6e3ab;hp=378e0d8976b727539cc351a9ec70b4d3cceef628;hb=65d84bb0627f0e3e21fcdae27ba98cb584d7ad37;hpb=df7d9f3578c68b22c95ab9daa23bd0fa168f6d11 diff --git a/lib/python/Screens/EpgSelection.py b/lib/python/Screens/EpgSelection.py index 378e0d8..b40f445 100644 --- a/lib/python/Screens/EpgSelection.py +++ b/lib/python/Screens/EpgSelection.py @@ -1,32 +1,49 @@ from Screen import Screen +from Components.config import config, ConfigClock from Components.Button import Button from Components.Pixmap import Pixmap from Components.Label import Label -from Components.EpgList import * +from Components.EpgList import EPGList, EPG_TYPE_SINGLE, EPG_TYPE_SIMILAR, EPG_TYPE_MULTI from Components.ActionMap import ActionMap -from Components.ScrollLabel import ScrollLabel +from Components.TimerSanityCheck import TimerSanityCheck +from Screens.TimerEdit import TimerSanityConflict from Screens.EventView import EventViewSimple -from enigma import eServiceReference, eServiceEventPtr -from Screens.FixedMenu import FixedMenu -from RecordTimer import RecordTimerEntry, parseEvent -from TimerEdit import TimerEditList +from Screens.MessageBox import MessageBox +from TimeDateInput import TimeDateInput +from enigma import eServiceReference +from RecordTimer import RecordTimerEntry, parseEvent, AFTEREVENT from TimerEntry import TimerEntry from ServiceReference import ServiceReference -from Components.config import config, currentConfigSelectionElement -from time import localtime +from time import localtime, time -import xml.dom.minidom +mepg_config_initialized = False class EPGSelection(Screen): - def __init__(self, session, service, zapFunc=None): + ADD_TIMER = 0 + REMOVE_TIMER = 1 + + def __init__(self, session, service, zapFunc=None, eventid=None, bouquetChangeCB=None): Screen.__init__(self, session) + self.bouquetChangeCB = bouquetChangeCB + self.ask_time = -1 #now self["key_red"] = Button("") self.closeRecursive = False - if isinstance(service, eServiceReference): + if isinstance(service, str) and eventid != None: + self.type = EPG_TYPE_SIMILAR + self["key_yellow"] = Button() + self["key_blue"] = Button() + self["key_red"] = Button() + self.currentService=service + self.eventid = eventid + self.zapFunc = None + elif isinstance(service, eServiceReference) or isinstance(service, str): self.type = EPG_TYPE_SINGLE self["key_yellow"] = Button() self["key_blue"] = Button() self.currentService=ServiceReference(service) + self.zapFunc = None + self.sort_type = 0 + self.setSortDescription() else: self.skinName = "EPGSelectionMulti" self.type = EPG_TYPE_MULTI @@ -46,13 +63,10 @@ class EPGSelection(Screen): self.zapFunc = zapFunc self["key_green"] = Button(_("Add timer")) - self["list"] = EPGList(self.type, self.onSelectionChanged) + self.key_green_choice = self.ADD_TIMER + self["list"] = EPGList(type = self.type, selChangedCB = self.onSelectionChanged, timer = self.session.nav.RecordTimer) - class ChannelActionMap(ActionMap): - def action(self, contexts, action): - ActionMap.action(self, contexts, action) - - self["actions"] = ChannelActionMap(["EPGSelectActions", "OkCancelActions"], + self["actions"] = ActionMap(["EPGSelectActions", "OkCancelActions"], { "cancel": self.closeScreen, "ok": self.eventSelected, @@ -60,36 +74,67 @@ class EPGSelection(Screen): "yellow": self.yellowButtonPressed, "blue": self.blueButtonPressed, "info": self.infoKeyPressed, - "zapTo": self.zapTo + "red": self.zapTo, + "input_date_time": self.enterDateTime, + "nextBouquet": self.nextBouquet, + "prevBouquet": self.prevBouquet }) self["actions"].csel = self self.onLayoutFinish.append(self.onCreate) + def nextBouquet(self): + if self.bouquetChangeCB: + self.bouquetChangeCB(1, self) + + def prevBouquet(self): + if self.bouquetChangeCB: + self.bouquetChangeCB(-1, self) + + def enterDateTime(self): + if self.type == EPG_TYPE_MULTI: + global mepg_config_initialized + if not mepg_config_initialized: + config.misc.prev_mepg_time=ConfigClock(default = time()) + mepg_config_initialized = True + self.session.openWithCallback(self.onDateTimeInputClosed, TimeDateInput, config.misc.prev_mepg_time ) + + def onDateTimeInputClosed(self, ret): + if len(ret) > 1: + if ret[0]: + self.ask_time=ret[1] + self["list"].fillMultiEPG(self.services, ret[1]) + def closeScreen(self): - self.close(self.closeRecursive or self.type == EPG_TYPE_SINGLE) + self.close(self.closeRecursive) def infoKeyPressed(self): - if self.type == EPG_TYPE_MULTI: - cur = self["list"].getCurrent() - event = cur[0] - service = cur[1] - else: - event = self["list"].getCurrent() - service = self.currentService + cur = self["list"].getCurrent() + event = cur[0] + service = cur[1] if event is not None: - self.session.open(EventViewSimple, event, service, self.eventViewCallback) + if self.type != EPG_TYPE_SIMILAR: + self.session.open(EventViewSimple, event, service, self.eventViewCallback, self.openSimilarList) + else: + self.session.open(EventViewSimple, event, service, self.eventViewCallback) + + def openSimilarList(self, eventid, refstr): + self.session.open(EPGSelection, refstr, None, eventid) + + def setServices(self, services): + self.services = services + self.onCreate() #just used in multipeg def onCreate(self): l = self["list"] + l.recalcEntrySize() if self.type == EPG_TYPE_MULTI: - l.recalcEntrySize() - l.fillMultiEPG(self.services) - else: - if SINGLE_CPP == 0: - l.recalcEntrySize() + l.fillMultiEPG(self.services, self.ask_time) + elif self.type == EPG_TYPE_SINGLE: l.fillSingleEPG(self.currentService) + else: + l.fillSimilarList(self.currentService, self.eventid) def eventViewCallback(self, setEvent, setService, val): l = self["list"] @@ -99,86 +144,141 @@ class EPGSelection(Screen): elif val == +1: self.moveDown() cur = l.getCurrent() - if self.type == EPG_TYPE_SINGLE: - setEvent(cur) + if self.type == EPG_TYPE_MULTI and cur[0] is None and cur[1].ref != old[1].ref: + self.eventViewCallback(setEvent, setService, val) else: - if self.type == EPG_TYPE_MULTI and cur[0] is None and cur[1].ref != old[1].ref: - self.eventViewCallback(setEvent, setService, val) - else: - setEvent(cur[0]) - setService(cur[1]) + setService(cur[1]) + setEvent(cur[0]) def zapTo(self): # just used in multiepg - if self.zapFunc != None: - self.closeRecursive = True - ref = self["list"].getCurrent()[1] - self.zapFunc(ref.ref) + if self.zapFunc and self["key_red"].getText() == "Zap": + lst = self["list"] + count = lst.getCurrentChangeCount() + if count == 0: + self.closeRecursive = True + ref = lst.getCurrent()[1] + self.zapFunc(ref.ref) def eventSelected(self): - if self.type == EPG_TYPE_SINGLE: - self.infoKeyPressed() - else: # EPG_TYPE_MULTI - self.zapTo() + self.infoKeyPressed() def yellowButtonPressed(self): if self.type == EPG_TYPE_MULTI: self["list"].updateMultiEPG(-1) + elif self.type == EPG_TYPE_SINGLE: + if self.sort_type == 0: + self.sort_type = 1 + else: + self.sort_type = 0 + self["list"].sortSingleEPG(self.sort_type) + self.setSortDescription() + + def setSortDescription(self): + if self.sort_type == 1: + # TRANSLATORS: This must fit into the header button in the EPG-List + self["key_yellow"].setText(_("Sort Time")) + else: + # TRANSLATORS: This must fit into the header button in the EPG-List + self["key_yellow"].setText(_("Sort A-Z")) def blueButtonPressed(self): if self.type == EPG_TYPE_MULTI: self["list"].updateMultiEPG(1) + def removeTimer(self, timer): + timer.afterEvent = AFTEREVENT.NONE + self.session.nav.RecordTimer.removeEntry(timer) + self["key_green"].setText(_("Add timer")) + self.key_green_choice = self.ADD_TIMER + def timerAdd(self): - if self.type == EPG_TYPE_SINGLE: - event = self["list"].getCurrent() - serviceref = self.currentService - else: - cur = self["list"].getCurrent() - event = cur[0] - serviceref = cur[1] + cur = self["list"].getCurrent() + event = cur[0] + serviceref = cur[1] if event is None: return - newEntry = RecordTimerEntry(serviceref, *parseEvent(event)) - self.session.openWithCallback(self.timerEditFinished, TimerEntry, newEntry) + eventid = event.getEventId() + refstr = serviceref.ref.toString() + for timer in self.session.nav.RecordTimer.timer_list: + if timer.eit == eventid and timer.service_ref.ref.toString() == refstr: + cb_func = lambda ret : not ret or self.removeTimer(timer) + self.session.openWithCallback(cb_func, MessageBox, _("Do you really want to delete %s?") % event.getEventName()) + break + else: + newEntry = RecordTimerEntry(serviceref, checkOldTimers = True, *parseEvent(event)) + self.session.openWithCallback(self.finishedAdd, TimerEntry, newEntry) - def timerEditFinished(self, answer): + def finishedAdd(self, answer): + print "finished add" if answer[0]: - self.session.nav.RecordTimer.record(answer[1]) + entry = answer[1] + simulTimerList = self.session.nav.RecordTimer.record(entry) + if simulTimerList is not None: + if (len(simulTimerList) == 2) and (simulTimerList[1].dontSave) and (simulTimerList[1].autoincrease): + simulTimerList[1].end = entry.begin - 30 + self.session.nav.RecordTimer.timeChanged(simulTimerList[1]) + self.session.nav.RecordTimer.record(entry) + else: + self.session.openWithCallback(self.finishSanityCorrection, TimerSanityConflict, simulTimerList) + self["key_green"].setText(_("Remove timer")) + self.key_green_choice = self.REMOVE_TIMER else: - print "Timeredit aborted" + self["key_green"].setText(_("Add timer")) + self.key_green_choice = self.ADD_TIMER + print "Timeredit aborted" + + def finishSanityCorrection(self, answer): + self.finishedAdd(answer) def moveUp(self): self["list"].moveUp() def moveDown(self): self["list"].moveDown() - + def applyButtonState(self, state): - if state == 1: - self["now_button_sel"].show() + if state == 0: self["now_button"].hide() - else: - self["now_button"].show() self["now_button_sel"].hide() - - if state == 2: - self["next_button_sel"].show() self["next_button"].hide() - else: - self["next_button"].show() self["next_button_sel"].hide() - - if state == 3: - self["more_button_sel"].show() self["more_button"].hide() - else: - self["more_button"].show() self["more_button_sel"].hide() + self["now_text"].hide() + self["next_text"].hide() + self["more_text"].hide() + self["key_red"].setText("") + else: + if state == 1: + self["key_red"].setText("Zap") + self["now_button_sel"].show() + self["now_button"].hide() + else: + self["now_button"].show() + self["now_button_sel"].hide() + self["key_red"].setText("") + + if state == 2: + self["next_button_sel"].show() + self["next_button"].hide() + else: + self["next_button"].show() + self["next_button_sel"].hide() + + if state == 3: + self["more_button_sel"].show() + self["more_button"].hide() + else: + self["more_button"].show() + self["more_button_sel"].hide() def onSelectionChanged(self): + cur = self["list"].getCurrent() if self.type == EPG_TYPE_MULTI: count = self["list"].getCurrentChangeCount() - if count > 1: + if self.ask_time != -1: + self.applyButtonState(0) + elif count > 1: self.applyButtonState(3) elif count > 0: self.applyButtonState(2) @@ -186,7 +286,7 @@ class EPGSelection(Screen): self.applyButtonState(1) days = [ _("Mon"), _("Tue"), _("Wed"), _("Thu"), _("Fri"), _("Sat"), _("Sun") ] datastr = "" - event = self["list"].getCurrent()[0] + event = cur[0] if event is not None: now = time() beg = event.getBeginTime() @@ -197,3 +297,23 @@ class EPGSelection(Screen): else: datestr = '%s %d.%d.'%(_("Today"), begTime[2], begTime[1]) self["date"].setText(datestr) + else: + event = cur[0] + + if event is None: + return + + serviceref = cur[1] + eventid = event.getEventId() + refstr = serviceref.ref.toString() + + for timer in self.session.nav.RecordTimer.timer_list: + if self.key_green_choice != self.REMOVE_TIMER: + if timer.eit == eventid and timer.service_ref.ref.toString() == refstr: + self["key_green"].setText(_("Remove timer")) + self.key_green_choice = self.REMOVE_TIMER + break + else: + if self.key_green_choice != self.ADD_TIMER: + self["key_green"].setText(_("Add timer")) + self.key_green_choice = self.ADD_TIMER