config rewrite. some extensions still need to be updated.

[enigma2.git] / lib / python / Screens / Ci.py

diff --git a/lib/python/Screens/Ci.py b/lib/python/Screens/Ci.py
index b3653d214c2a5a95f620bdacd4bf3e7ed375667a..f43ce0e03a078ba5cc81e33533d9b2d52fa0d1a7 100644 (file)
--- a/lib/python/Screens/Ci.py
+++ b/lib/python/Screens/Ci.py
@@ -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):
@@ -69,12 +76,12 @@ 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"))
 
@@ -136,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"]
@@ -264,26 +271,42 @@ 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 = [ ]
 
-               for slot in range(4):
+               for slot in range(MAX_NUM_CI):
                        state = eDVBCI_UI.getInstance().getState(slot)
-                       self.appendEntries(slot, state) # FIXME more than one CI
-                       CiHandler.registerCIMessageHandler(slot, self.ciStateChanged)
+                       if state != -1:
+                               self.appendEntries(slot, state)
+                               CiHandler.registerCIMessageHandler(slot, self.ciStateChanged)
 
-               menuList = MenuList(list)
+               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 keyRight(self):
+               self.keyConfigEntry(KEY_RIGHT)
+
        def appendEntries(self, slot, state):
                self.state[slot] = state
                self.list.append( (_("Reset"), 0, slot) )
@@ -298,6 +321,8 @@ class CiSelection(Screen):
                        appname = eDVBCI_UI.getInstance().getAppName(slot)
                        self.list.append( (appname, 2, slot) )
 
+               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
@@ -337,7 +362,7 @@ class CiSelection(Screen):
 
        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