fix fix

[enigma2.git] / lib / python / Screens / ChannelSelection.py

diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py
index 890fd3e0da58afe8d8636884771cd683184a4dc6..85801861fe369c7e8e4205d36e35334294245ffe 100644 (file)
--- a/lib/python/Screens/ChannelSelection.py
+++ b/lib/python/Screens/ChannelSelection.py
@@ -158,7 +158,7 @@ class ChannelSelection(Screen):
 
                self["actions"] = ChannelActionMap(["ChannelSelectActions", "OkCancelActions", "ContextMenuActions"],
                        {
-                               "cancel": self.close,
+                               "cancel": self.cancel,
                                "ok": self.channelSelected,
                                "mark": self.doMark,
                                "contextMenu": self.doContext,
@@ -374,10 +374,27 @@ class ChannelSelection(Screen):
                        refstr = ""
                config.tv.lastservice.value = refstr
                config.tv.lastservice.save()
+               
+       def cancel(self):
+               self.close()
 
 class SimpleChannelSelection(ChannelSelection):
-       def __init__(self, session, args):
+       def __init__(self, session, title):
                ChannelSelection.__init__(self, session)
-               self.args = args
+               self.title = title
+               self.onShown.append(self.onExecCallback)
+
+       def onExecCallback(self):
+               print "onExecCallback"
+               self.session.currentDialog.instance.setTitle(self.title)
+               
+       def channelSelected(self): # just return selected service
+               ref = self.servicelist.getCurrent()
+               self.close(ref)
                
+       def doContext(self): # don't show context menu
+               pass
+       
+       def cancel(self):
+               self.close(None)
                
\ No newline at end of file