don't display clock on LCD/OLED for MessageBoxes anymore. instead display more of...

diff --git a/data/skin_default.xml b/data/skin_default.xml
index 38bdd736345159b189532e11dd6dff14c83705f5..aeee84a6e1108bbfcd165352440167a7ec780614 100644 (file)
--- a/data/skin_default.xml
+++ b/data/skin_default.xml
@@ -503,13 +503,8 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
                </applet>
        </screen>
        <screen name="MessageBox_summary" position="0,0" size="132,64">
                </applet>
        </screen>
        <screen name="MessageBox_summary" position="0,0" size="132,64">

-                <widget source="parent.Text" render="Label" position="6,0" size="120,32" font="Regular;12" halign="center" valign="center" />
-                <widget source="global.CurrentTime" render="Label" position="6,32" size="90,32" font="Regular;32" halign="right" valign="top">
-                         <convert type="ClockToText">Format:%H:%M</convert>
-                </widget>
-                <widget source="global.CurrentTime" render="Label" position="100,34" zPosition="1" size="26,30" font="Regular;16" valign="top">
-                         <convert type="ClockToText">Format:%S</convert>
-                </widget>
+               <widget source="parent.Text" render="Label" position="0,0" size="132,52" font="Regular;11" halign="center" valign="center" />
+               <widget source="parent.selectedChoice" render="Label" position="6,50" size="120,14" font="Regular;14" halign="center" valign="center" />

        </screen>
        <!-- Minute input -->
        <screen name="MinuteInput" position="200,140" size="280,60" title="Seek">
        </screen>
        <!-- Minute input -->
        <screen name="MinuteInput" position="200,140" size="280,60" title="Seek">

diff --git a/lib/python/Screens/MessageBox.py b/lib/python/Screens/MessageBox.py
index c3e3813b0c65d14f2bfce2d9e69f73b04df1ab98..62d90712b174e624af88db614647c7940a2ff3ea 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.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 Components.Sources.StaticText import StaticText
 from enigma import eTimer
 from Components.MenuList import MenuList
 from Components.Sources.StaticText import StaticText
 from enigma import eTimer


@@ -16,8 +17,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 +43,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 +134,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):