configSelection is now saved to config file in a human readable style

[enigma2.git] / data / skin.xml

diff --git a/data/skin.xml b/data/skin.xml
index 4c1a25c0b71721f6bb2e3d761fa857f9cbd4cfc6..3d9d0463deda3de133e9e3afe2f71bead34a4d07 100644 (file)
--- a/data/skin.xml
+++ b/data/skin.xml
@@ -41,7 +41,7 @@
                        <!--<widget name="menu" position="10,55" size="280,150" font="Regular;23" />-->
                        <widget name="menu" position="10,55" size="290,175" scrollbarMode="showOnDemand" />
                </screen>
-               <screen name="ScartLoopThrough" position="0,0" size="720,576">
+               <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"/>
@@ -137,7 +137,7 @@
                        <widget name="config" position="10,30" size="420,220" />
                </screen>
                <screen name="TimerEditList" position="70,100" size="560,400" title="Timer Editor">
-                       <widget name="timerlist" position="10,50" size="520,300" scrollbarMode="showOnDemand" />
+                       <widget name="timerlist" position="0,50" size="560,300" scrollbarMode="showOnDemand" />
                        <widget name="key_red" position="0,0" size="140,40" backgroundColor="red" font="Regular;21" />
                        <widget name="key_green" position="140,0" size="140,40" backgroundColor="green" font="Regular;21" />
                        <widget name="key_yellow" position="280,0" size="140,40" backgroundColor="yellow" font="Regular;21" />
@@ -210,6 +210,9 @@
                        <widget name="channel" position="50,15" size="110,25" font="Regular;23" />
                        <widget name="number" position="160,15" size="80,25" halign="right" font="Regular;23" />
                </screen>
+               <screen name="MinuteInput" position="200,140" size="280,60" title="Seek">
+                       <widget name="minutes" position="80,15" size="160,25" halign="right" font="Regular;23" />
+               </screen>
                <screen name="Volume" flags="wfNoBorder" position="450,50" size="180,60" title="Volume">
                        <ePixmap position="0,0" zPosition="0" size="180,60" pixmap="/usr/share/enigma2/volumeslider-fs8.png" />
                        
@@ -223,21 +226,21 @@
                        <widget name="Dishpixmap" pixmap="/usr/share/enigma2/dish.png" position="0,0" size="100,107" />
                </screen>
                <screen name="ChannelSelection" position="90,98" size="560,417" title="Channel Selection">
-                       <widget name="list" position="10,45" size="550,364" scrollbarMode="showOnDemand" />
+                       <widget name="list" position="00,45" size="560,364" scrollbarMode="showOnDemand" />
                        <widget name="key_red" position="0,0" size="140,40" backgroundColor="red" font="Regular;21" />
                        <widget name="key_green" position="140,0" size="140,40" backgroundColor="green" font="Regular;21" />
                        <widget name="key_yellow" position="280,0" size="140,40" backgroundColor="yellow" font="Regular;21" />
                        <widget name="key_blue" position="420,0" size="140,40" backgroundColor="blue" font="Regular;21" />
                </screen>
                <screen name="SimpleChannelSelection" position="90,98" size="560,417" title="Channel Selection">
-                       <widget name="list" position="10,45" size="540,364" scrollbarMode="showOnDemand" />
+                       <widget name="list" position="00,45" size="560,364" scrollbarMode="showOnDemand" />
                        <widget name="key_red" position="0,0" size="140,40" backgroundColor="red" font="Regular;21" />
                        <widget name="key_green" position="140,0" size="140,40" backgroundColor="green" font="Regular;21" />
                        <widget name="key_yellow" position="280,0" size="140,40" backgroundColor="yellow" font="Regular;21" />
                        <widget name="key_blue" position="420,0" size="140,40" backgroundColor="blue" font="Regular;21" />
                </screen>
-               <screen name="EPGSelection" position="90,100" size="560,415" title="EPG Selection">
-                       <widget name="list" position="10,40" size="550,370" scrollbarMode="showOnDemand" />
+               <screen name="EPGSelection" position="90,100" size="560,420" title="EPG Selection">
+                       <widget name="list" position="0,40" size="560,375" scrollbarMode="showOnDemand" />
                        <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="key_yellow" position="280,0" size="140,30" backgroundColor="yellow" font="Regular;21" />
@@ -270,9 +273,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 +287,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] + 60
+wsizey = textsize[1] + offset
 if (280 > wsizex):
        wsizex = 280
 wsize = (wsizex, wsizey)
@@ -296,6 +303,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()))