some python import cleanups

[vuplus_dvbapp] / lib / python / Screens / Ci.py

diff --git a/lib/python/Screens/Ci.py b/lib/python/Screens/Ci.py
index f43ce0e..27ca5aa 100644 (file)
--- 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
+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):
@@ -289,7 +269,7 @@ class CiSelection(Screen):
                                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
@@ -309,17 +289,17 @@ class CiSelection(Screen):
 
        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))
 
@@ -335,13 +315,13 @@ class CiSelection(Screen):
                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
@@ -363,8 +343,8 @@ class CiSelection(Screen):
        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