show epglist for current selected service in channellist with info too

diff --git a/data/keymap.xml b/data/keymap.xml
index 71f4ef9..189f399 100644 (file)
--- a/data/keymap.xml
+++ b/data/keymap.xml
@@ -95,10 +95,11 @@
                <key id="KEY_M" mapto="mark" flags="m" />
                <key id="KEY_D" mapto="bouquet:(provider == ARD)" flags="m" />
                <key id="KEY_A" mapto="bouquet:" flags="m" />
-               <key id="KEY_RED" mapto="bouquet:" flags="m" />
+               <key id="KEY_RED" mapto="bouquet:(type == 1)" flags="m" />
                <key id="KEY_GREEN" mapto="bouquet:(provider == ARD) &amp;&amp; (type == 1)" flags="m" />
                <key id="KEY_YELLOW" mapto="bouquet:(provider == ZDF) &amp;&amp; (type == 1)" flags="m" />
                <key id="KEY_BLUE" mapto="bouquet:(type == 1) FROM BOUQUET &quot;bouquets.tv&quot; ORDER BY bouquet" flags="m" />
+               <key id="KEY_INFO" mapto="showEPGList" flags="m" />
        </map>
        <map context="OkCancelActions">
                <key id="\x0a" mapto="ok" flags="m" />

diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py
index c8bfb2c..6abb52d 100644 (file)
--- a/lib/python/Screens/ChannelSelection.py
+++ b/lib/python/Screens/ChannelSelection.py
@@ -2,7 +2,7 @@ from Screen import Screen
 from Components.Button import Button
 from Components.ServiceList import ServiceList
 from Components.ActionMap import ActionMap
-
+from EpgSelection import EPGSelection
 from enigma import eServiceReference
 
 from Screens.FixedMenu import FixedMenu
@@ -81,12 +81,15 @@ class ChannelSelection(Screen):
                                "ok": self.channelSelected,
                                "mark": self.doMark,
                                "contextMenu": self.doContext,
-                               "showFavourites": self.showFavourites
+                               "showFavourites": self.showFavourites,
+                               "showEPGList": self.showEPGList
                        })
                self["actions"].csel = self
 
+       def showEPGList(self):
+               self.session.open(EPGSelection, self["list"].getCurrent())
+
        #  marked edit mode
-       
        def startMarkedEdit(self):
                self.bouquet_mark_edit = True
                self.clearMarks()
@@ -155,9 +158,6 @@ class ChannelSelection(Screen):
                else:
                        self.movemode = True
 
-       def getCurrent(self):
-               return self["list"].getCurrent()
-
        def showFavourites(self):
                l = self["list" ]
                l.setRoot(eServiceReference('1:0:1:0:0:0:0:0:0:0:(provider == "fav")'))

diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py
index 319ecbe..065097f 100644 (file)
--- a/lib/python/Screens/InfoBar.py
+++ b/lib/python/Screens/InfoBar.py
@@ -215,8 +215,6 @@ class InfoBar(Screen):
                        self.muteDialog.instance.hide()
 
        def showEPGList(self):
-# TODO hier irgendwie EPGSelection benutzen und setRoot benutzen um nen service zu uebergeben
-# self.session.nav.getCurrentlyPlayingServiceReference() sollte das wohl sein
                self.session.open(EPGSelection, self.session.nav.getCurrentlyPlayingServiceReference())
 
        def quit(self):