fix remove last timer

[enigma2.git] / data / skin.xml

diff --git a/data/skin.xml b/data/skin.xml
index 4367b4135b82f513721a2fa5064311c3b1c1e17d..195811653ebdd5646eeb030374b63662618b4ab9 100644 (file)
--- a/data/skin.xml
+++ b/data/skin.xml
@@ -51,8 +51,12 @@
                </screen>
                <screen name="Scart" position="0,0" size="720,576">
                </screen>
-               <screen name="ServiceInfo" position="160,120" size="400,330" title="Serviceinfo">
-                       <widget name="infolist" position="20,10" size="360,325" selectionDisabled="1"/>
+               <screen name="ServiceInfo" position="100,120" size="560,370" title="Serviceinfo">
+                       <widget name="red" position="0,0" size="140,40" backgroundColor="red" valign="center" halign="center" font="Regular;21" />
+                       <widget name="green" position="140,0" size="140,40" backgroundColor="green" valign="center" halign="center" font="Regular;21" />
+                       <widget name="yellow" position="280,0" size="140,40" backgroundColor="yellow" valign="center" halign="center" font="Regular;21" />
+                       <widget name="blue" position="420,0" size="140,40" backgroundColor="blue" valign="center" halign="center" font="Regular;21" />
+                       <widget name="infolist" position="20,50" size="560,365" selectionDisabled="1"/>
                </screen>
                <screen name="AudioSelection" position="210,150" size="300,170" title="Audio">
                        <widget name="tracks" position="20,10" size="260,150" scrollbarMode="showOnDemand" />
@@ -347,7 +351,7 @@
                </screen>
                <screen name="ChoiceBox" position="100,100" size="550,400" title="Input" >
                        <widget name="text" position="0,0" size="550,25" font="Regular;20" />
-                       <widget name="list" position="0,30" size="550,335" />
+                       <widget name="list" position="0,30" size="550,335" scrollbarMode="showOnDemand" />
                        <applet type="onLayoutFinish">
 # this should be factored out into some helper code, but currently demonstrates applets.
 from enigma import eSize, ePoint
@@ -358,11 +362,14 @@ textsize = self["text"].getSize()
 
 # y size still must be fixed in font stuff...
 textsize = (textsize[0] + 50, textsize[1] + 50)
-offset = 60
+count = len(self.list)
+if count > 6:
+       count = 6
+offset = 30 * count
 wsizex = textsize[0] + 60
 wsizey = textsize[1] + offset
-if (280 > wsizex):
-       wsizex = 280
+if (400 > wsizex):
+       wsizex = 400
 wsize = (wsizex, wsizey)
 
 
@@ -373,7 +380,7 @@ self.instance.resize(eSize(*wsize))
 self["text"].instance.resize(eSize(*textsize))
 
 # move list
-listsize = (wsizex, 50)
+listsize = (wsizex, 30 * len(self.list))
 self["list"].instance.move(ePoint(0, textsize[1]))
 self["list"].instance.resize(eSize(*listsize))