remove info info

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

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 0b2f6d0c5c57e247a96c4424fa7080aa5f034f00..aac470bf0a1fd811b81af20fc85400f47a439545 100644 (file)
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -358,7 +358,7 @@ class InfoBarEPG:
        def __init__(self):
                self["EPGActions"] = HelpableActionMap(self, "InfobarEPGActions", 
                        {
        def __init__(self):
                self["EPGActions"] = HelpableActionMap(self, "InfobarEPGActions", 
                        {

-                               "showEPGList": (self.openSingleServiceEPG, _("show EPG...")),
+                               "showEPGList": (self.showEPGList, _("show EPG...")),

                        })
 
        def showEPGList(self):
                        })
 
        def showEPGList(self):


@@ -382,6 +382,22 @@ class InfoBarEPG:
                if info:
                        self.showEPGList()
                        
                if info:
                        self.showEPGList()
                        

+       def openEventView(self):
+               try:
+                       self.epglist = [ ]
+                       service = self.session.nav.getCurrentService()
+                       info = service.info()
+                       ptr=info.getEvent(0)
+                       if ptr:
+                               self.epglist.append(ptr)
+                       ptr=info.getEvent(1)
+                       if ptr:
+                               self.epglist.append(ptr)
+                       if len(self.epglist) > 0:
+                               self.session.open(EventView, self.epglist[0], ServiceReference(ref), self.eventViewCallback)
+               except:
+                       pass
+                       

        def openSingleServiceEPG(self):
                ref=self.session.nav.getCurrentlyPlayingServiceReference()
                ptr=eEPGCache.getInstance()
        def openSingleServiceEPG(self):
                ref=self.session.nav.getCurrentlyPlayingServiceReference()
                ptr=eEPGCache.getInstance()


@@ -389,20 +405,7 @@ class InfoBarEPG:
                        self.session.openWithCallback(self.singleEPGCallback, EPGSelection, ref)
                else: # try to show now/next
                        print 'no epg for service', ref.toString()
                        self.session.openWithCallback(self.singleEPGCallback, EPGSelection, ref)
                else: # try to show now/next
                        print 'no epg for service', ref.toString()

-                       try:
-                               self.epglist = [ ]
-                               service = self.session.nav.getCurrentService()
-                               info = service.info()
-                               ptr=info.getEvent(0)
-                               if ptr:
-                                       self.epglist.append(ptr)
-                               ptr=info.getEvent(1)
-                               if ptr:
-                                       self.epglist.append(ptr)
-                               if len(self.epglist) > 0:
-                                       self.session.open(EventView, self.epglist[0], ServiceReference(ref), self.eventViewCallback)
-                       except:
-                               pass    
+

        
        def openBouquetEPG(self, bouquet):
                ptr=eEPGCache.getInstance()
        
        def openBouquetEPG(self, bouquet):
                ptr=eEPGCache.getInstance()