X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/b6119305b4f5e6606750bf418c434ad9b5a810fa..8d4316d824f584eb3900fef898de59c9aca8d771:/lib/python/Screens/MessageBox.py

diff --git a/lib/python/Screens/MessageBox.py b/lib/python/Screens/MessageBox.py
index df276670..8a5989c7 100644
--- a/lib/python/Screens/MessageBox.py
+++ b/lib/python/Screens/MessageBox.py
@@ -2,6 +2,7 @@ from Screen import Screen
 from Components.ActionMap import ActionMap
 from Components.Label import Label
 from Components.Pixmap import Pixmap
+from Components.Sources.StaticText import StaticText
 from Components.MenuList import MenuList
 from enigma import eTimer
 
@@ -11,11 +12,13 @@ class MessageBox(Screen):
 	TYPE_WARNING = 2
 	TYPE_ERROR = 3
 
-	def __init__(self, session, text, type = TYPE_YESNO, timeout = -1, close_on_any_key = False, default = True):
+	def __init__(self, session, text, type = TYPE_YESNO, timeout = -1, close_on_any_key = False, default = True, enable_input = True):
 		self.type = type
 		Screen.__init__(self, session)
 
-		self["text"] = Label(text)
+ 		self["text"] = Label(text)
+		self["Text"] = StaticText(text)
+		self["selectedChoice"] = StaticText()
 
 		self.text = text
 		self.close_on_any_key = close_on_any_key
@@ -39,29 +42,32 @@ class MessageBox(Screen):
 				self.list = [ (_("yes"), 0), (_("no"), 1) ]
 			else:
 				self.list = [ (_("no"), 1), (_("yes"), 0) ]
-
+		
+		if len(self.list):
+			self["selectedChoice"].setText(self.list[0][0])
 		self["list"] = MenuList(self.list)
 
-		self["actions"] = ActionMap(["MsgBoxActions", "DirectionActions"], 
-			{
-				"cancel": self.cancel,
-				"ok": self.ok,
-				"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)
+		if enable_input:
+			self["actions"] = ActionMap(["MsgBoxActions", "DirectionActions"], 
+				{
+					"cancel": self.cancel,
+					"ok": self.ok,
+					"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 initTimeout(self, timeout):
 		self.timeout = timeout
 		if timeout > 0:
 			self.timer = eTimer()
-			self.timer.timeout.get().append(self.timerTick)
+			self.timer.callback.append(self.timerTick)
 			self.onExecBegin.append(self.startTimer)
 			self.origTitle = None
 			if self.execing:
@@ -128,6 +134,8 @@ class MessageBox(Screen):
 		if self.close_on_any_key:
 			self.close(True)
 		self["list"].instance.moveSelection(direction)
+		if len(self.list):
+			self["selectedChoice"].setText(self["list"].getCurrent()[0])
 		self.stopTimer()
 
 	def __repr__(self):