X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/14cea6fc0a91a212d86010804c3dbb48cc2ac838..c7a9116bff46e6c9c6f4bdbaf43a3f527f6ec468:/lib/python/Screens/MessageBox.py?ds=sidebyside

diff --git a/lib/python/Screens/MessageBox.py b/lib/python/Screens/MessageBox.py
index 62d90712..f3538b7b 100644
--- a/lib/python/Screens/MessageBox.py
+++ b/lib/python/Screens/MessageBox.py
@@ -4,7 +4,6 @@ from Components.Label import Label
 from Components.Pixmap import Pixmap
 from Components.Sources.StaticText import StaticText
 from Components.MenuList import MenuList
-from Components.Sources.StaticText import StaticText
 from enigma import eTimer
 
 class MessageBox(Screen):
@@ -13,9 +12,11 @@ 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, msgBoxID = None):
 		self.type = type
 		Screen.__init__(self, session)
+		
+		self.msgBoxID = msgBoxID
 
  		self["text"] = Label(text)
 		self["Text"] = StaticText(text)
@@ -44,24 +45,25 @@ class MessageBox(Screen):
 			else:
 				self.list = [ (_("no"), 1), (_("yes"), 0) ]
 		
-		if len(self.list):
+		if 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
@@ -88,6 +90,7 @@ class MessageBox(Screen):
 	def stopTimer(self):
 		if self.timerRunning:
 			del self.timer
+			self.onExecBegin.remove(self.startTimer)
 			self.setTitle(self.origTitle)
 			self.timerRunning = False
 
@@ -134,7 +137,7 @@ class MessageBox(Screen):
 		if self.close_on_any_key:
 			self.close(True)
 		self["list"].instance.moveSelection(direction)
-		if len(self.list):
+		if self.list:
 			self["selectedChoice"].setText(self["list"].getCurrent()[0])
 		self.stopTimer()