aboutsummaryrefslogtreecommitdiff
path: root/lib/python
diff options
context:
space:
mode:
Diffstat (limited to 'lib/python')
-rw-r--r--lib/python/Screens/ChannelSelection.py12
-rw-r--r--lib/python/Screens/InfoBar.py2
2 files changed, 6 insertions, 8 deletions
diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py
index c8bfb2cb..6abb52d9 100644
--- 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 319ecbe4..065097f8 100644
--- 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):