X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/bac49ddebb507c6a1b6f3b16218c9d6a97e70651..29f60fdaf6f0ff1dd112c9e0e913ec734b304bf1:/lib/python/Components/EpgList.py diff --git a/lib/python/Components/EpgList.py b/lib/python/Components/EpgList.py index 861063a3..64fe87f4 100644 --- a/lib/python/Components/EpgList.py +++ b/lib/python/Components/EpgList.py @@ -22,8 +22,6 @@ RT_VALIGN_BOTTOM = 16 RT_WRAP = 32 -SINGLE_CPP = 0 - class Rect: def __init__(self, x, y, width, height): self.__left = x @@ -52,17 +50,14 @@ class EPGList(HTMLComponent, GUIComponent): self.onSelChanged.append(selChangedCB) GUIComponent.__init__(self) self.type=type - if type == EPG_TYPE_SINGLE and SINGLE_CPP > 0: - self.l = eListboxEPGContent() + self.l = eListboxPythonMultiContent() + if type == EPG_TYPE_SINGLE: + self.l.setBuildFunc(self.buildSingleEntry) + elif type == EPG_TYPE_MULTI: + self.l.setBuildFunc(self.buildMultiEntry) else: - self.l = eListboxPythonMultiContent() - if type == EPG_TYPE_SINGLE: - self.l.setBuildFunc(self.buildSingleEntry) - elif type == EPG_TYPE_MULTI: - self.l.setBuildFunc(self.buildMultiEntry) - else: - assert(type == EPG_TYPE_SIMILAR) - self.l.setBuildFunc(self.buildSimilarEntry) + assert(type == EPG_TYPE_SIMILAR) + self.l.setBuildFunc(self.buildSimilarEntry) self.epgcache = eEPGCache.getInstance() def getEventFromId(self, service, eventid): @@ -72,37 +67,21 @@ class EPGList(HTMLComponent, GUIComponent): return event def getCurrentChangeCount(self): - if self.type == EPG_TYPE_SINGLE: - return 0 - return self.l.getCurrentSelection()[0] + if self.type == EPG_TYPE_MULTI: + return self.l.getCurrentSelection()[0] + return 0 def getCurrent(self): - if self.type == EPG_TYPE_SINGLE: - if SINGLE_CPP > 0: - evt = self.l.getCurrent() - else: - cur = self.l.getCurrentSelection() - if cur is None: - return cur - else: - evt = self.getEventFromId(self.service, cur[0]) - elif self.type == EPG_TYPE_MULTI: - tmp = self.l.getCurrentSelection() - if tmp is None: - return ( None, None ) - eventid = tmp[2] - service = ServiceReference(tmp[1]) - event = self.getEventFromId(service, eventid) - evt = ( event, service ) - else: - tmp = self.l.getCurrentSelection() - if tmp is None: - return ( None, None ) - eventid = tmp[1] - service = ServiceReference(tmp[0]) - event = self.getEventFromId(service, eventid) - evt = ( event, service ) - return evt + idx=0 + if self.type == EPG_TYPE_MULTI: + idx += 1 + tmp = self.l.getCurrentSelection() + if tmp is None: + return ( None, None ) + eventid = tmp[idx+1] + service = ServiceReference(tmp[idx]) + event = self.getEventFromId(service, eventid) + return ( event, service ) def moveUp(self): self.instance.moveSelection(self.instance.moveUp) @@ -122,73 +101,73 @@ class EPGList(HTMLComponent, GUIComponent): if x is not None: try: x() - except: + except: # FIXME!!! + print "FIXME in EPGList.selectionChanged" pass - def GUIcreate(self, parent): - self.instance = eListbox(parent) - self.instance.setWrapAround(True) - self.instance.selectionChanged.get().append(self.selectionChanged) - self.instance.setContent(self.l) - if SINGLE_CPP > 0: - self.instance.setItemHeight(25) - - def GUIdelete(self): - self.instance = None + GUI_WIDGET = eListbox + + def postWidgetCreate(self, instance): + instance.setWrapAround(True) + instance.selectionChanged.get().append(self.selectionChanged) + instance.setContent(self.l) def recalcEntrySize(self): - if SINGLE_CPP == 0: - esize = self.l.getItemSize() - self.l.setFont(0, gFont("Regular", 22)) - self.l.setFont(1, gFont("Regular", 16)) - width = esize.width() - height = esize.height() - if self.type == EPG_TYPE_SINGLE: - w = width/20*7 - self.datetime_rect = Rect(0, 0, w-15, height) - self.descr_rect = Rect(w, 0, width/20*13, height) - elif self.type == EPG_TYPE_MULTI: - xpos = 0; - w = width/10*3; - self.service_rect = Rect(xpos, 0, w-10, height) - xpos += w; - w = width/10*2; - self.start_end_rect = Rect(xpos, 0, w-10, height) - self.progress_rect = Rect(xpos, 4, w-10, height-8) - xpos += w - w = width/10*5; - self.descr_rect = Rect(xpos, 0, width, height) - else: # EPG_TYPE_SIMILAR - w = width/20*7; - self.datetime_rect = Rect(0, 0, w-15, height) - self.service_rect = Rect(w, 0, width/20*13, height) - - def buildSingleEntry(self, eventId, beginTime, duration, EventName): - rec=(self.timer.isInTimer(eventId, beginTime, duration, self.service) > ((duration/10)*8)) - r1=self.datetime_rect - r2=self.descr_rect + esize = self.l.getItemSize() + self.l.setFont(0, gFont("Regular", 22)) + self.l.setFont(1, gFont("Regular", 16)) + width = esize.width() + height = esize.height() + if self.type == EPG_TYPE_SINGLE: + self.weekday_rect = Rect(0, 0, width/20*2-10, height) + self.datetime_rect = Rect(width/20*2, 0, width/20*5-15, height) + self.descr_rect = Rect(width/20*7, 0, width/20*13, height) + elif self.type == EPG_TYPE_MULTI: + xpos = 0; + w = width/10*3; + self.service_rect = Rect(xpos, 0, w-10, height) + xpos += w; + w = width/10*2; + self.start_end_rect = Rect(xpos, 0, w-10, height) + self.progress_rect = Rect(xpos, 4, w-10, height-8) + xpos += w + w = width/10*5; + self.descr_rect = Rect(xpos, 0, width, height) + else: # EPG_TYPE_SIMILAR + self.weekday_rect = Rect(0, 0, width/20*2-10, height) + self.datetime_rect = Rect(width/20*2, 0, width/20*5-15, height) + self.service_rect = Rect(width/20*7, 0, width/20*13, height) + + def buildSingleEntry(self, service, eventId, beginTime, duration, EventName): + rec=(self.timer.isInTimer(eventId, beginTime, duration, service) > ((duration/10)*8)) + r1=self.weekday_rect + r2=self.datetime_rect + r3=self.descr_rect res = [ None ] # no private data needed t = localtime(beginTime) - res.append((eListboxPythonMultiContent.TYPE_TEXT, r1.left(), r1.top(), r1.width(), r1.height(), 0, RT_HALIGN_RIGHT, "%s %02d.%02d, %02d:%02d"%(self.days[t[6]],t[2],t[1],t[3],t[4]))) + res.append((eListboxPythonMultiContent.TYPE_TEXT, r1.left(), r1.top(), r1.width(), r1.height(), 0, RT_HALIGN_RIGHT, self.days[t[6]])) + res.append((eListboxPythonMultiContent.TYPE_TEXT, r2.left(), r2.top(), r2.width(), r1.height(), 0, RT_HALIGN_RIGHT, "%02d.%02d, %02d:%02d"%(t[2],t[1],t[3],t[4]))) if rec: - res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, r2.left(), r2.top(), 21, 21, loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, 'epgclock-fs8.png')))) - res.append((eListboxPythonMultiContent.TYPE_TEXT, r2.left() + 25, r2.top(), r2.width(), r2.height(), 0, RT_HALIGN_LEFT, EventName)) + res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, r3.left(), r3.top(), 21, 21, loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, 'epgclock-fs8.png')))) + res.append((eListboxPythonMultiContent.TYPE_TEXT, r3.left() + 25, r3.top(), r3.width(), r3.height(), 0, RT_HALIGN_LEFT, EventName)) else: - res.append((eListboxPythonMultiContent.TYPE_TEXT, r2.left(), r2.top(), r2.width(), r2.height(), 0, RT_HALIGN_LEFT, EventName)) + res.append((eListboxPythonMultiContent.TYPE_TEXT, r3.left(), r3.top(), r3.width(), r3.height(), 0, RT_HALIGN_LEFT, EventName)) return res def buildSimilarEntry(self, service, eventId, beginTime, service_name, duration): rec=(self.timer.isInTimer(eventId, beginTime, duration, service) > ((duration/10)*8)) - r1=self.datetime_rect - r2=self.service_rect + r1=self.weekday_rect + r2=self.datetime_rect + r3=self.service_rect res = [ None ] # no private data needed t = localtime(beginTime) - res.append((eListboxPythonMultiContent.TYPE_TEXT, r1.left(), r1.top(), r1.width(), r1.height(), 0, RT_HALIGN_RIGHT, "%s %02d.%02d, %02d:%02d"%(self.days[t[6]],t[2],t[1],t[3],t[4]))) + res.append((eListboxPythonMultiContent.TYPE_TEXT, r1.left(), r1.top(), r1.width(), r1.height(), 0, RT_HALIGN_RIGHT, self.days[t[6]])) + res.append((eListboxPythonMultiContent.TYPE_TEXT, r2.left(), r2.top(), r2.width(), r1.height(), 0, RT_HALIGN_RIGHT, "%02d.%02d, %02d:%02d"%(t[2],t[1],t[3],t[4]))) if rec: - res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, r2.left(), r2.top(), 21, 21, loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, 'epgclock-fs8.png')))) - res.append((eListboxPythonMultiContent.TYPE_TEXT, r2.left() + 25, r2.top(), r2.width(), r2.height(), 0, RT_HALIGN_LEFT, service_name)) + res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, r3.left(), r3.top(), 21, 21, loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, 'epgclock-fs8.png')))) + res.append((eListboxPythonMultiContent.TYPE_TEXT, r3.left() + 25, r3.top(), r3.width(), r3.height(), 0, RT_HALIGN_LEFT, service_name)) else: - res.append((eListboxPythonMultiContent.TYPE_TEXT, r2.left(), r2.top(), r2.width(), r2.height(), 0, RT_HALIGN_LEFT, service_name)) + res.append((eListboxPythonMultiContent.TYPE_TEXT, r3.left(), r3.top(), r3.width(), r3.height(), 0, RT_HALIGN_LEFT, service_name)) return res def buildMultiEntry(self, changecount, service, eventId, begTime, duration, EventName, nowTime, service_name): @@ -234,11 +213,11 @@ class EPGList(HTMLComponent, GUIComponent): return self.epgcache.lookupEvent(list) return [ ] - def fillMultiEPG(self, services): + def fillMultiEPG(self, services, stime=-1): t = time() test = [ '0RIBDTCN' ] for service in services: - tuple = ( service.ref.toString(), 0 ) + tuple = (service.ref.toString(), 0, stime) test.append( tuple ) self.list = self.queryEPG(test) self.l.setList(self.list) @@ -269,12 +248,8 @@ class EPGList(HTMLComponent, GUIComponent): def fillSingleEPG(self, service): t = time() - if SINGLE_CPP > 0: - self.l.setRoot(service.ref) - else: - self.service = service - test = [ 'IBDT', (service.ref.toString(), 0, -1, -1) ] - self.l.setList(self.queryEPG(test)) + test = [ 'RIBDT', (service.ref.toString(), 0, -1, -1) ] + self.l.setList(self.queryEPG(test)) print time() - t self.selectionChanged()