X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d791fb8522a5b2fe7859fee6158ed99f1714dd22..a067819af2071913df2acdf2a4ef444ef7333914:/lib/python/Screens/Ci.py

diff --git a/lib/python/Screens/Ci.py b/lib/python/Screens/Ci.py
index bf137f40..79ff34ea 100644
--- a/lib/python/Screens/Ci.py
+++ b/lib/python/Screens/Ci.py
@@ -12,9 +12,48 @@ from Components.config import *
 
 from enigma import *
 
+class CiConfigList(HTMLComponent, GUIComponent):
+	def __init__(self, list):
+		GUIComponent.__init__(self)
+		self.l = eListboxPythonConfigContent()
+		self.l.setList(list)
+		self.l.setSeperation(100)
+		self.list = list
+
+	def toggle(self):
+		pass
+
+	def handleKey(self, key):
+		selection = self.getCurrent()
+		selection[1].handleKey(key)
+		self.invalidateCurrent()
+
+	def getCurrent(self):
+		return self.l.getCurrentSelection()
+
+	def invalidateCurrent(self):
+		self.l.invalidateEntry(self.l.getCurrentSelectionIndex())
+
+	def invalidate(self, entry):
+		i = 0
+		for x in self.list:
+			if (entry.getConfigPath() == x[1].parent.getConfigPath()):
+				self.l.invalidateEntry(i)
+			i += 1
+		pass
+
+	def GUIcreate(self, parent):
+		self.instance = eListbox(parent)
+		self.instance.setContent(self.l)
+
+	def GUIdelete(self):
+		self.instance.setContent(None)
+		self.instance = None
+
 class CiMmi(Screen):
 	def addEntry(self, list, entry):
 		if entry[0] == "TEXT":		#handle every item (text / pin only?)
+			#list.append( (entry[1], entry[2]) )
 			list.append( (entry[1], entry[2]) )
 		if entry[0] == "PIN":
 			if entry[3] == 1:
@@ -23,8 +62,9 @@ class CiMmi(Screen):
 			else:				
 				# unmasked pins:
 				x = configElement_nonSave("", configSequence, [1234], configsequencearg.get("PINCODE", (entry[1], "")))			
-				
-			self.pin = getConfigListEntry(entry[2],x)
+			
+			list.append( (entry[2], 0) )	
+			self.pin = getConfigListEntry("",x)
 			list.append( self.pin )
 
 	def okbuttonClick(self):
@@ -39,6 +79,10 @@ class CiMmi(Screen):
 			print "answer LIST"
 			eDVBCI_UI.getInstance().answerMenu(self.slotid, 0)
 			self.showWait()	
+		elif self.tag == "ENQ":
+			print "answer ENQ"
+			eDVBCI_UI.getInstance().answerEnq(self.slotid, str(self.pin[1].parent.value))
+			self.showWait()	
 
 	def closeMmi(self):
 		self.Timer.stop()
@@ -54,6 +98,9 @@ class CiMmi(Screen):
 		elif self.tag == "LIST":
 			eDVBCI_UI.getInstance().answerMenu(self.slotid, 0)
 			self.showWait()	
+		elif self.tag == "ENQ":
+			eDVBCI_UI.getInstance().cancelEnq(self.slotid)
+			self.showWait()	
 		else:
 			print "give cancel action to ci"	
 
@@ -110,6 +157,10 @@ class CiMmi(Screen):
 		#module still there ?			
 		if eDVBCI_UI.getInstance().getState(self.slotid) != 2:
 			self.closeMmi()
+
+		#mmi session still active ?			
+		if eDVBCI_UI.getInstance().getMMIState(self.slotid) != 1:
+			self.closeMmi()
 			
 		#new screen available?	
 		if eDVBCI_UI.getInstance().availableMMI(self.slotid) == 1:
@@ -133,6 +184,7 @@ class CiMmi(Screen):
 		self["subtitle"] = Label("")
 		self["bottom"] = Label("")
 		self["entries"] = MenuList([ ])
+		#self["entries"] = CiConfigList([ ])
 
 		self["actions"] = NumberActionMap(["SetupActions"],
 			{
@@ -170,14 +222,14 @@ class CiMmi(Screen):
 class CiSelection(Screen):
 	def createMenu(self):
 		self.list = [ ]
-		self.list.append( ("Reset", 0) )
-		self.list.append( ("Init", 1) )
+		self.list.append( (_("Reset"), 0) )
+		self.list.append( (_("Init"), 1) )
 		
 		self.state = eDVBCI_UI.getInstance().getState(0)
 		if self.state == 0:			#no module
-			self.list.append( ("no module found", 2) )
+			self.list.append( (_("no module found"), 2) )
 		elif self.state == 1:		#module in init
-			self.list.append( ("init module", 2) )
+			self.list.append( (_("init module"), 2) )
 		elif self.state == 2:		#module ready
 			#get appname		
 			appname = eDVBCI_UI.getInstance().getAppName(0)