X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/530dcfb355dc35f9258c286f537b855ce9814adc..d43e4676bd757d1de73b8dd669154ffd42192b10:/lib/python/Screens/Ci.py

diff --git a/lib/python/Screens/Ci.py b/lib/python/Screens/Ci.py
index 1ba036bd..ecc56044 100644
--- a/lib/python/Screens/Ci.py
+++ b/lib/python/Screens/Ci.py
@@ -9,63 +9,79 @@ from Components.Label import Label
 from Components.HTMLComponent import *
 from Components.GUIComponent import *
 from Components.config import *
+from Components.ConfigList import ConfigList
 
-from enigma import *
+from enigma import eTimer, eDVBCI_UI, eListboxPythonStringContent, eListboxPythonConfigContent
 
-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
+TYPE_MENU = 0
+TYPE_CONFIG = 1
 
-	def toggle(self):
-		pass
+class CiMmi(Screen):
+	def __init__(self, session, slotid, action):
+		Screen.__init__(self, session)
 
-	def handleKey(self, key):
-		selection = self.getCurrent()
-		selection[1].handleKey(key)
-		self.invalidateCurrent()
+		print "ciMMI with action" + str(action)
 
-	def getCurrent(self):
-		return self.l.getCurrentSelection()
+		self.slotid = slotid
 
-	def invalidateCurrent(self):
-		self.l.invalidateEntry(self.l.getCurrentSelectionIndex())
+		self.Timer = eTimer()
+		self.Timer.timeout.get().append(self.TimerCheck)
+		self.Timer.start(1000)
 
-	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
+		#else the skins fails
+		self["title"] = Label("")
+		self["subtitle"] = Label("")
+		self["bottom"] = Label("")
+		self["entries"] = ConfigList([ ])
+		self.listtype = TYPE_CONFIG
 
-	def GUIcreate(self, parent):
-		self.instance = eListbox(parent)
-		self.instance.setContent(self.l)
+		self["actions"] = NumberActionMap(["SetupActions"],
+			{
+				"ok": self.okbuttonClick,
+				"cancel": self.keyCancel,
+				#for PIN
+				"left": self.keyLeft,
+				"right": self.keyRight,
+				"1": self.keyNumberGlobal,
+				"2": self.keyNumberGlobal,
+				"3": self.keyNumberGlobal,
+				"4": self.keyNumberGlobal,
+				"5": self.keyNumberGlobal,
+				"6": self.keyNumberGlobal,
+				"7": self.keyNumberGlobal,
+				"8": self.keyNumberGlobal,
+				"9": self.keyNumberGlobal,
+				"0": self.keyNumberGlobal
+			}, -1)
 
-	def GUIdelete(self):
-		self.instance.setContent(None)
-		self.instance = None
+		self.action = action
+
+		if action == 0:			#reset
+			eDVBCI_UI.getInstance().setReset(self.slotid)
+			self.showWait()
+		elif action == 1:		#init
+			eDVBCI_UI.getInstance().setInit(self.slotid)
+		elif action == 2:		#start MMI
+			eDVBCI_UI.getInstance().startMMI(self.slotid)
+			self.showWait()
+		elif action == 3:		#mmi already there (called from infobar)
+			self.showScreen()
 
-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":
+			self.pinlength = entry[1]
 			if entry[3] == 1:
 				# masked pins:
-				x = configElement_nonSave("", configSequence, [1234], configsequencearg.get("PINCODE", (entry[1], "-")))
+				x = configElement_nonSave("", configSequence, [1234], configsequencearg.get("PINCODE", (self.pinlength, "*")))
 			else:				
 				# unmasked pins:
-				x = configElement_nonSave("", configSequence, [1234], configsequencearg.get("PINCODE", (entry[1], "")))			
-			
-			list.append( (entry[2], 0) )	
+				x = configElement_nonSave("", configSequence, [1234], configsequencearg.get("PINCODE", (self.pinlength, "")))
+			self["subtitle"].setText(entry[2])
 			self.pin = getConfigListEntry("",x)
 			list.append( self.pin )
+			self["bottom"].setText(_("please press OK when ready"))
 
 	def okbuttonClick(self):
 		print "ok"
@@ -73,17 +89,24 @@ class CiMmi(Screen):
 			print "do nothing - wait"
 		elif self.tag == "MENU":
 			print "answer MENU"
-			eDVBCI_UI.getInstance().answerMenu(self.slotid, self["entries"].getCurrent()[1])
+			cur = self["entries"].getCurrent()
+			if cur:
+				eDVBCI_UI.getInstance().answerMenu(self.slotid, cur[1])
+			else:
+				eDVBCI_UI.getInstance().answerMenu(self.slotid, 0)
 			self.showWait()	
 		elif self.tag == "LIST":
 			print "answer LIST"
 			eDVBCI_UI.getInstance().answerMenu(self.slotid, 0)
 			self.showWait()	
 		elif self.tag == "ENQ":
-			print "answer ENQ"
-			#eDVBCI_UI.getInstance().answerMenu(self.slotid, 0)
-			self.showWait()	
-
+			answer = str(self.pin[1].parent.value[0])
+			length = len(answer)
+			while length < self.pinlength:
+				answer = '0'+answer
+				length+=1
+			eDVBCI_UI.getInstance().answerEnq(self.slotid, answer)
+			self.showWait()
 
 	def closeMmi(self):
 		self.Timer.stop()
@@ -92,31 +115,56 @@ class CiMmi(Screen):
 	def keyCancel(self):
 		print "keyCancel"
 		if self.tag == "WAIT":
+			eDVBCI_UI.getInstance().stopMMI(self.slotid)
 			self.closeMmi()
-		elif self.tag == "MENU":
+		elif self.tag in [ "MENU", "LIST" ]:
+			print "cancel list"
 			eDVBCI_UI.getInstance().answerMenu(self.slotid, 0)
-			self.showWait()	
-		elif self.tag == "LIST":
-			eDVBCI_UI.getInstance().answerMenu(self.slotid, 0)
-			self.showWait()	
+			self.showWait()
 		elif self.tag == "ENQ":
+			print "cancel enq"
 			eDVBCI_UI.getInstance().cancelEnq(self.slotid)
-			self.showWait()	
+			self.showWait()
 		else:
 			print "give cancel action to ci"	
 
+	def keyConfigEntry(self, key):
+		try:
+			self["entries"].handleKey(key)
+		except AttributeError:
+			pass
+
 	def keyNumberGlobal(self, number):
-		self["entries"].handleKey(config.key[str(number)])
+		self.keyConfigEntry(config.key[str(number)])
 
 	def keyLeft(self):
-		self["entries"].handleKey(config.key["prevElement"])
+		self.keyConfigEntry(config.key["prevElement"])
 
 	def keyRight(self):
-		self["entries"].handleKey(config.key["nextElement"])
+		self.keyConfigEntry(config.key["nextElement"])
 
 	def updateList(self, list):
-		self["entries"].list = list
-		self["entries"].l.setList(list)
+		List = self["entries"]
+		try:
+			List.instance.moveSelectionTo(0)
+		except:
+			List.l.setList(list)
+			return
+
+		if self.tag == "ENQ":
+			type = TYPE_CONFIG
+		else:
+			type = TYPE_MENU
+
+		if type != self.listtype:
+			if type == TYPE_CONFIG:
+				List.l = eListboxPythonConfigContent()
+			else:
+				List.l = eListboxPythonStringContent()
+			List.instance.setContent(List.l)
+			self.listtype = type
+
+		List.l.setList(list)
 
 	def showWait(self):
 		self.tag = "WAIT"
@@ -126,30 +174,29 @@ class CiMmi(Screen):
 		list = [ ]
 		list.append( ("wait for ci...", 0) )
 		self.updateList(list)
-		
+
 	def showScreen(self):
 		screen = eDVBCI_UI.getInstance().getMMIScreen(self.slotid)
 	
 		list = [ ]
 
 		self.tag = screen[0][0]
-		
+
 		for entry in screen:
-			if entry[0] == "TITLE":
-				self["title"].setText(entry[1])
-			elif entry[0] == "SUBTITLE":
-				self["subtitle"].setText(entry[1])
-			elif entry[0] == "BOTTOM":
-				self["bottom"].setText(entry[1])
-			elif entry[0] == "TEXT":
-				self.addEntry(list, entry)
-			elif entry[0] == "PIN":
+			if entry[0] == "PIN":
 				self.addEntry(list, entry)
-
+			else:
+				if entry[0] == "TITLE":
+					self["title"].setText(entry[1])
+				elif entry[0] == "SUBTITLE":
+					self["subtitle"].setText(entry[1])
+				elif entry[0] == "BOTTOM":
+					self["bottom"].setText(entry[1])
+				elif entry[0] == "TEXT":
+					self.addEntry(list, entry)
 		self.updateList(list)
 
 	def TimerCheck(self):
-
 		if self.action == 0:			#reset
 			self.closeMmi()
 		if self.action == 1:			#init
@@ -168,76 +215,25 @@ class CiMmi(Screen):
 			self.showScreen()
 			
 		#FIXME: check for mmi-session closed	
-			
-	def __init__(self, session, slotid, action):
-		Screen.__init__(self, session)
-		
-		print "ciMMI with action" + str(action)
-
-		self.slotid = slotid
-
-		self.Timer = eTimer()
-		self.Timer.timeout.get().append(self.TimerCheck)
-		self.Timer.start(1000)
-
-		#else the skins fails
-		self["title"] = Label("")
-		self["subtitle"] = Label("")
-		self["bottom"] = Label("")
-		self["entries"] = MenuList([ ])
-		#self["entries"] = CiConfigList([ ])
-
-		self["actions"] = NumberActionMap(["SetupActions"],
-			{
-				"ok": self.okbuttonClick,
-				"cancel": self.keyCancel,
-				#for PIN
-				"left": self.keyLeft,
-				"right": self.keyRight,
-				"1": self.keyNumberGlobal,
-				"2": self.keyNumberGlobal,
-				"3": self.keyNumberGlobal,
-				"4": self.keyNumberGlobal,
-				"5": self.keyNumberGlobal,
-				"6": self.keyNumberGlobal,
-				"7": self.keyNumberGlobal,
-				"8": self.keyNumberGlobal,
-				"9": self.keyNumberGlobal,
-				"0": self.keyNumberGlobal
-			}, -1)
-		
-		self.action = action
 
-		if action == 0:			#reset
-			eDVBCI_UI.getInstance().setReset(self.slotid)
-			self.showWait()	
-		elif action == 1:		#init
-			pass
-			self.showWait()	
-		elif action == 2:		#start MMI
-			eDVBCI_UI.getInstance().startMMI(self.slotid)
-			self.showWait()	
-		elif action == 3:		#mmi already there (called from infobar)
-			self.showScreen()	
-			
 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)
 			self.list.append( (appname, 2) )
 
-		self["entries"] .list = self.list
-		self["entries"] .l.setList(self.list)
+		self["entries"].list = self.list
+		self["entries"].l.setList(self.list)
 
 	def TimerCheck(self):
 		state = eDVBCI_UI.getInstance().getState(0)