git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
help: improve key description, a bit.
[enigma2.git]
/
lib
/
python
/
Screens
/
Ci.py
diff --git
a/lib/python/Screens/Ci.py
b/lib/python/Screens/Ci.py
index fe34f4aaf69967ca9b4febef45edde79091c4681..eb61e739a3a33b72a646fceefbb3454ce4bb0358 100644
(file)
--- a/
lib/python/Screens/Ci.py
+++ b/
lib/python/Screens/Ci.py
@@
-17,6
+17,10
@@
class CiWait(Screen):
def cancel(self):
#stop pending requests
self.Timer.stop()
def cancel(self):
#stop pending requests
self.Timer.stop()
+
+ if self.lastQuery == 2:
+ eDVBCI_UI.getInstance().stopMMI(self.slot)
+
self.close()
def TimerCheck(self):
self.close()
def TimerCheck(self):
@@
-25,11
+29,14
@@
class CiWait(Screen):
self.cancel()
elif self.lastQuery == 1:
self.cancel()
self.cancel()
elif self.lastQuery == 1:
self.cancel()
+ else:
+ if eDVBCI_UI.getInstance().getState(self.slot) != 2: #module removed
+ self.cancel()
def __init__(self, session, slot, query):
Screen.__init__(self, session)
def __init__(self, session, slot, query):
Screen.__init__(self, session)
- self["message"] = Label(
"waiting for CI..."
)
+ self["message"] = Label(
_("waiting for CI...")
)
self["actions"] = ActionMap(["OkCancelActions"],
{
self["actions"] = ActionMap(["OkCancelActions"],
{
@@
-37,21
+44,24
@@
class CiWait(Screen):
})
self.lastQuery = query
})
self.lastQuery = query
+ self.slot = slot
self.Timer = eTimer()
self.Timer.timeout.get().append(self.TimerCheck)
self.Timer = eTimer()
self.Timer.timeout.get().append(self.TimerCheck)
+ self.Timer.start(1000) #check and block 1 second
if query == 0: #reset
if query == 0: #reset
- self.Timer.start(1000) #block 1 second
print "reset"
print "reset"
- eDVBCI_UI.getInstance().setReset(
0
)
+ eDVBCI_UI.getInstance().setReset(
slot
)
if query == 1: #init
if query == 1: #init
- self.Timer.start(1000) #block 1 second
print "init"
print "init"
+ eDVBCI_UI.getInstance().initialize(slot)
if query == 2: #mmi-open
print "mmi open"
if query == 2: #mmi-open
print "mmi open"
+ eDVBCI_UI.getInstance().startMMI(slot)
if query == 3: #mmi-answer
print "mmi answer"
if query == 3: #mmi-answer
print "mmi answer"
+ eDVBCI_UI.getInstance().answerMMI(slot, 0, 0)
class CiEntryList(HTMLComponent, GUIComponent):
class CiEntryList(HTMLComponent, GUIComponent):