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 c3e3813b0c65d14f2bfce2d9e69f73b04df1ab98..8477fe04b97c04e68e4882f958c0f0faecc99a31 100644 (file)
--- a/lib/python/Screens/MessageBox.py
+++ b/lib/python/Screens/MessageBox.py
@@ -2,8 +2,8 @@ from Screen import Screen
 from Components.ActionMap import ActionMap
 from Components.Label import Label
 from Components.Pixmap import Pixmap
 from Components.ActionMap import ActionMap
 from Components.Label import Label
 from Components.Pixmap import Pixmap

-from Components.MenuList import MenuList

 from Components.Sources.StaticText import StaticText
 from Components.Sources.StaticText import StaticText

+from Components.MenuList import MenuList

 from enigma import eTimer
 
 class MessageBox(Screen):
 from enigma import eTimer
 
 class MessageBox(Screen):


@@ -16,8 +16,9 @@ class MessageBox(Screen):
                self.type = type
                Screen.__init__(self, session)
 
                self.type = type
                Screen.__init__(self, session)
 

-               self["text"] = Label(text)
+               self["text"] = Label(text)

                self["Text"] = StaticText(text)
                self["Text"] = StaticText(text)

+               self["selectedChoice"] = StaticText()

 
                self.text = text
                self.close_on_any_key = close_on_any_key
 
                self.text = text
                self.close_on_any_key = close_on_any_key


@@ -41,7 +42,9 @@ class MessageBox(Screen):
                                self.list = [ (_("yes"), 0), (_("no"), 1) ]
                        else:
                                self.list = [ (_("no"), 1), (_("yes"), 0) ]
                                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"], 
                self["list"] = MenuList(self.list)
 
                self["actions"] = ActionMap(["MsgBoxActions", "DirectionActions"], 


@@ -130,6 +133,8 @@ class MessageBox(Screen):
                if self.close_on_any_key:
                        self.close(True)
                self["list"].instance.moveSelection(direction)
                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):
                self.stopTimer()
 
        def __repr__(self):