-from Screen import *
-from Components.MenuList import MenuList
+from Screen import Screen
from Components.ActionMap import ActionMap
from Components.ActionMap import NumberActionMap
-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 *
+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
+from enigma import eTimer, eDVBCI_UI
-TYPE_MENU = 0
-TYPE_CONFIG = 1
MAX_NUM_CI = 4
def InitCiConfig():
- config.ci = [ ]
+ config.ci = ConfigSubList()
for slot in range(MAX_NUM_CI):
config.ci.append(ConfigSubsection())
- config.ci[slot].canDescrambleMultipleServices = configElement("config.ci%d.canDescrambleMultipleServices"%(slot), configSelection, 0, (("auto", _("Auto")), ("no", _("No")), ("yes", _("Yes"))))
+ config.ci[slot].canDescrambleMultipleServices = ConfigSelection(choices = [("auto", _("Auto")), ("no", _("No")), ("yes", _("Yes"))], default = "auto")
class CiMmi(Screen):
def __init__(self, session, slotid, action):
self["subtitle"] = Label("")
self["bottom"] = Label("")
self["entries"] = ConfigList([ ])
- self.listtype = TYPE_CONFIG
self["actions"] = NumberActionMap(["SetupActions"],
{
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 = configElement_nonSave("", configSequence, [1234], configsequencearg.get("PINCODE", (self.pinlength, "*")))
- else:
+ x = ConfigPIN(0, len = pinlength, censor = "*")
+ else:
# unmasked pins:
- x = configElement_nonSave("", configSequence, [1234], configsequencearg.get("PINCODE", (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):
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()
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)
def keyNumberGlobal(self, number):
self.timer.stop()
- self.keyConfigEntry(config.key[str(number)])
+ self.keyConfigEntry(KEY_0 + number)
def keyLeft(self):
self.timer.stop()
- self.keyConfigEntry(config.key["prevElement"])
+ self.keyConfigEntry(KEY_LEFT)
def keyRight(self):
self.timer.stop()
- self.keyConfigEntry(config.key["nextElement"])
+ self.keyConfigEntry(KEY_RIGHT)
def updateList(self, list):
List = self["entries"]
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):
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):
elif eDVBCI_UI.getInstance().availableMMI(slot) == 1:
if self.session:
self.dlgs[slot] = self.session.openWithCallback(self.dlgClosed, CiMmi, slot, 3)
- else:
- 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)
class CiSelection(Screen):
def __init__(self, session):
Screen.__init__(self, session)
-
self["actions"] = ActionMap(["OkCancelActions", "CiSelectionActions"],
{
"left": self.keyLeft,
self.appendEntries(slot, state)
CiHandler.registerCIMessageHandler(slot, self.ciStateChanged)
- menuList = ConfigList(list)
+ menuList = ConfigList(self.list)
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:
pass
def keyLeft(self):
- self.keyConfigEntry(config.key["prevElement"])
+ self.keyConfigEntry(KEY_LEFT)
def keyRight(self):
- self.keyConfigEntry(config.key["nextElement"])
+ self.keyConfigEntry(KEY_RIGHT)
def appendEntries(self, slot, state):
self.state[slot] = state
- self.list.append( (_("Reset"), 0, slot) )
- self.list.append( (_("Init"), 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"), 2, slot) )
+ self.list.append( (_("no module found"), ConfigNothing(), 2, slot) )
elif self.state[slot] == 1: #module in init
- self.list.append( (_("init module"), 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, 2, slot) )
+ self.list.append( (appname, ConfigNothing(), 2, slot) )
self.list.append(getConfigListEntry(_("Multiple service support"), config.ci[slot].canDescrambleMultipleServices))
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"), 2, slot)
+ self.list[slotidx] = (_("no module found"), ConfigNothing(), 2, slot)
elif state == 1: #module in init
- self.list[slotidx] = (_("init module"), 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, 2, slot)
+ self.list[slotidx] = (appname, ConfigNothing(), 2, slot)
lst = self["entries"]
lst.list = self.list
def okbuttonClick(self):
cur = self["entries"].getCurrent()
if cur and len(cur) > 2:
- action = cur[1]
- slot = cur[2]
+ action = cur[2]
+ slot = cur[3]
if action == 0: #reset
eDVBCI_UI.getInstance().setReset(slot)
elif action == 1: #init
self.dlg = self.session.openWithCallback(self.dlgClosed, CiMmi, slot, action)
def cancel(self):
- CiHandler.unregisterCIMessageHandler(0)
+ for slot in range(MAX_NUM_CI):
+ state = eDVBCI_UI.getInstance().getState(slot)
+ if state != -1:
+ CiHandler.unregisterCIMessageHandler(slot)
self.close()
git.cweiske.de / enigma2.git / blobdiff