X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/7f56f0647d4cb7e1ea77fca1af0d8c5999e5d880..5697c8db5f4c96eb1658e708911bf904eae7c268:/lib/python/Screens/InfoBar.py

diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py
index 9892e40b..516d44c5 100644
--- a/lib/python/Screens/InfoBar.py
+++ b/lib/python/Screens/InfoBar.py
@@ -1,12 +1,15 @@
 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
@@ -20,6 +23,48 @@ 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)
+
+	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
@@ -44,7 +89,8 @@ class InfoBar(Screen):
 		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,
@@ -58,7 +104,18 @@ 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
 			})
 #		self["okbutton"] = Button("mainMenu", [self.mainMenu])
 		
@@ -84,6 +141,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)
@@ -152,8 +213,13 @@ class InfoBar(Screen):
 			self.muteDialog.instance.show()
 		else:
 			self.muteDialog.instance.hide()
-			
-	def	quit(self):
+
+	def showEPGList(self):
+# TODO hier irgendwie EPGSelection benutzen und setRoot benutzen um nen service zu uebergeben
+# self.session.nav.getCurrentlyPlayingServiceReference() sollte das wohl sein
+		self.session.open(EPGSelection)
+
+	def quit(self):
 		configfile.save()
 		quitMainloop()