X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/eb2804ab0205fd9204cd745feb840fdb4bc56216..baa6968ed152a4e78ba27e3e48364a6b62680db2:/lib/python/Screens/Ci.py diff --git a/lib/python/Screens/Ci.py b/lib/python/Screens/Ci.py index 0c82aa55..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, ConfigDummy +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"], { @@ -71,18 +66,17 @@ 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], ConfigNothing(), entry[2]) ) if entry[0] == "PIN": - self.pinlength = entry[1] + pinlength = entry[1] if entry[3] == 1: # masked pins: - x = ConfigPIN(len = self.pinlength, censor = "*") + x = ConfigPIN(0, len = pinlength, censor = "*") else: # unmasked pins: - x = ConfigPIN(len = self.pinlength) + x = ConfigPIN(0, len = pinlength) self["subtitle"].setText(entry[2]) - self.pin = getConfigListEntry("", x) - list.append( self.pin ) + list.append( getConfigListEntry("", x) ) self["bottom"].setText(_("please press OK when ready")) def okbuttonClick(self): @@ -95,7 +89,7 @@ class CiMmi(Screen): print "answer MENU" cur = self["entries"].getCurrent() if cur: - eDVBCI_UI.getInstance().answerMenu(self.slotid, cur[1]) + eDVBCI_UI.getInstance().answerMenu(self.slotid, cur[2]) else: eDVBCI_UI.getInstance().answerMenu(self.slotid, 0) self.showWait() @@ -104,9 +98,10 @@ class CiMmi(Screen): eDVBCI_UI.getInstance().answerMenu(self.slotid, 0) self.showWait() elif self.tag == "ENQ": - answer = str(self.pin[1].parent.value[0]) + cur = self["entries"].getCurrent() + answer = str(cur[1].value) length = len(answer) - while length < self.pinlength: + while length < cur[1].getLength(): answer = '0'+answer length+=1 eDVBCI_UI.getInstance().answerEnq(self.slotid, answer) @@ -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: @@ -309,17 +296,17 @@ class CiSelection(Screen): def appendEntries(self, slot, state): self.state[slot] = state - self.list.append( (_("Reset"), ConfigDummy(), 0, slot) ) - self.list.append( (_("Init"), ConfigDummy(), 1, slot) ) + self.list.append( (_("Reset"), ConfigNothing(), 0, slot) ) + self.list.append( (_("Init"), ConfigNothing(), 1, slot) ) if self.state[slot] == 0: #no module - self.list.append( (_("no module found"), ConfigDummy(), 2, slot) ) + self.list.append( (_("no module found"), ConfigNothing(), 2, slot) ) elif self.state[slot] == 1: #module in init - self.list.append( (_("init module"), ConfigDummy(), 2, slot) ) + self.list.append( (_("init module"), ConfigNothing(), 2, slot) ) elif self.state[slot] == 2: #module ready #get appname appname = eDVBCI_UI.getInstance().getAppName(slot) - self.list.append( (appname, ConfigDummy(), 2, slot) ) + self.list.append( (appname, ConfigNothing(), 2, slot) ) self.list.append(getConfigListEntry(_("Multiple service support"), config.ci[slot].canDescrambleMultipleServices)) @@ -328,20 +315,20 @@ 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 slotidx += 1 # do not change Init if state == 0: #no module - self.list[slotidx] = (_("no module found"), ConfigDummy(), 2, slot) + self.list[slotidx] = (_("no module found"), ConfigNothing(), 2, slot) elif state == 1: #module in init - self.list[slotidx] = (_("init module"), ConfigDummy(), 2, slot) + self.list[slotidx] = (_("init module"), ConfigNothing(), 2, slot) elif state == 2: #module ready #get appname appname = eDVBCI_UI.getInstance().getAppName(slot) - self.list[slotidx] = (appname, ConfigDummy(), 2, slot) + self.list[slotidx] = (appname, ConfigNothing(), 2, slot) lst = self["entries"] lst.list = self.list