diff options
| author | Felix Domke <tmbinc@elitedvb.net> | 2009-05-25 01:38:39 +0200 |
|---|---|---|
| committer | Felix Domke <tmbinc@elitedvb.net> | 2009-05-25 01:38:39 +0200 |
| commit | 875b117b3aeca1af73942d4eeb691496f6c884f9 (patch) | |
| tree | 9833628398e010accf290606bc59d4a112aa3fed /lib/python | |
| parent | 28a0e997d1d28a6d057ede5e8de70f26ceed0e8e (diff) | |
| parent | 4ea054ce5a814666d8d7af7f9951ffb783820889 (diff) | |
| download | enigma2-875b117b3aeca1af73942d4eeb691496f6c884f9.tar.gz enigma2-875b117b3aeca1af73942d4eeb691496f6c884f9.zip | |
Merge branch 'master' of /home/tmbinc/enigma2-git
Diffstat (limited to 'lib/python')
| -rw-r--r-- | lib/python/Components/EpgList.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/python/Components/EpgList.py b/lib/python/Components/EpgList.py index 3b07412e..59f92621 100644 --- a/lib/python/Components/EpgList.py +++ b/lib/python/Components/EpgList.py @@ -212,7 +212,7 @@ class EPGList(HTMLComponent, GUIComponent): 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): + def buildMultiEntry(self, changecount, service, eventId, beginTime, duration, EventName, nowTime, service_name): (clock_pic, rec) = self.getPixmapForEntry(service, eventId, beginTime, duration) r1=self.service_rect r2=self.progress_rect @@ -226,10 +226,10 @@ class EPGList(HTMLComponent, GUIComponent): )) else: 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) - end = localtime(begTime+duration) + if beginTime is not None: + if nowTime < beginTime: + begin = localtime(beginTime) + end = localtime(beginTime+duration) # print "begin", begin # print "end", end res.extend(( @@ -237,7 +237,7 @@ class EPGList(HTMLComponent, GUIComponent): (eListboxPythonMultiContent.TYPE_TEXT, r3.left(), r3.top(), r3.width(), r3.height(), 0, RT_HALIGN_LEFT, EventName) )) else: - percent = (nowTime - begTime) * 100 / duration + percent = (nowTime - beginTime) * 100 / duration res.extend(( (eListboxPythonMultiContent.TYPE_PROGRESS, r2.left(), r2.top(), r2.width(), r2.height(), percent), (eListboxPythonMultiContent.TYPE_TEXT, r3.left(), r3.top(), r3.width(), r3.height(), 0, RT_HALIGN_LEFT, EventName) |