git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more generic Components/Network.py for allowing other interface names (thx to Reichi)
[enigma2.git]
/
lib
/
python
/
Screens
/
InfoBarGenerics.py
diff --git
a/lib/python/Screens/InfoBarGenerics.py
b/lib/python/Screens/InfoBarGenerics.py
index 2c2b4a5b684428c74489953e3e2ed91895d20a7b..c7fce347f88a330342041e607d394f159cdb8e4b 100644
(file)
--- a/
lib/python/Screens/InfoBarGenerics.py
+++ b/
lib/python/Screens/InfoBarGenerics.py
@@
-66,7
+66,7
@@
class InfoBarShowHide:
{
"toggleShow": self.toggleShow,
"hide": self.hide,
{
"toggleShow": self.toggleShow,
"hide": self.hide,
- }
)
+ }
, 1) # lower prio to make it possible to override ok and cancel..
self.__state = self.STATE_SHOWN
self.__locked = 0
self.__state = self.STATE_SHOWN
self.__locked = 0
@@
-609,6
+609,8
@@
class InfoBarSeek:
}, prio=-1)
# give them a little more priority to win over color buttons
}, prio=-1)
# give them a little more priority to win over color buttons
+ self["SeekActions"].setEnabled(False)
+
self.seekstate = self.SEEK_STATE_PLAY
self.onClose.append(self.delTimer)
self.seekstate = self.SEEK_STATE_PLAY
self.onClose.append(self.delTimer)
@@
-1573,7
+1575,7
@@
class InfoBarAdditionalInfo:
self["NimB_Active"].hide()
def checkTunerState(self, service):
self["NimB_Active"].hide()
def checkTunerState(self, service):
- info = service.frontendInfo()
+ info = service
and service
.frontendInfo()
feNumber = info and info.getFrontendInfo(iFrontendInformation.frontendNumber)
if feNumber is None:
self["NimA"].hide()
feNumber = info and info.getFrontendInfo(iFrontendInformation.frontendNumber)
if feNumber is None:
self["NimA"].hide()
@@
-1587,7
+1589,7
@@
class InfoBarAdditionalInfo:
def gotServiceEvent(self, ev):
service = self.session.nav.getCurrentService()
def gotServiceEvent(self, ev):
service = self.session.nav.getCurrentService()
- if ev == iPlayableService.ev
Start
:
+ if ev == iPlayableService.ev
UpdatedInfo or ev == iPlayableService.evEnd
:
self.checkTunerState(service)
class InfoBarNotifications:
self.checkTunerState(service)
class InfoBarNotifications:
@@
-1609,6
+1611,11
@@
class InfoBarNotifications:
Notifications.notifications = Notifications.notifications[1:]
cb = n[0]
Notifications.notifications = Notifications.notifications[1:]
cb = n[0]
+
+ if n[3].has_key("onSessionOpenCallback"):
+ n[3]["onSessionOpenCallback"]()
+ del n[3]["onSessionOpenCallback"]
+
if cb is not None:
dlg = self.session.openWithCallback(cb, n[1], *n[2], **n[3])
else:
if cb is not None:
dlg = self.session.openWithCallback(cb, n[1], *n[2], **n[3])
else: