config rewrite. some extensions still need to be updated.
[enigma2.git] / lib / python / Screens / Ci.py
index 10e33cfe361a89cca03f9907d8050723f1aece45..f43ce0e03a078ba5cc81e33533d9b2d52fa0d1a7 100644 (file)
@@ -8,13 +8,20 @@ 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
 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():
+       config.ci = ConfigSubList()
+       for slot in range(MAX_NUM_CI):
+               config.ci.append(ConfigSubsection())
+               config.ci[slot].canDescrambleMultipleServices = ConfigSelection(choices = [("auto", _("Auto")), ("no", _("No")), ("yes", _("Yes"))], default = "auto")
 
 class CiMmi(Screen):
        def __init__(self, session, slotid, action):
@@ -22,6 +29,7 @@ class CiMmi(Screen):
 
                print "ciMMI with action" + str(action)
 
+               self.tag = None
                self.slotid = slotid
 
                self.timer = eTimer()
@@ -68,17 +76,19 @@ class CiMmi(Screen):
                        self.pinlength = entry[1]
                        if entry[3] == 1:
                                # masked pins:
-                               x = configElement_nonSave("", configSequence, [1234], configsequencearg.get("PINCODE", (self.pinlength, "*")))
-                       else:                           
+                               x = ConfigPIN(len = self.pinlength, censor = "*")
+                       else:
                                # unmasked pins:
-                               x = configElement_nonSave("", configSequence, [1234], configsequencearg.get("PINCODE", (self.pinlength, "")))
+                               x = ConfigPIN(len = self.pinlength)
                        self["subtitle"].setText(entry[2])
-                       self.pin = getConfigListEntry("",x)
+                       self.pin = getConfigListEntry("", x)
                        list.append( self.pin )
                        self["bottom"].setText(_("please press OK when ready"))
 
        def okbuttonClick(self):
                self.timer.stop()
+               if not self.tag:
+                       return
                if self.tag == "WAIT":
                        print "do nothing - wait"
                elif self.tag == "MENU":
@@ -108,6 +118,8 @@ class CiMmi(Screen):
 
        def keyCancel(self):
                self.timer.stop()
+               if not self.tag:
+                       return
                if self.tag == "WAIT":
                        eDVBCI_UI.getInstance().stopMMI(self.slotid)
                        self.closeMmi()
@@ -131,15 +143,15 @@ class CiMmi(Screen):
 
        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"]
@@ -149,7 +161,7 @@ class CiMmi(Screen):
                        List.l.setList(list)
                        return
 
-               if self.tag == "ENQ":
+               if self.tag and self.tag == "ENQ":
                        type = TYPE_CONFIG
                else:
                        type = TYPE_MENU
@@ -259,28 +271,47 @@ class CiSelection(Screen):
        def __init__(self, session):
                Screen.__init__(self, session)
 
-               self["actions"] = ActionMap(["OkCancelActions"],
+               self["actions"] = ActionMap(["OkCancelActions", "CiSelectionActions"],
                        {
+                               "left": self.keyLeft,
+                               "right": self.keyLeft,
                                "ok": self.okbuttonClick,
                                "cancel": self.cancel
-                       })
+                       },-1)
 
                self.dlg = None
                self.state = { }
                self.list = [ ]
-               self["entries"] = MenuList(list)
-               self.clearMenu()
-               self.createMenu(0) # FIXME more than one CI
-               CiHandler.registerCIMessageHandler(0, self.ciStateChanged)
 
-       def clearMenu(self):
-               self.list = [ ]
+               for slot in range(MAX_NUM_CI):
+                       state = eDVBCI_UI.getInstance().getState(slot)
+                       if state != -1:
+                               self.appendEntries(slot, state)
+                               CiHandler.registerCIMessageHandler(slot, self.ciStateChanged)
+
+               menuList = ConfigList(list)
+               menuList.list = self.list
+               menuList.l.setList(self.list)
+               self["entries"] = menuList
+
+       def keyConfigEntry(self, key):
+               try:
+                       self["entries"].handleKey(key)
+                       self["entries"].getCurrent()[1].save()
+               except:
+                       pass
+
+       def keyLeft(self):
+               self.keyConfigEntry(KEY_LEFT)
 
-       def createMenu(self, slot):
+       def keyRight(self):
+               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.state[slot] = eDVBCI_UI.getInstance().getState(slot)
                if self.state[slot] == 0:                       #no module
                        self.list.append( (_("no module found"), 2, slot) )
                elif self.state[slot] == 1:             #module in init
@@ -290,8 +321,31 @@ class CiSelection(Screen):
                        appname = eDVBCI_UI.getInstance().getAppName(slot)
                        self.list.append( (appname, 2, slot) )
 
-               self["entries"].list = self.list
-               self["entries"].l.setList(self.list)
+               self.list.append(getConfigListEntry(_("Multiple service support"), config.ci[slot].canDescrambleMultipleServices))
+
+       def updateState(self, slot):
+               state = eDVBCI_UI.getInstance().getState(slot)
+               self.state[slot] = state
+
+               slotidx=0
+               while self.list[slotidx][2] != 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)
+               elif state == 1:                #module in init
+                       self.list[slotidx] = (_("init module"), 2, slot)
+               elif state == 2:                #module ready
+                       #get appname
+                       appname = eDVBCI_UI.getInstance().getAppName(slot)
+                       self.list[slotidx] = (appname, 2, slot)
+
+               lst = self["entries"]
+               lst.list = self.list
+               lst.l.setList(self.list)
 
        def ciStateChanged(self, slot):
                if self.dlg:
@@ -301,15 +355,14 @@ class CiSelection(Screen):
                        if self.state[slot] != state:
                                #print "something happens"
                                self.state[slot] = state
-                               self.clearMenu()
-                               self.createMenu(slot)
+                               self.updateState(slot)
 
        def dlgClosed(self, slot):
                self.dlg = None
 
        def okbuttonClick(self):
                cur = self["entries"].getCurrent()
-               if cur:
+               if cur and len(cur) > 2:
                        action = cur[1]
                        slot = cur[2]
                        if action == 0:         #reset
@@ -319,13 +372,6 @@ class CiSelection(Screen):
                        elif self.state[slot] == 2:
                                self.dlg = self.session.openWithCallback(self.dlgClosed, CiMmi, slot, action)
 
-               #generate menu / list
-               #list = [ ]
-               #list.append( ("TEXT", "CA-Info") )
-               #list.append( ("TEXT", "Card Status") )
-               #list.append( ("PIN", 6, "Card Pin", 1) )
-               #self.session.open(CiMmi, 0, 0, "Wichtiges CI", "Mainmenu", "Footer", list)
-
        def cancel(self):
                CiHandler.unregisterCIMessageHandler(0)
                self.close()