diff options
| author | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2006-04-27 09:39:49 +0000 |
|---|---|---|
| committer | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2006-04-27 09:39:49 +0000 |
| commit | db7890aecc35a0eaa70ffb47fa46ecaaa70df379 (patch) | |
| tree | 7320589870736dbd1d2ad2dd58de63da08fa1b50 | |
| parent | c803490aec2d7c7f13966e1a2e926cac018dea2e (diff) | |
| download | enigma2-db7890aecc35a0eaa70ffb47fa46ecaaa70df379.tar.gz enigma2-db7890aecc35a0eaa70ffb47fa46ecaaa70df379.zip | |
ok in multiepg is now similar to press info
change service is now possible via red button when the selected event is the now event
| -rw-r--r-- | data/keymap.xml | 1 | ||||
| -rw-r--r-- | lib/python/Screens/EpgSelection.py | 21 |
2 files changed, 13 insertions, 9 deletions
diff --git a/data/keymap.xml b/data/keymap.xml index 783dbf13..c313be39 100644 --- a/data/keymap.xml +++ b/data/keymap.xml @@ -259,6 +259,7 @@ <key id="KEY_GREEN" mapto="timerAdd" flags="m" /> <key id="KEY_YELLOW" mapto="yellow" flags="mr" /> <key id="KEY_BLUE" mapto="blue" flags="mr" /> + <key id="KEY_RED" mapto="red" flags="m" /> <key id="KEY_INFO" mapto="info" flags="m" /> <key id="KEY_MENU" mapto="input_date_time" flags="m" /> <key id="KEY_CHANNELUP" mapto="nextBouquet" flags="m" /> diff --git a/lib/python/Screens/EpgSelection.py b/lib/python/Screens/EpgSelection.py index 1af2cbb9..331fe75e 100644 --- a/lib/python/Screens/EpgSelection.py +++ b/lib/python/Screens/EpgSelection.py @@ -70,7 +70,7 @@ 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 @@ -153,16 +153,16 @@ class EPGSelection(Screen): 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_MULTI: - self.zapTo() - else: - self.infoKeyPressed() + self.infoKeyPressed() def yellowButtonPressed(self): if self.type == EPG_TYPE_MULTI: @@ -208,13 +208,16 @@ class EPGSelection(Screen): 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() |