aboutsummaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorStefan Pluecken <stefan.pluecken@multimedia-labs.de>2005-12-23 05:19:57 +0000
committerStefan Pluecken <stefan.pluecken@multimedia-labs.de>2005-12-23 05:19:57 +0000
commitb2d6392a3b41f870b5615c8e19b26496e56f6310 (patch)
treedf2f0d446d2afb704941d7cd4e7e2262b1f3a660 /data
parent7ae6b9f9b79a7fb2a94fcc4863f1cfdade7ce19b (diff)
downloadenigma2-b2d6392a3b41f870b5615c8e19b26496e56f6310.tar.gz
enigma2-b2d6392a3b41f870b5615c8e19b26496e56f6310.zip
beautify messagebox
add functionality to the messagebox
Diffstat (limited to 'data')
-rw-r--r--data/keymap.xml2
-rw-r--r--data/skin.xml19
2 files changed, 15 insertions, 6 deletions
diff --git a/data/keymap.xml b/data/keymap.xml
index a60935f5..2462ef6e 100644
--- a/data/keymap.xml
+++ b/data/keymap.xml
@@ -212,7 +212,7 @@
</map>
<map context="MsgBoxActions">
- <key id="KEY_GREEN" mapto="ok" flags="m" />
+ <key id="KEY_GREEN" mapto="alwaysOK" flags="m" />
<key id="KEY_OK" mapto="ok" flags="m" />
<key id="KEY_RED" mapto="cancel" flags="m" />
<key id="KEY_EXIT" mapto="cancel" flags="m" />
diff --git a/data/skin.xml b/data/skin.xml
index 4c1a25c0..e8e8a9ec 100644
--- a/data/skin.xml
+++ b/data/skin.xml
@@ -270,9 +270,10 @@
<eLabel position="500,40" size="220,60" text="help..." font="Regular;50" />
</screen>
<screen name="MessageBox" position="0,300" size="720,10" title="Message">
- <widget name="text" position="0,35" size="650,0" font="Regular;22" />
- <widget name="key_red" position="0,0" size="140,30" backgroundColor="red" font="Regular;21" />
- <widget name="key_green" position="140,0" size="140,30" backgroundColor="green" font="Regular;21" />
+ <widget name="text" position="60,10" size="650,0" font="Regular;22" />
+ <widget name="ErrorPixmap" pixmap="/usr/share/enigma2/error.png" position="0,0" zPosition="3" size="53,53" alphatest="on" transparent="1" />
+ <widget name="QuestionPixmap" pixmap="/usr/share/enigma2/question.png" position="0,0" zPosition="3" size="53,53" alphatest="on" transparent="1" />
+ <widget name="list" position="100,100" size="550,375" />
<applet type="onLayoutFinish">
# this should be factored out into some helper code, but currently demonstrates applets.
from enigma import eSize, ePoint
@@ -283,8 +284,11 @@ textsize = self["text"].getSize()
# y size still must be fixed in font stuff...
textsize = (textsize[0] + 50, textsize[1] + 50)
-wsizex = textsize[0] + 50
-wsizey = textsize[1] + 50
+offset = 0
+if self.type == self.TYPE_YESNO:
+ offset = 60
+wsizex = textsize[0] + offset
+wsizey = textsize[1] + offset
if (280 > wsizex):
wsizex = 280
wsize = (wsizex, wsizey)
@@ -296,6 +300,11 @@ self.instance.resize(eSize(*wsize))
# resize label
self["text"].instance.resize(eSize(*textsize))
+# move list
+listsize = (wsizex, 50)
+self["list"].instance.move(ePoint(0, textsize[1]))
+self["list"].instance.resize(eSize(*listsize))
+
# center window
newwidth = wsize[0]
self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))