git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mmi support
[enigma2.git]
/
lib
/
python
/
Screens
/
InfoBarGenerics.py
diff --git
a/lib/python/Screens/InfoBarGenerics.py
b/lib/python/Screens/InfoBarGenerics.py
index d9c42bdb3175a209d0b0efbd983f097c403a66bd..b88327294087fb625bbe31d0207c996247858990 100644
(file)
--- a/
lib/python/Screens/InfoBarGenerics.py
+++ b/
lib/python/Screens/InfoBarGenerics.py
@@
-1,5
+1,5
@@
from Screen import Screen
from Screen import Screen
-from Components.ActionMap import ActionMap
+from Components.ActionMap import ActionMap
, HelpableActionMap
from Components.ActionMap import NumberActionMap
from Components.Label import Label
from Components.config import configfile, configsequencearg
from Components.ActionMap import NumberActionMap
from Components.Label import Label
from Components.config import configfile, configsequencearg
@@
-96,11
+96,16
@@
class InfoBarShowHide:
"hide": self.hide,
})
"hide": self.hide,
})
- self.state = self.STATE_HIDDEN
+ self.state = self.STATE_SHOWN
+
+ self.onClose.append(self.delHideTimer)
self.hideTimer = eTimer()
self.hideTimer.timeout.get().append(self.doTimerHide)
self.hideTimer = eTimer()
self.hideTimer.timeout.get().append(self.doTimerHide)
- #self.hideTimer.start(1000)
+ self.hideTimer.start(1000)
+
+ def delHideTimer(self):
+ del self.hideTimer
def hide(self):
self.instance.hide()
def hide(self):
self.instance.hide()
@@
-179,10
+184,12
@@
class InfoBarPowerKey:
def __init__(self):
self.powerKeyTimer = eTimer()
self.powerKeyTimer.timeout.get().append(self.powertimer)
def __init__(self):
self.powerKeyTimer = eTimer()
self.powerKeyTimer.timeout.get().append(self.powertimer)
- self["PowerKeyActions"] =
ActionMap( ["PowerKeyActions"]
,
+ self["PowerKeyActions"] =
HelpableActionMap(self, "PowerKeyActions"
,
{
"powerdown": self.powerdown,
"powerup": self.powerup,
{
"powerdown": self.powerdown,
"powerup": self.powerup,
+ "discreteStandby": (self.standby, "Go standby"),
+ "discretePowerOff": (self.quit, "Go to deep standby"),
})
def powertimer(self):
})
def powertimer(self):
@@
-197,10
+204,14
@@
class InfoBarPowerKey:
self.powerKeyTimer.stop()
if self.standbyblocked == 0:
self.standbyblocked = 1
self.powerKeyTimer.stop()
if self.standbyblocked == 0:
self.standbyblocked = 1
- self.session.open(Standby, self)
+ self.standby()
+
+ def standby(self):
+ self.session.open(Standby, self)
def quit(self):
def quit(self):
- quitMainloop(0)
+ # halt
+ quitMainloop(1)
class InfoBarNumberZap:
""" Handles an initial number for NumberZapping """
class InfoBarNumberZap:
""" Handles an initial number for NumberZapping """
@@
-235,12
+246,12
@@
class InfoBarChannelSelection:
#instantiate forever
self.servicelist = self.session.instantiateDialog(ChannelSelection)
#instantiate forever
self.servicelist = self.session.instantiateDialog(ChannelSelection)
- self["ChannelSelectActions"] =
ActionMap( ["InfobarChannelSelection"]
,
+ self["ChannelSelectActions"] =
HelpableActionMap(self, "InfobarChannelSelection"
,
{
"switchChannelUp": self.switchChannelUp,
"switchChannelDown": self.switchChannelDown,
{
"switchChannelUp": self.switchChannelUp,
"switchChannelDown": self.switchChannelDown,
- "zapUp":
self.zapUp
,
- "zapDown":
self.zapDown
,
+ "zapUp":
(self.zapUp, _("next channel"))
,
+ "zapDown":
(self.zapDown, _("previous channel"))
,
})
def switchChannelUp(self):
})
def switchChannelUp(self):
@@
-262,9
+273,9
@@
class InfoBarChannelSelection:
class InfoBarMenu:
""" Handles a menu action, to open the (main) menu """
def __init__(self):
class InfoBarMenu:
""" Handles a menu action, to open the (main) menu """
def __init__(self):
- self["MenuActions"] =
ActionMap( [ "InfobarMenuActions" ]
,
+ self["MenuActions"] =
HelpableActionMap(self, "InfobarMenuActions"
,
{
{
- "mainMenu":
self.mainMenu
,
+ "mainMenu":
(self.mainMenu, "Enter main menu...")
,
})
def mainMenu(self):
})
def mainMenu(self):
@@
-276,9
+287,9
@@
class InfoBarMenu:
class InfoBarEPG:
""" EPG - Opens an EPG list when the showEPGList action fires """
def __init__(self):
class InfoBarEPG:
""" EPG - Opens an EPG list when the showEPGList action fires """
def __init__(self):
- self["EPGActions"] =
ActionMap( [ "InfobarEPGActions" ]
,
+ self["EPGActions"] =
HelpableActionMap(self, "InfobarEPGActions"
,
{
{
- "showEPGList":
self.showEPGList
,
+ "showEPGList":
(self.showEPGList, _("show EPG..."))
,
})
def showEPGList(self):
})
def showEPGList(self):
@@
-329,13
+340,13
@@
class InfoBarServiceName:
class InfoBarPVR:
"""handles PVR specific actions like seeking, pause"""
def __init__(self):
class InfoBarPVR:
"""handles PVR specific actions like seeking, pause"""
def __init__(self):
- self["PVRActions"] =
ActionMap( [ "InfobarPVRActions" ]
,
+ self["PVRActions"] =
HelpableActionMap(self, "InfobarPVRActions"
,
{
{
- "pauseService":
self.pauseService
,
- "unPauseService":
self.unPauseService
,
+ "pauseService":
(self.pauseService, "pause")
,
+ "unPauseService":
(self.unPauseService, "continue")
,
- "seekFwd":
self.seekFwd
,
- "seekBack":
self.seekBack
,
+ "seekFwd":
(self.seekFwd, "skip forward")
,
+ "seekBack":
(self.seekBack, "skip backward")
,
})
def pauseService(self):
})
def pauseService(self):
@@
-364,9
+375,9
@@
class InfoBarInstantRecord:
"""Instant Record - handles the instantRecord action in order to
start/stop instant records"""
def __init__(self):
"""Instant Record - handles the instantRecord action in order to
start/stop instant records"""
def __init__(self):
- self["InstnantRecordActions"] =
ActionMap( [ "InfobarInstantRecord" ]
,
+ self["InstnantRecordActions"] =
HelpableActionMap(self, "InfobarInstantRecord"
,
{
{
- "instantRecord":
self.instantRecord
,
+ "instantRecord":
(self.instantRecord, "Instant Record...")
,
})
self.recording = None
})
self.recording = None
@@
-416,9
+427,9
@@
from Screens.AudioSelection import AudioSelection
class InfoBarAudioSelection:
def __init__(self):
class InfoBarAudioSelection:
def __init__(self):
- self["AudioSelectionAction"] =
ActionMap( [ "InfobarAudioSelectionActions" ]
,
+ self["AudioSelectionAction"] =
HelpableActionMap(self, "InfobarAudioSelectionActions"
,
{
{
- "audioSelection":
self.audioSelection
,
+ "audioSelection":
(self.audioSelection, "Audio Options...")
,
})
def audioSelection(self):
})
def audioSelection(self):