X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/3d9be241bd3d4558ee28e57bbe405553b8626543..344ffd10a4f5b54546fe5e382dbf40a8cf7ecdbb:/lib/python/Screens/MessageBox.py

diff --git a/lib/python/Screens/MessageBox.py b/lib/python/Screens/MessageBox.py
index deea54ba..10485680 100644
--- a/lib/python/Screens/MessageBox.py
+++ b/lib/python/Screens/MessageBox.py
@@ -1,26 +1,28 @@
 from Screen import Screen
 from Components.ActionMap import ActionMap
 from Components.Label import Label
-from Components.Button import Button
 from Components.Pixmap import Pixmap
+from Components.Sources.StaticText import StaticText
 from Components.MenuList import MenuList
-from enigma import eSize, ePoint, eTimer
+from enigma import eTimer
 
 class MessageBox(Screen):
 	TYPE_YESNO = 0
 	TYPE_INFO = 1
 	TYPE_WARNING = 2
 	TYPE_ERROR = 3
-	
-	def __init__(self, session, text, type = TYPE_YESNO, timeout = -1, close_on_any_key = False):
+
+	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
-		
+
 		self["ErrorPixmap"] = Pixmap()
 		self["QuestionPixmap"] = Pixmap()
 		self["InfoPixmap"] = Pixmap()
@@ -34,32 +36,38 @@ class MessageBox(Screen):
 			self["QuestionPixmap"].hide()
 		if type != self.TYPE_INFO:
 			self["InfoPixmap"].hide()
-			
-		if type == self.TYPE_YESNO:
-			self.list = [ (_("yes"), 0), (_("no"), 1) ]
 
-		self["list"] = MenuList(self.list)
+		if type == self.TYPE_YESNO:
+			if default == True:
+				self.list = [ (_("yes"), 0), (_("no"), 1) ]
+			else:
+				self.list = [ (_("no"), 1), (_("yes"), 0) ]
 		
-		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 self.list:
+			self["selectedChoice"].setText(self.list[0][0])
+		self["list"] = MenuList(self.list)
+
+		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:
@@ -81,6 +89,7 @@ class MessageBox(Screen):
 		if self.timerRunning:
 			del self.timer
 			self.setTitle(self.origTitle)
+			self.timerRunning = False
 
 	def timerTick(self):
 		if self.execing:
@@ -96,10 +105,10 @@ class MessageBox(Screen):
 	def timeoutCallback(self):
 		print "Timeout!"
 		self.ok()
-	
+
 	def cancel(self):
 		self.close(False)
-	
+
 	def ok(self):
 		if self.type == self.TYPE_YESNO:
 			self.close(self["list"].getCurrent()[1] == 0)
@@ -111,13 +120,13 @@ class MessageBox(Screen):
 
 	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)
 
@@ -125,6 +134,8 @@ class MessageBox(Screen):
 		if self.close_on_any_key:
 			self.close(True)
 		self["list"].instance.moveSelection(direction)
+		if self.list:
+			self["selectedChoice"].setText(self["list"].getCurrent()[0])
 		self.stopTimer()
 
 	def __repr__(self):