add subservice selection to timer (when linkage services are avail for the selected event)

better layout in timerlist (more space for service name and event description)

1 files changed, 15 insertions, 6 deletions

diff --git a/lib/python/Screens/SubserviceSelection.py b/lib/python/Screens/SubserviceSelection.py
index a73cf0e4..0aa34b61 100644
--- a/lib/python/Screens/SubserviceSelection.py
+++ b/lib/python/Screens/SubserviceSelection.py
@@ -2,7 +2,7 @@ from Screen import Screen
 from Components.ActionMap import ActionMap
 from Components.MenuList import MenuList
 from Components.Label import Label
-from enigma import eServiceReferencePtr, eServiceReference
+from enigma import eServiceReferencePtr, eServiceReference, iSubserviceListPtr, eServiceEventPtrPtr
 
 class SubserviceSelection(Screen):
 	def KeyOk(self):
@@ -10,7 +10,7 @@ class SubserviceSelection(Screen):
 		self.close(selection[1])
 	def Cancel(self):
 		self.close(None)
-	def __init__(self, session, subservices):
+	def __init__(self, session, subservices, parent=None):
 		Screen.__init__(self, session)
 
 		self["actions"] = ActionMap(["OkCancelActions"], 
@@ -21,10 +21,19 @@ class SubserviceSelection(Screen):
 
 		self.subservices = subservices
 
+		print subservices
 		tlist = []
-		n = subservices.getNumberOfSubservices()
-		for x in range(n):
-			i = subservices.getSubservice(x)
-			tlist.append((i.getName(), i))
+		if isinstance(subservices, iSubserviceListPtr):
+			n = subservices.getNumberOfSubservices()
+			for x in range(n):
+				i = subservices.getSubservice(x)
+				tlist.append((i.getName(), i))
+		elif isinstance(subservices, eServiceEventPtrPtr):
+			n = subservices.getNumOfLinkageServices()
+			for x in range(n):
+				i = subservices.getLinkageService(parent, x)
+				tlist.append((i.getName(), i))
+		else:
+			print "unknown type of subservices"
 
 		self["subservices"] = MenuList(tlist)