Merge remote-tracking branch 'origin/master'

oe-alliance · Oct 30, 2012 · f84b79e · f84b79e
2 parents 1967545 + 33ed7f0
commit f84b79e
Show file tree

Hide file tree

Showing 7 changed files with 252 additions and 244 deletions.
diff --git a/autoresolution/src/plugin.py b/autoresolution/src/plugin.py
@@ -219,7 +219,7 @@ def determineContent(self):
 	def changeVideomode(self):
 		if usable:
 			mode = self.lastmode
-			if mode.find("1080p") != -1 or mode.find("720p24") != -1:
+			if mode.find("p24") != -1 or mode.find("p25") != -1 or mode.find("p30") != -1:
 				print "[AutoRes] switching to", mode
 				v = open('/proc/stb/video/videomode' , "w")
 				v.write("%s\n" % mode)

diff --git a/epgsearch/src/EPGSearch.py b/epgsearch/src/EPGSearch.py
@@ -60,10 +60,13 @@ def __init__(self, type=EPG_TYPE_SINGLE, selChangedCB=None, timer=None):
 			self.remote_clock_prepost_pixmap = LoadPixmap('/usr/lib/enigma2/python/Plugins/Extensions/Partnerbox/icons/remote_epgclock_prepost.png')
 
 	def buildEPGSearchEntry(self, service, eventId, beginTime, duration, EventName):
-		rec1 = beginTime and self.timer.isInTimer(eventId, beginTime, duration, service)
+		clock_pic = self.getPixmapForEntry(service, eventId, beginTime, duration)
+		clock_pic_partnerbox = None
 		# Partnerbox
 		if PartnerBoxIconsEnabled:
-			rec2 = beginTime and isInRemoteTimer(self,beginTime, duration, service)
+			rec2=beginTime and (isInRemoteTimer(self,beginTime, duration, service))
+			if rec2:
+				clock_pic_partnerbox = getRemoteClockPixmap(self,service, beginTime, duration, eventId)
 		else:
 			rec2 = False
 		r1 = self.weekday_rect
@@ -76,26 +79,24 @@ def buildEPGSearchEntry(self, service, eventId, beginTime, duration, EventName):
 			(eListboxPythonMultiContent.TYPE_TEXT, r1.x, r1.y, r1.w, r1.h, 0, RT_HALIGN_LEFT|RT_VALIGN_CENTER, _(strftime("%a", t))),
 			(eListboxPythonMultiContent.TYPE_TEXT, r2.x, r2.y, r2.w, r1.h, 0, RT_HALIGN_LEFT|RT_VALIGN_CENTER, strftime("%e/%m, %-H:%M", t))
 		]
-		if rec1 or rec2:
-			if rec1:
-				clock_pic = self.getClockPixmap(service, beginTime, duration, eventId)
-				# maybe Partnerbox too
-				if rec2:
-					clock_pic_partnerbox = getRemoteClockPixmap(self,service, beginTime, duration, eventId)
-			else:
-				clock_pic = getRemoteClockPixmap(self,service, beginTime, duration, eventId)
-			if rec1 and rec2:
+		if clock_pic or clock_pic_partnerbox:
+			if clock_pic and clock_pic_partnerbox:
+				# Partnerbox and local
+				res.extend((
+					(eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, r3.x, r3.y, 21, 21, clock_pic),
+					(eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, r3.x + 25, r3.y, 21, 21, clock_pic_partnerbox),
+					(eListboxPythonMultiContent.TYPE_TEXT, r3.x + 50, r3.y, r3.w, r3.h, 0, RT_HALIGN_LEFT|RT_VALIGN_CENTER, serviceref.getServiceName() + ": " + EventName)))
+			elif clock_pic_partnerbox:
 				# Partnerbox and local
 				res.extend((
-					(eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, r3.left(), r3.top(), 21, 21, clock_pic),
-					(eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, r3.left() + 25, r3.top(), 21, 21, clock_pic_partnerbox),
-					(eListboxPythonMultiContent.TYPE_TEXT, r3.left() + 50, r3.top(), r3.width(), r3.height(), 0, RT_HALIGN_LEFT|RT_VALIGN_CENTER, serviceref.getServiceName() + ": " + EventName)))
+					(eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, r3.x, r3.y, 21, 21, clock_pic_partnerbox),
+					(eListboxPythonMultiContent.TYPE_TEXT, r3.x + 25, r3.y, r3.w, r3.h, 0, RT_HALIGN_LEFT|RT_VALIGN_CENTER, serviceref.getServiceName() + ": " + EventName)))
 			else:
 				res.extend((
-					(eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, r3.left(), r3.top(), 21, 21, clock_pic),
-					(eListboxPythonMultiContent.TYPE_TEXT, r3.left() + 25, r3.top(), r3.width(), r3.height(), 0, RT_HALIGN_LEFT|RT_VALIGN_CENTER, serviceref.getServiceName() + ": " + EventName)))
+					(eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, r3.x, r3.y, 21, 21, clock_pic),
+					(eListboxPythonMultiContent.TYPE_TEXT, r3.x + 25, r3.y, r3.w, r3.h, 0, RT_HALIGN_LEFT|RT_VALIGN_CENTER, serviceref.getServiceName() + ": " + EventName)))
 		else:
-			res.append((eListboxPythonMultiContent.TYPE_TEXT, r3.left(), r3.top(), r3.width(), r3.height(), 0, RT_HALIGN_LEFT|RT_VALIGN_CENTER, serviceref.getServiceName() + ": " + EventName))
+			res.append((eListboxPythonMultiContent.TYPE_TEXT, r3.x, r3.y, r3.w, r3.h, 0, RT_HALIGN_LEFT|RT_VALIGN_CENTER, serviceref.getServiceName() + ": " + EventName))
 		return res
 
 # main class of plugin