X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/c8dc5e272fc58cfb213d0309fab4cbafa1dad58c..90d9f3e7624282749eb59b57d4996f5d1d06c6b1:/lib/python/Screens/Ci.py diff --git a/lib/python/Screens/Ci.py b/lib/python/Screens/Ci.py index 66f4c730..9fe7d854 100644 --- a/lib/python/Screens/Ci.py +++ b/lib/python/Screens/Ci.py @@ -12,52 +12,7 @@ from Components.config import * from enigma import * -#use this class to synchronize all ci to/from user communications -class CiWait(Screen): - def cancel(self): - #stop pending requests - self.Timer.stop() - self.close() - - def TimerCheck(self): - #special cases to prevent to fast resets/inits - if self.lastQuery == 0: - self.cancel() - elif self.lastQuery == 1: - self.cancel() - - def __init__(self, session, slot, query): - Screen.__init__(self, session) - - self["message"] = Label(_("waiting for CI...")) - - self["actions"] = ActionMap(["OkCancelActions"], - { - "cancel": self.cancel - }) - - self.lastQuery = query - - self.Timer = eTimer() - self.Timer.timeout.get().append(self.TimerCheck) - - if query == 0: #reset - self.Timer.start(1000) #block 1 second - print "reset" - eDVBCI_UI.getInstance().setReset(slot) - if query == 1: #init - self.Timer.start(1000) #block 1 second - print "init" - eDVBCI_UI.getInstance().initialize(slot) - if query == 2: #mmi-open - print "mmi open" - eDVBCI_UI.getInstance().startMMI(slot) - if query == 3: #mmi-answer - print "mmi answer" - eDVBCI_UI.getInstance().answerMMI(slot, 0, 0) - - -class CiEntryList(HTMLComponent, GUIComponent): +class CiConfigList(HTMLComponent, GUIComponent): def __init__(self, list): GUIComponent.__init__(self) self.l = eListboxPythonConfigContent() @@ -66,28 +21,27 @@ class CiEntryList(HTMLComponent, GUIComponent): self.list = list def toggle(self): - selection = self.getCurrent() - selection[1].toggle() - self.invalidateCurrent() + pass def handleKey(self, key): - #not every element got an .handleKey - try: - selection = self.getCurrent() - selection[1].handleKey(key) - self.invalidateCurrent() - except: - pass + selection = self.getCurrent() + selection[1].handleKey(key) + self.invalidateCurrent() def getCurrent(self): return self.l.getCurrentSelection() - def getCurrentIndex(self): - return self.l.getCurrentSelectionIndex() - def invalidateCurrent(self): self.l.invalidateEntry(self.l.getCurrentSelectionIndex()) + def invalidate(self, entry): + i = 0 + for x in self.list: + if (entry.getConfigPath() == x[1].parent.getConfigPath()): + self.l.invalidateEntry(i) + i += 1 + pass + def GUIcreate(self, parent): self.instance = eListbox(parent) self.instance.setContent(self.l) @@ -97,9 +51,10 @@ class CiEntryList(HTMLComponent, GUIComponent): self.instance = None class CiMmi(Screen): - def addEntry(self, list, entry, index): + def addEntry(self, list, entry): if entry[0] == "TEXT": #handle every item (text / pin only?) - list.append( (entry[1], index) ) + #list.append( (entry[1], entry[2]) ) + list.append( (entry[1], entry[2]) ) if entry[0] == "PIN": if entry[3] == 1: # masked pins: @@ -107,22 +62,48 @@ class CiMmi(Screen): else: # unmasked pins: x = configElement_nonSave("", configSequence, [1234], configsequencearg.get("PINCODE", (entry[1], ""))) - - self.pin = getConfigListEntry(entry[2],x) + + list.append( (entry[2], 0) ) + self.pin = getConfigListEntry("",x) list.append( self.pin ) def okbuttonClick(self): - if self.tag == 0: #ENQ - print "enq- answer pin:" + str(self.pin[1].parent.value[0]) - #ci[self.slotid]->getInstance().mmiEnqAnswer(self.pin[1].parent.value[0]) - elif self.tag == 1: #Menu - print "answer - actual:" + str(self["entries"].getCurrentIndex()) - #ci[self.slotid]->getInstance().mmiAnswer(self["entries"].getCurrentIndex()) - elif self.tag == 2: #List - print "answer on List - send 0" - #ci[self.slotid]->getInstance().mmiAnswer(0) + print "ok" + if self.tag == "WAIT": + print "do nothing - wait" + elif self.tag == "MENU": + print "answer MENU" + eDVBCI_UI.getInstance().answerMenu(self.slotid, self["entries"].getCurrent()[1]) + self.showWait() + elif self.tag == "LIST": + print "answer LIST" + eDVBCI_UI.getInstance().answerMenu(self.slotid, 0) + self.showWait() + elif self.tag == "ENQ": + print "answer ENQ" + eDVBCI_UI.getInstance().answerEnq(self.slotid, str(self.pin[1].parent.value)) + self.showWait() + + def closeMmi(self): + self.Timer.stop() self.close() + def keyCancel(self): + print "keyCancel" + if self.tag == "WAIT": + self.closeMmi() + elif self.tag == "MENU": + eDVBCI_UI.getInstance().answerMenu(self.slotid, 0) + self.showWait() + elif self.tag == "LIST": + eDVBCI_UI.getInstance().answerMenu(self.slotid, 0) + self.showWait() + elif self.tag == "ENQ": + eDVBCI_UI.getInstance().cancelEnq(self.slotid) + self.showWait() + else: + print "give cancel action to ci" + def keyNumberGlobal(self, number): self["entries"].handleKey(config.key[str(number)]) @@ -132,26 +113,78 @@ class CiMmi(Screen): def keyRight(self): self["entries"].handleKey(config.key["nextElement"]) - def keyCancel(self): - print "keyCancel" - self.close() + def updateList(self, list): + self["entries"].list = list + self["entries"].l.setList(list) + + def showWait(self): + self.tag = "WAIT" + self["title"].setText("") + self["subtitle"].setText("") + self["bottom"].setText("") + list = [ ] + list.append( ("wait for ci...", 0) ) + self.updateList(list) - #tag is 0=ENQ 1=Menu 2=List - def __init__(self, session, slotid, tag, title, subtitle, bottom, entries): + def showScreen(self): + screen = eDVBCI_UI.getInstance().getMMIScreen(self.slotid) + + list = [ ] + + self.tag = screen[0][0] + + for entry in screen: + if entry[0] == "TITLE": + self["title"].setText(entry[1]) + elif entry[0] == "SUBTITLE": + self["subtitle"].setText(entry[1]) + elif entry[0] == "BOTTOM": + self["bottom"].setText(entry[1]) + elif entry[0] == "TEXT": + self.addEntry(list, entry) + elif entry[0] == "PIN": + self.addEntry(list, entry) + + self.updateList(list) + + def TimerCheck(self): + + if self.action == 0: #reset + self.closeMmi() + if self.action == 1: #init + self.closeMmi() + + #module still there ? + if eDVBCI_UI.getInstance().getState(self.slotid) != 2: + self.closeMmi() + + #mmi session still active ? + if eDVBCI_UI.getInstance().getMMIState(self.slotid) != 1: + self.closeMmi() + + #new screen available? + if eDVBCI_UI.getInstance().availableMMI(self.slotid) == 1: + self.showScreen() + + #FIXME: check for mmi-session closed + + def __init__(self, session, slotid, action): Screen.__init__(self, session) + + print "ciMMI with action" + str(action) self.slotid = slotid - self.tag = tag - self["title"] = Label(title) - self["subtitle"] = Label(subtitle) - self["bottom"] = Label(bottom) - - list = [ ] - cnt = 0 - for entry in entries: - self.addEntry(list, entry, cnt) - cnt = cnt + 1 - self["entries"] = CiEntryList(list) + + self.Timer = eTimer() + self.Timer.timeout.get().append(self.TimerCheck) + self.Timer.start(1000) + + #else the skins fails + self["title"] = Label("") + self["subtitle"] = Label("") + self["bottom"] = Label("") + self["entries"] = MenuList([ ]) + #self["entries"] = CiConfigList([ ]) self["actions"] = NumberActionMap(["SetupActions"], { @@ -171,8 +204,21 @@ class CiMmi(Screen): "9": self.keyNumberGlobal, "0": self.keyNumberGlobal }, -1) - - + + self.action = action + + if action == 0: #reset + eDVBCI_UI.getInstance().setReset(self.slotid) + self.showWait() + elif action == 1: #init + pass + self.showWait() + elif action == 2: #start MMI + eDVBCI_UI.getInstance().startMMI(self.slotid) + self.showWait() + elif action == 3: #mmi already there (called from infobar) + self.showScreen() + class CiSelection(Screen): def createMenu(self): self.list = [ ] @@ -195,14 +241,15 @@ class CiSelection(Screen): def TimerCheck(self): state = eDVBCI_UI.getInstance().getState(0) if self.state != state: - print "something happens" + #print "something happens" self.state = state self.createMenu() def okbuttonClick(self): + self.slot = 0 + if self.state == 2: - #FIXME: find out the correct slot - self.session.open(CiWait, 0, self["entries"].getCurrent()[1]) + self.session.open(CiMmi, 0, self["entries"].getCurrent()[1]) #generate menu / list #list = [ ] @@ -226,7 +273,7 @@ class CiSelection(Screen): }) self.list = [ ] - self["entries"] = CiEntryList(list) + self["entries"] = MenuList(list) self.createMenu() self.Timer = eTimer()