X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FPlugins%2FExtensions%2FGraphMultiEPG%2FGraphMultiEpg.py;h=80a07df4918d014f62506c0c76f1d068b6ba037f;hp=3148879a633b8956c78a13ddbc48bb16638526e3;hb=6f73e6abddf4170357c490966d0e1c622eb376f5;hpb=f8a699c051ced1751b190d68d7af84bee80184a2

diff --git a/lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpg.py b/lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpg.py
index 3148879..80a07df 100644
--- a/lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpg.py
+++ b/lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpg.py
@@ -17,7 +17,8 @@ from Screens.EpgSelection import EPGSelection
 from Tools.Directories import resolveFilename, SCOPE_SKIN_IMAGE
 from RecordTimer import RecordTimerEntry, parseEvent
 from ServiceReference import ServiceReference
-from enigma import eEPGCache, eListbox, gFont, loadPNG, eListboxPythonMultiContent, \
+from Tools.LoadPixmap import LoadPixmap
+from enigma import eEPGCache, eListbox, gFont, eListboxPythonMultiContent, \
 	RT_HALIGN_LEFT, RT_HALIGN_CENTER, RT_VALIGN_CENTER, RT_WRAP, eRect, eTimer
 
 from time import localtime, time, strftime
@@ -38,7 +39,7 @@ class EPGList(HTMLComponent, GUIComponent):
 		if overjump_empty:
 			self.l.setSelectableFunc(self.isSelectable)
 		self.epgcache = eEPGCache.getInstance()
-		self.clock_pixmap = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, 'epgclock-fs8.png'))
+		self.clock_pixmap = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, 'epgclock-fs8.png'))
 		self.time_base = None
 		self.time_epoch = time_epoch
 		self.list = None
@@ -214,7 +215,7 @@ class EPGList(HTMLComponent, GUIComponent):
 			borderColor = self.borderColor
 
 			for ev in events:  #(event_id, event_title, begin_time, duration)
-				rec=self.timer.isInTimer(ev[0], ev[2], ev[3], service) > ((ev[3]/10)*8)
+				rec=ev[2] and self.timer.isInTimer(ev[0], ev[2], ev[3], service) > ((ev[3]/10)*8)
 				xpos, ewidth = self.calcEntryPosAndWidthHelper(ev[2], ev[3], start, end, width)
 				res.append(MultiContentEntryText(pos = (left+xpos, top), size = (ewidth, height), font = 1, flags = RT_HALIGN_CENTER | RT_VALIGN_CENTER | RT_WRAP, text = ev[1], color = foreColor, color_sel = foreColorSelected, backcolor = backColor, backcolor_sel = backColorSelected, border_width = 1, border_color = borderColor))
 				if rec and ewidth > 23:
@@ -271,7 +272,7 @@ class EPGList(HTMLComponent, GUIComponent):
 			self.cur_service = None
 			self.time_base = int(stime)
 			test = [ (service.ref.toString(), 0, self.time_base, self.time_epoch) for service in services ]
-		test.insert(0, 'RnITBD')
+		test.insert(0, 'XRnITBD')
 		epg_data = self.queryEPG(test)
 
 		self.list = [ ]
@@ -379,7 +380,7 @@ class GraphMultiEPG(Screen):
 			},-1)
 
 		self.updateTimelineTimer = eTimer()
-		self.updateTimelineTimer.timeout.get().append(self.moveTimeLines)
+		self.updateTimelineTimer.callback.append(self.moveTimeLines)
 		self.updateTimelineTimer.start(60*1000)
 		self.onLayoutFinish.append(self.onCreate)