From 7466abeda3437afb71ce9ab8c0917cd8ea14482c Mon Sep 17 00:00:00 2001 From: Andreas Monzner Date: Wed, 26 Apr 2006 15:06:18 +0000 Subject: [PATCH] add ability to list all events for a specific start time/date (press Dream/Menu) --- data/keymap.xml | 1 + data/skin_default.xml | 8 +++ lib/python/Components/EpgList.py | 4 +- lib/python/Screens/EpgSelection.py | 57 +++++++++++++----- lib/python/Screens/Makefile.am | 2 +- lib/python/Screens/TimeDateInput.py | 92 +++++++++++++++++++++++++++++ 6 files changed, 145 insertions(+), 19 deletions(-) create mode 100644 lib/python/Screens/TimeDateInput.py diff --git a/data/keymap.xml b/data/keymap.xml index b91360ff..578c9322 100644 --- a/data/keymap.xml +++ b/data/keymap.xml @@ -260,6 +260,7 @@ + diff --git a/data/skin_default.xml b/data/skin_default.xml index 8db2709f..3c8fc492 100644 --- a/data/skin_default.xml +++ b/data/skin_default.xml @@ -341,6 +341,14 @@ newwidth = wsize[0] + + + + + + + + diff --git a/lib/python/Components/EpgList.py b/lib/python/Components/EpgList.py index 861063a3..82367ecc 100644 --- a/lib/python/Components/EpgList.py +++ b/lib/python/Components/EpgList.py @@ -234,11 +234,11 @@ class EPGList(HTMLComponent, GUIComponent): return self.epgcache.lookupEvent(list) return [ ] - def fillMultiEPG(self, services): + def fillMultiEPG(self, services, stime=-1): t = time() test = [ '0RIBDTCN' ] for service in services: - tuple = ( service.ref.toString(), 0 ) + tuple = (service.ref.toString(), 0, stime) test.append( tuple ) self.list = self.queryEPG(test) self.l.setList(self.list) diff --git a/lib/python/Screens/EpgSelection.py b/lib/python/Screens/EpgSelection.py index 5613c8b1..3284e641 100644 --- a/lib/python/Screens/EpgSelection.py +++ b/lib/python/Screens/EpgSelection.py @@ -6,6 +6,7 @@ from Components.EpgList import * from Components.ActionMap import ActionMap from Components.ScrollLabel import ScrollLabel from Screens.EventView import EventViewSimple +from TimeDateInput import TimeDateInput from enigma import eServiceReference, eServiceEventPtr from Screens.FixedMenu import FixedMenu from RecordTimer import RecordTimerEntry, parseEvent @@ -20,6 +21,7 @@ import xml.dom.minidom class EPGSelection(Screen): def __init__(self, session, service, zapFunc=None, eventid=None): Screen.__init__(self, session) + self.asked_specific_time = False self["key_red"] = Button("") self.closeRecursive = False if isinstance(service, str) and eventid != None: @@ -67,12 +69,22 @@ class EPGSelection(Screen): "yellow": self.yellowButtonPressed, "blue": self.blueButtonPressed, "info": self.infoKeyPressed, - "zapTo": self.zapTo + "zapTo": self.zapTo, + "input_date_time": self.enterDateTime }) self["actions"].csel = self self.onLayoutFinish.append(self.onCreate) + def enterDateTime(self): + self.session.openWithCallback(self.onDateTimeInputClosed, TimeDateInput) + + def onDateTimeInputClosed(self, ret): + if len(ret) > 1: + if ret[0]: + self.asked_specific_time=True + self["list"].fillMultiEPG(self.services, ret[1]) + def closeScreen(self): self.close(self.closeRecursive) @@ -170,31 +182,44 @@ class EPGSelection(Screen): 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() + else: + if state == 1: + self["now_button_sel"].show() + 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() def onSelectionChanged(self): if self.type == EPG_TYPE_MULTI: count = self["list"].getCurrentChangeCount() - if count > 1: + if self.asked_specific_time: + self.applyButtonState(0) + elif count > 1: self.applyButtonState(3) elif count > 0: self.applyButtonState(2) diff --git a/lib/python/Screens/Makefile.am b/lib/python/Screens/Makefile.am index 8ed08184..cddf4551 100644 --- a/lib/python/Screens/Makefile.am +++ b/lib/python/Screens/Makefile.am @@ -10,4 +10,4 @@ install_PYTHON = \ Dish.py SubserviceSelection.py LanguageSelection.py StartWizard.py \ TutorialWizard.py PluginBrowser.py MinuteInput.py Scart.py PVRState.py \ Console.py InputBox.py ChoiceBox.py SimpleSummary.py ImageWizard.py \ - MediaPlayer.py TimerSelection.py PictureInPicture.py + MediaPlayer.py TimerSelection.py PictureInPicture.py TimeDateInput.py diff --git a/lib/python/Screens/TimeDateInput.py b/lib/python/Screens/TimeDateInput.py new file mode 100644 index 00000000..4ea67b74 --- /dev/null +++ b/lib/python/Screens/TimeDateInput.py @@ -0,0 +1,92 @@ +from Screen import Screen +from Components.config import * +from Components.ActionMap import ActionMap, NumberActionMap +from Components.ConfigList import ConfigList +from Components.Button import Button +from Components.Label import Label +from Components.Pixmap import Pixmap +import time +import datetime + +class TimeDateInput(Screen): + def __init__(self, session): + Screen.__init__(self, session) + + self["oktext"] = Label(_("OK")) + self["canceltext"] = Label(_("Cancel")) + self["ok"] = Pixmap() + self["cancel"] = Pixmap() + + self.createConfig() + + self["actions"] = NumberActionMap(["SetupActions", "TextEntryActions"], + { + "ok": self.keySelect, + "save": self.keyGo, + "cancel": self.keyCancel, + "left": self.keyLeft, + "right": self.keyRight, + "delete": self.keyDelete, + "1": self.keyNumberGlobal, + "2": self.keyNumberGlobal, + "3": self.keyNumberGlobal, + "4": self.keyNumberGlobal, + "5": self.keyNumberGlobal, + "6": self.keyNumberGlobal, + "7": self.keyNumberGlobal, + "8": self.keyNumberGlobal, + "9": self.keyNumberGlobal, + "0": self.keyNumberGlobal + }, -1) + + self.list = [] + self["config"] = ConfigList(self.list) + self.createSetup(self["config"]) + + def createConfig(self): + config.timeinput = ConfigSubsection() + nowtime = time.time() + config.timeinput.date = configElement_nonSave("config.timeinput.date", configDateTime, nowtime, (_("%d.%B %Y"), 86400)) + config.timeinput.time = configElement_nonSave("config.timeinput.time", configSequence, [int(time.strftime("%H", time.localtime(nowtime))), int(time.strftime("%M", time.localtime(nowtime)))], configsequencearg.get("CLOCK")) + + def createSetup(self, configlist): + self.list = [] + self.list.append(getConfigListEntry(_("Date"), config.timeinput.date)) + self.list.append(getConfigListEntry(_("Time"), config.timeinput.time)) + configlist.list = self.list + configlist.l.setList(self.list) + + def keyLeft(self): + self["config"].handleKey(config.key["prevElement"]) + + def keyDelete(self): + self["config"].handleKey(config.key["delete"]) + + def keyRightCallback(self, configPath): + currentConfigPath = self["config"].getCurrent()[1].parent.getConfigPath() + # check if we are still on the same config entry + if (currentConfigPath == configPath): + self.keyRight() + + def keyRight(self): + self["config"].handleKey(config.key["nextElement"]) + + def keySelect(self): + self.keyGo() + + def keyNumberGlobal(self, number): + print "You pressed number " + str(number) + if (self["config"].getCurrent()[1].parent.enabled == True): + self["config"].handleKey(config.key[str(number)]) + + def getTimestamp(self, date, mytime): + d = time.localtime(date) + dt = datetime.datetime(d.tm_year, d.tm_mon, d.tm_mday, mytime[0], mytime[1]) + return int(mktime(dt.timetuple())) + + def keyGo(self): + time = self.getTimestamp(config.timeinput.date.value, config.timeinput.time.value) + self.close((True, time)) + + def keyCancel(self): + self.close((False,)) -- 2.30.2