From: Andreas Frisch <andreas.frisch@multimedia-labs.de>
Date: Mon, 29 Sep 2008 11:21:23 +0000 (+0000)
Subject: don't display clock on LCD/OLED for MessageBoxes anymore. instead display more of... 
X-Git-Tag: 2.6.0~843
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/14cea6fc0a91a212d86010804c3dbb48cc2ac838?hp=6cfa32d896455d1da9bcfe06a1f7d7e0f3f6d3ef

don't display clock on LCD/OLED for MessageBoxes anymore. instead display more of the question text plus answer
---

diff --git a/data/skin_default.xml b/data/skin_default.xml
index 38bdd736..aeee84a6 100644
--- 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">
-		 <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">
diff --git a/lib/python/Screens/MessageBox.py b/lib/python/Screens/MessageBox.py
index c3e3813b..62d90712 100644
--- 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 Components.Sources.StaticText import StaticText
 from enigma import eTimer
@@ -16,8 +17,9 @@ class MessageBox(Screen):
 		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
@@ -41,7 +43,9 @@ class MessageBox(Screen):
 				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"], 
@@ -130,6 +134,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):