X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/523329f059798ade1a43f905187682671d7298f2..d2bea1918fa33f5e92ed75f3f744c119439924bc:/lib/python/Screens/MessageBox.py

diff --git a/lib/python/Screens/MessageBox.py b/lib/python/Screens/MessageBox.py
index 78224e14..8b599a37 100644
--- a/lib/python/Screens/MessageBox.py
+++ b/lib/python/Screens/MessageBox.py
@@ -4,7 +4,7 @@ from Components.Label import Label
 from Components.Button import Button
 from Components.Pixmap import Pixmap
 from Components.MenuList import MenuList
-from enigma import eSize, ePoint
+from enigma import eSize, ePoint, eTimer
 
 class MessageBox(Screen):
 	TYPE_YESNO = 0
@@ -12,22 +12,33 @@ class MessageBox(Screen):
 	TYPE_WARNING = 2
 	TYPE_ERROR = 3
 	
-	def __init__(self, session, text, type = TYPE_YESNO):
+	def __init__(self, session, text, type = TYPE_YESNO, timeout = -1):
 		self.type = type
 		Screen.__init__(self, session)
 		
 		self["text"] = Label(text)
 		
+		self.text = text
+		
 		self["ErrorPixmap"] = Pixmap()
 		self["QuestionPixmap"] = Pixmap()
 		self["InfoPixmap"] = Pixmap()
+		self.timerRunning = False
+		if timeout > 0:
+			self.timer = eTimer()
+			self.timer.timeout.get().append(self.timerTick)
+			self.timer.start(1000)
+			self.origTitle = None
+			self.onShown.append(self.timerTick)
+			self.timerRunning = True
+		self.timeout = timeout
 		
 		self.list = []
 		if type != self.TYPE_ERROR:
 			self["ErrorPixmap"].hide()
-		elif type != self.TYPE_YESNO:
+		if type != self.TYPE_YESNO:
 			self["QuestionPixmap"].hide()
-		elif type != self.TYPE_INFO:
+		if type != self.TYPE_INFO:
 			self["InfoPixmap"].hide()
 			
 		if type == self.TYPE_YESNO:
@@ -36,13 +47,35 @@ class MessageBox(Screen):
 
 		self["list"] = MenuList(self.list)
 		
-		self["actions"] = ActionMap(["MsgBoxActions"], 
+		self["actions"] = ActionMap(["MsgBoxActions", "DirectionActions"], 
 			{
 				"cancel": self.cancel,
 				"ok": self.ok,
-				"alwaysOK": self.alwaysOK
-			})
+				"alwaysOK": self.alwaysOK,
+				"up": self.up,
+				"down": self.down,
+				"left": self.left,
+				"right": self.right,
+				"upRepeated": self.up,
+				"downRepeated": self.down,
+				"leftRepeated": self.left,
+				"rightRepeated": self.right
+			}, -1)
+			
+	
+	def timerTick(self):
+		self.timeout -= 1
+		if self.origTitle is None:
+			self.origTitle = self.instance.getTitle()
+		self.setTitle(self.origTitle + " (" + str(self.timeout) + ")")
+		if self.timeout == 0:
+			self.timer.stop()
+			self.timerRunning = False
+			self.timeoutCallback()
 			
+	def timeoutCallback(self):
+		print "Timeout!"
+		self.ok()
 	
 	def cancel(self):
 		self.close(False)
@@ -55,3 +88,27 @@ class MessageBox(Screen):
 
 	def alwaysOK(self):
 		self.close(True)
+
+	def up(self):
+		self.move(self["list"].instance.moveUp)
+		
+	def down(self):
+		self.move(self["list"].instance.moveDown)
+
+	def left(self):
+		self.move(self["list"].instance.pageUp)
+		
+
+		
+	def right(self):
+		self.move(self["list"].instance.pageDown)
+
+	def move(self, direction):
+		self["list"].instance.moveSelection(direction)
+		if self.timerRunning:
+			self.timer.stop()
+			self.setTitle(self.origTitle)
+			self.timerRunning = False
+
+	def __repr__(self):
+		return str(type(self)) + "(" + self.text + ")"