remove double import

[enigma2.git] / lib / python / Screens / MessageBox.py

diff --git a/lib/python/Screens/MessageBox.py b/lib/python/Screens/MessageBox.py
index 9354e1f84fc57ee99f39f52b4ca89b8757a4ce35..8477fe04b97c04e68e4882f958c0f0faecc99a31 100644 (file)
--- 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 = 0):
+       def __init__(self, session, text, type = TYPE_YESNO, timeout = -1, close_on_any_key = False, default = 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
@@ -35,8 +38,13 @@ class MessageBox(Screen):
                        self["InfoPixmap"].hide()
 
                if type == self.TYPE_YESNO:
-                       self.list = [ (_("yes"), 0), (_("no"), 1) ]
-
+                       if default == True:
+                               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"], 
@@ -58,7 +66,7 @@ class MessageBox(Screen):
                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:
@@ -125,6 +133,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):