X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/f72ed2ef9ef2d6e9b53f44723a796a9d9d3a00f6..2178da99c7e612ef14cc8bb2e0798ee3dd1ebd89:/lib/python/Screens/Ci.py

diff --git a/lib/python/Screens/Ci.py b/lib/python/Screens/Ci.py
index cde68c2e..b6f315b4 100644
--- a/lib/python/Screens/Ci.py
+++ b/lib/python/Screens/Ci.py
@@ -6,15 +6,11 @@ from Components.Header import Header
 from Components.Button import Button
 from Components.Label import Label
 
-from Components.HTMLComponent import *
-from Components.GUIComponent import *
 from Components.config import config, ConfigSubsection, ConfigSelection, ConfigSubList, getConfigListEntry, KEY_LEFT, KEY_RIGHT, KEY_0, ConfigNothing, ConfigPIN
 from Components.ConfigList import ConfigList
 
 from enigma import eTimer, eDVBCI_UI, eListboxPythonStringContent, eListboxPythonConfigContent
 
-TYPE_MENU = 0
-TYPE_CONFIG = 1
 MAX_NUM_CI = 4
 
 def InitCiConfig():
@@ -40,7 +36,6 @@ class CiMmi(Screen):
 		self["subtitle"] = Label("")
 		self["bottom"] = Label("")
 		self["entries"] = ConfigList([ ])
-		self.listtype = TYPE_CONFIG
 
 		self["actions"] = NumberActionMap(["SetupActions"],
 			{
@@ -158,22 +153,7 @@ class CiMmi(Screen):
 		try:
 			List.instance.moveSelectionTo(0)
 		except:
-			List.l.setList(list)
-			return
-
-		if self.tag and 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
-
+			pass
 		List.l.setList(list)
 
 	def showWait(self):
@@ -182,7 +162,7 @@ class CiMmi(Screen):
 		self["subtitle"].setText("")
 		self["bottom"].setText("")
 		list = [ ]
-		list.append( ("wait for ci...", 0) )
+		list.append( (_("wait for ci..."), ConfigNothing()) )
 		self.updateList(list)
 
 	def showScreen(self):
@@ -255,7 +235,8 @@ class CiMessageHandler:
 					print "no session"
 
 	def dlgClosed(self, slot):
-		del self.dlgs[slot]
+		if slot in self.dlgs:
+			del self.dlgs[slot]
 
 	def registerCIMessageHandler(self, slot, func):
 		self.unregisterCIMessageHandler(slot)
@@ -293,6 +274,12 @@ class CiSelection(Screen):
 		menuList.list = self.list
 		menuList.l.setList(self.list)
 		self["entries"] = menuList
+		self["entries"].onSelectionChanged.append(self.selectionChanged)
+		self["text"] = Label(_("Slot %d")%(1))
+
+	def selectionChanged(self):
+		cur_idx = self["entries"].getCurrentIndex()
+		self["text"].setText(_("Slot %d")%((cur_idx / 4)+1))
 
 	def keyConfigEntry(self, key):
 		try:
@@ -328,7 +315,7 @@ class CiSelection(Screen):
 		self.state[slot] = state
 
 		slotidx=0
-		while self.list[slotidx][2] != slot:
+		while len(self.list[slotidx]) < 3 or self.list[slotidx][3] != slot:
 			slotidx += 1
 
 		slotidx += 1 # do not change Reset