X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/63fd3a60724b9c03a70ce847955f2aa9facb423f..c8af50a4b30d74d6ee4f8c985177e16edf58e9d1:/lib/python/Screens/InfoBarGenerics.py

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 3af52ae8..b8832729 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -1,5 +1,5 @@
 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
@@ -9,12 +9,14 @@ from ChannelSelection import ChannelSelection
 from Components.ServiceName import ServiceName
 from Components.EventInfo import EventInfo
 
+from ServiceReference import ServiceReference
 from EpgSelection import EPGSelection
 
 from Screens.MessageBox import MessageBox
 from Screens.Volume import Volume
 from Screens.Mute import Mute
 from Screens.Standby import Standby
+from Screens.EventView import EventView
 
 #from enigma import eTimer, eDVBVolumecontrol, quitMainloop
 from enigma import *
@@ -94,11 +96,16 @@ class InfoBarShowHide:
 				"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.start(1000)
+		self.hideTimer.start(1000)
+
+	def delHideTimer(self):
+		del self.hideTimer
 
 	def hide(self):	
 		self.instance.hide()
@@ -132,12 +139,11 @@ class InfoBarShowHide:
 class NumberZap(Screen):
 	def quit(self):
 		self.Timer.stop()
-		self.close()
+		self.close(0)
 
 	def keyOK(self):
 		self.Timer.stop()
-		print "do the action here"
-		self.close()
+		self.close(int(self["number"].getText()))
 
 	def keyNumberGlobal(self, number):
 		self.Timer.start(3000)		#reset timer
@@ -178,10 +184,12 @@ class InfoBarPowerKey:
 	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,
+				"discreteStandby": (self.standby, "Go standby"),
+				"discretePowerOff": (self.quit, "Go to deep standby"),
 			})
 
 	def powertimer(self):	
@@ -196,10 +204,14 @@ class InfoBarPowerKey:
 		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):
-		quitMainloop(0)
+		# halt
+		quitMainloop(1)
 
 class InfoBarNumberZap:
 	""" Handles an initial number for NumberZapping """
@@ -219,8 +231,13 @@ class InfoBarNumberZap:
 			})
 
 	def keyNumberGlobal(self, number):
-		print "You pressed number " + str(number)
-		self.session.open(NumberZap, number)
+#		print "You pressed number " + str(number)
+		self.session.openWithCallback(self.numberEntered, NumberZap, number)
+
+	def numberEntered(self, retval):
+#		print self.servicelist
+		if retval > 0:
+			self.servicelist.zapToNumber(retval)
 
 class InfoBarChannelSelection:
 	""" ChannelSelection - handles the channelSelection dialog and the initial 
@@ -229,12 +246,12 @@ class InfoBarChannelSelection:
 		#instantiate forever
 		self.servicelist = self.session.instantiateDialog(ChannelSelection)
 
-		self["ChannelSelectActions"] = ActionMap( ["InfobarChannelSelection"],
+		self["ChannelSelectActions"] = HelpableActionMap(self, "InfobarChannelSelection",
 			{
 				"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):	
@@ -256,9 +273,9 @@ class InfoBarChannelSelection:
 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):
@@ -270,9 +287,9 @@ class InfoBarMenu:
 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):
@@ -280,10 +297,31 @@ class InfoBarEPG:
 		ptr=eEPGCache.getInstance()
 		if ptr.startTimeQuery(ref) != -1:
 			self.session.open(EPGSelection, ref)
-		else:
+		else: # try to show now/next
 			print 'no epg for service', ref.toString()
-
-class InfoBarEvent:	
+			try:
+				self.epglist = [ ]
+				service = self.session.nav.getCurrentService()
+				info = service.info()
+				ptr=info.getEvent(0)
+				if ptr:
+					self.epglist.append(ptr)
+				ptr=info.getEvent(1)
+				if ptr:
+					self.epglist.append(ptr)
+				if len(self.epglist) > 0:
+					self.session.open(EventView, self.epglist[0], ServiceReference(ref), self.eventViewCallback)
+			except:
+				pass
+
+	def eventViewCallback(self, setEvent, val): #used for now/next displaying
+		if len(self.epglist) > 1:
+			tmp = self.epglist[0]
+			self.epglist[0]=self.epglist[1]
+			self.epglist[1]=tmp
+			setEvent(self.epglist[0])
+
+class InfoBarEvent:
 	"""provides a current/next event info display"""
 	def __init__(self):
 		self["Event_Now_StartTime"] = EventInfo(self.session.nav, EventInfo.Now_StartTime)
@@ -302,13 +340,13 @@ class InfoBarServiceName:
 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):
@@ -337,9 +375,9 @@ class InfoBarInstantRecord:
 	"""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
 
@@ -389,9 +427,9 @@ from Screens.AudioSelection import AudioSelection
 
 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):