X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/96573a19a9b13989785905817e7072ac6e25f795..bf7e40884d7add91e219e9e70e83988ae7752bd8:/lib/python/Screens/InfoBarGenerics.py

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 1ef39982..45c7745e 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 *
@@ -132,12 +134,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
@@ -219,8 +220,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 +235,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):	
@@ -270,9 +276,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 +286,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)
@@ -362,6 +389,7 @@ class InfoBarInstantRecord:
 		
 		# fix me, description. 
 		self.recording = self.session.nav.recordWithTimer(time.time(), time.time() + 3600, serviceref, epg, "instant record")
+		self.recording.dontSave = True
 
 	def recordQuestionCallback(self, answer):
 		if answer == False: