X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/fa4e8f50cccb3302185fe394f4dc34b8bbbc426b..36f427fcb34bb0dafa3d395dbc6bfc060494c874:/lib/python/Screens/InfoBar.py

diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py
index ef44ef3e..62639c04 100644
--- a/lib/python/Screens/InfoBar.py
+++ b/lib/python/Screens/InfoBar.py
@@ -1,16 +1,21 @@
 from Screen import Screen
+from EpgSelection import EPGSelection
 from ChannelSelection import ChannelSelection
 from Components.Clock import Clock
 from Components.ActionMap import ActionMap
+from Components.ActionMap import NumberActionMap
 from Components.Button import Button
 from Components.ServiceName import ServiceName
 from Components.EventInfo import EventInfo
 from Components.ServicePosition import ServicePosition
 from Components.config import configfile
+from Components.Label import Label
 
 from Screens.MessageBox import MessageBox
 from Screens.MovieSelection import MovieSelection
 from Screens.Volume import Volume
+from Screens.Mute import Mute
+from Screens.Standby import Standby
 
 from enigma import *
 
@@ -19,6 +24,50 @@ import time
 # hack alert!
 from Menu import MainMenu, mdom
 
+class NumberZap(Screen):
+	def quit(self):
+		self.Timer.stop()
+		self.close()
+
+	def keyOK(self):
+		self.Timer.stop()
+		print "do the action here"
+		self.close()
+
+	def keyNumberGlobal(self, number):
+		self.Timer.start(3000)		#reset timer
+		self.field = self.field + str(number)
+		self["number"].setText(self.field)
+		if len(self.field) >= 4:
+			self.keyOK()
+
+	def __init__(self, session, number):
+		Screen.__init__(self, session)
+		self.field = str(number)
+		
+		self["number"] = Label(self.field)
+
+		self["actions"] = NumberActionMap( [ "SetupActions" ], 
+			{
+				"cancel": self.quit,
+				"ok": self.keyOK,
+				"1": self.keyNumberGlobal,
+				"2": self.keyNumberGlobal,
+				"3": self.keyNumberGlobal,
+				"4": self.keyNumberGlobal,
+				"5": self.keyNumberGlobal,
+				"6": self.keyNumberGlobal,
+				"7": self.keyNumberGlobal,
+				"8": self.keyNumberGlobal,
+				"9": self.keyNumberGlobal,
+				"0": self.keyNumberGlobal
+			})
+
+		self.Timer = eTimer()
+		self.Timer.timeout.get().append(self.keyOK)
+		self.Timer.start(3000)
+
+
 class InfoBar(Screen):
 	STATE_HIDDEN = 0
 	STATE_HIDING = 1
@@ -34,13 +83,17 @@ class InfoBar(Screen):
 		self.state = self.STATE_HIDDEN
 		
 		self.volumeDialog = self.session.instantiateDialog(Volume)
+		self.muteDialog = self.session.instantiateDialog(Mute)
 		
 		self.hideTimer = eTimer()
 		self.hideTimer.timeout.get().append(self.doTimerHide)
 		#self.hideTimer.start(1000)
+		
+		self.hideVolTimer = eTimer()
+		self.hideVolTimer.timeout.get().append(self.volHide)
 
-
-		self["actions"] = ActionMap( [ "InfobarActions" ], 
+		#self["actions"] = ActionMap( [ "InfobarActions" ], 
+		self["actions"] = NumberActionMap( [ "InfobarActions" ], 
 			{
 				"switchChannelUp": self.switchChannelUp,
 				"switchChannelDown": self.switchChannelDown,
@@ -54,7 +107,21 @@ class InfoBar(Screen):
 				"hide": self.hide,
 				"toggleShow": self.toggleShow,
 				"showMovies": self.showMovies,
-				"quit": self.quit
+				"quit": self.quit,
+				"1": self.keyNumberGlobal,
+				"2": self.keyNumberGlobal,
+				"3": self.keyNumberGlobal,
+				"4": self.keyNumberGlobal,
+				"5": self.keyNumberGlobal,
+				"6": self.keyNumberGlobal,
+				"7": self.keyNumberGlobal,
+				"8": self.keyNumberGlobal,
+				"9": self.keyNumberGlobal,
+				"0": self.keyNumberGlobal,
+				"showEPGList": self.showEPGList,
+				
+				"pauseService": self.pauseService,
+				"unPauseService": self.unPauseService,
 			})
 #		self["okbutton"] = Button("mainMenu", [self.mainMenu])
 		
@@ -64,6 +131,9 @@ class InfoBar(Screen):
 
 		self["ServiceName"] = ServiceName(self.session.nav)
 		
+		self["Event_Now_StartTime"] = EventInfo(self.session.nav, EventInfo.Now_StartTime)
+		self["Event_Next_StartTime"] = EventInfo(self.session.nav, EventInfo.Next_StartTime)
+				
 		self["Event_Now"] = EventInfo(self.session.nav, EventInfo.Now)
 		self["Event_Next"] = EventInfo(self.session.nav, EventInfo.Next)
 
@@ -80,6 +150,10 @@ class InfoBar(Screen):
 		assert menu.tagName == "menu", "root element in menu must be 'menu'!"
 		self.session.open(MainMenu, menu, menu.childNodes)
 
+	def keyNumberGlobal(self, number):
+		print "You pressed number " + str(number)
+		self.session.open(NumberZap, number)
+
 	def switchChannelUp(self):	
 		self.servicelist.moveUp()
 		self.session.execDialog(self.servicelist)
@@ -121,16 +195,12 @@ class InfoBar(Screen):
 		eDVBVolumecontrol.getInstance().volumeUp()
 		self.volumeDialog.instance.show()
 		self.volumeDialog.setValue(eDVBVolumecontrol.getInstance().getVolume())
-		self.hideVolTimer = eTimer()
-		self.hideVolTimer.timeout.get().append(self.volHide)
 		self.hideVolTimer.start(3000)
 
 	def	volDown(self):
 		eDVBVolumecontrol.getInstance().volumeDown()
 		self.volumeDialog.instance.show()
 		self.volumeDialog.setValue(eDVBVolumecontrol.getInstance().getVolume())
-		self.hideVolTimer = eTimer()
-		self.hideVolTimer.timeout.get().append(self.volHide)
 		self.hideVolTimer.start(3000)
 		
 	def volHide(self):
@@ -146,11 +216,20 @@ class InfoBar(Screen):
 
 	def	volMute(self):
 		eDVBVolumecontrol.getInstance().volumeToggleMute()
-		self.volumeBar.setValue(eDVBVolumecontrol.getInstance().getVolume())
+		self.volumeDialog.setValue(eDVBVolumecontrol.getInstance().getVolume())
+		
+		if (eDVBVolumecontrol.getInstance().isMuted()):
+			self.muteDialog.instance.show()
+		else:
+			self.muteDialog.instance.hide()
 
-	def	quit(self):
-		configfile.save()
-		quitMainloop()
+	def showEPGList(self):
+		self.session.open(EPGSelection, self.session.nav.getCurrentlyPlayingServiceReference())
+
+	def quit(self):
+		self.session.open(Standby)
+		#configfile.save()
+		#quitMainloop()
 	
 	def stopCurrentRecording(self):	
 		print "remove entry"
@@ -171,7 +250,7 @@ class InfoBar(Screen):
 			pass
 		
 		# fix me, description. 
-		self.recording = self.session.nav.recordWithTimer(time.time(), time.time() + 30, serviceref, epg, "instant record")
+		self.recording = self.session.nav.recordWithTimer(time.time(), time.time() + 3600, serviceref, epg, "instant record")
 
 	def recordQuestionCallback(self, answer):
 		if answer == False:
@@ -190,3 +269,9 @@ class InfoBar(Screen):
 
 	def showMovies(self):
 		self.session.open(MovieSelection)
+
+	def pauseService(self):
+		self.session.nav.pause(1)
+		
+	def unPauseService(self):
+		self.session.nav.pause(0)