add StaticMultiList for MultiContentList-styled content

[enigma2.git] / lib / python / Components / EpgList.py

diff --git a/lib/python/Components/EpgList.py b/lib/python/Components/EpgList.py
index 64fe87f430901d621d0ddfca398c817714330224..4a182322b60bd3ac079a7f98f0f2bfa6b33f6b48 100644 (file)
--- a/lib/python/Components/EpgList.py
+++ b/lib/python/Components/EpgList.py
@@ -1,7 +1,9 @@
 from HTMLComponent import *
 from GUIComponent import *
 
-from enigma import *
+from enigma import eEPGCache, eListbox, eListboxPythonMultiContent, gFont, loadPNG, \
+       RT_HALIGN_LEFT, RT_HALIGN_RIGHT, RT_HALIGN_CENTER, RT_VALIGN_CENTER
+
 from re import *
 from time import localtime, time
 from ServiceReference import ServiceReference
@@ -11,17 +13,6 @@ EPG_TYPE_SINGLE = 0
 EPG_TYPE_MULTI = 1
 EPG_TYPE_SIMILAR = 2
 
-RT_HALIGN_LEFT = 0
-RT_HALIGN_RIGHT = 1
-RT_HALIGN_CENTER = 2
-RT_HALIGN_BLOCK = 4
-
-RT_VALIGN_TOP = 0
-RT_VALIGN_CENTER = 8
-RT_VALIGN_BOTTOM = 16
-
-RT_WRAP = 32
-
 class Rect:
        def __init__(self, x, y, width, height):
                self.__left = x
@@ -172,25 +163,16 @@ class EPGList(HTMLComponent, GUIComponent):
 
        def buildMultiEntry(self, changecount, service, eventId, begTime, duration, EventName, nowTime, service_name):
                rec=begTime and (self.timer.isInTimer(eventId, begTime, duration, service) > ((duration/10)*8))
-               sname = service_name
                r1=self.service_rect
                r2=self.progress_rect
                r3=self.descr_rect
                r4=self.start_end_rect
                res = [ None ] # no private data needed
-               re = compile('\xc2\x86.*?\xc2\x87')
-               list = re.findall(sname)
-               if len(list):
-                       sname=''
-                       for substr in list:
-                               sname+=substr[2:len(substr)-2]
-                       if len(sname) == 0:
-                               sname = service_name;
                if rec:
-                       res.append((eListboxPythonMultiContent.TYPE_TEXT, r1.left(), r1.top(), r1.width()-21, r1.height(), 0, RT_HALIGN_LEFT, sname))
+                       res.append((eListboxPythonMultiContent.TYPE_TEXT, r1.left(), r1.top(), r1.width()-21, r1.height(), 0, RT_HALIGN_LEFT, service_name))
                        res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, r1.left()+r1.width()-16, r1.top(), 21, 21, loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, 'epgclock-fs8.png'))))
                else:
-                       res.append((eListboxPythonMultiContent.TYPE_TEXT, r1.left(), r1.top(), r1.width(), r1.height(), 0, RT_HALIGN_LEFT, sname))
+                       res.append((eListboxPythonMultiContent.TYPE_TEXT, r1.left(), r1.top(), r1.width(), r1.height(), 0, RT_HALIGN_LEFT, service_name))
                if begTime is not None:
                        if nowTime < begTime:
                                begin = localtime(begTime)
@@ -215,10 +197,8 @@ class EPGList(HTMLComponent, GUIComponent):
 
        def fillMultiEPG(self, services, stime=-1):
                t = time()
-               test = [ '0RIBDTCN' ]
-               for service in services:
-                       tuple = (service.ref.toString(), 0, stime)
-                       test.append( tuple )
+               test = [ (service.ref.toString(), 0, stime) for service in services ]
+               test.insert(0, '0RIBDTCn')
                self.list = self.queryEPG(test)
                self.l.setList(self.list)
                print time() - t
@@ -226,14 +206,8 @@ class EPGList(HTMLComponent, GUIComponent):
 
        def updateMultiEPG(self, direction):
                t = time()
-               test = [ 'RIBDTCN' ]
-               for x in self.list:
-                       service = x[1]
-                       begTime = x[3]
-                       duration = x[4]
-                       if begTime is None:
-                               begTime = 0
-                       test.append((service, direction, begTime))
+               test = [ x[3] and (x[1], direction, x[3]) or (x[1], direction, 0) for x in self.list ]
+               test.insert(0, 'RIBDTCn')
                tmp = self.queryEPG(test)
                cnt=0
                for x in tmp: