fix PIP

[enigma2.git] / data / skin_default.xml

diff --git a/data/skin_default.xml b/data/skin_default.xml
index d8077d4b075b9bc039e5c6e451e6b8d9b7c8754c..d5d5a8d69edcbe715406a16ece56892daeec6976 100644 (file)
--- a/data/skin_default.xml
+++ b/data/skin_default.xml
@@ -98,14 +98,15 @@
                <widget name="text" position="10,00" size="380,330" zPosition="1" font="Regular;20" />
                <widget name="list" position="10,00" size="380,330" zPosition="2" scrollbarMode="showOnDemand" />
        </screen>
-       <screen name="NimSelection" position="160,238" size="400,100" title="Choose Tuner">
-               <widget name="nimlist" position="20,10" size="360,75" />
+       <screen name="NimSelection" position="160,223" size="400,130" title="Choose Tuner">
+               <widget name="nimlist" position="20,10" size="360,105" />
        </screen>
        <screen name="CiWait" position="180,263" size="360,50" title="Common Interface">
                <widget name="message" position="20,10" size="320,25" font="Regular;23" />
        </screen>
-       <screen name="CiSelection" position="140,226" size="440,125" title="Common Interface">
-               <widget name="entries" position="10,10" size="420,100" scrollbarMode="showOnDemand" />
+       <screen name="CiSelection" position="140,226" size="440,160" title="Common Interface">
+               <widget name="text" position="10,5" size="440,25" font="Regular;23" />
+               <widget name="entries" position="10,45" size="420,100" scrollbarMode="showOnDemand" />
        </screen>
        <screen name="CiMmi" position="135,153" size="450,270">
                <widget name="title" position="10,10" size="430,25" font="Regular;23" />
@@ -158,14 +159,16 @@
        <screen name="NetworkAdapterSelection" position="100,150" size="540,100" title="Select Network Adapter">
                <widget name="adapterlist" position="20,10" size="500,75" />
        </screen>
-       <screen name="About" position="180,163" size="360,250" title="About">
+       <screen name="About" position="180,143" size="360,290" title="About">
                <widget name="text" position="10,30" size="420,20" font="Regular;18"/>
                <widget name="fpVersion" position="10,50" size="420,20" font="Regular;18"/>
                <widget name="tuner" position="10,90" size="420,20" font="Regular;18"/>
                <widget name="tuner0" position="10,110" size="420,20" font="Regular;18"/>
                <widget name="tuner1" position="10,130" size="420,20" font="Regular;18"/>
-               <widget name="hdd" position="10,170" size="420,20" font="Regular;18"/>
-               <widget name="hddA" position="10,190" size="420,40" font="Regular;18"/>
+               <widget name="tuner2" position="10,150" size="420,20" font="Regular;18"/>
+               <widget name="tuner3" position="10,170" size="420,20" font="Regular;18"/>
+               <widget name="hdd" position="10,210" size="420,20" font="Regular;18"/>
+               <widget name="hddA" position="10,230" size="420,40" font="Regular;18"/>
        </screen>
        <screen name="configOSD" position="130,113" size="460,350" title="OSD Settings">
                <widget name="okbutton" position="20,270" size="205,40" />
@@ -332,7 +335,7 @@
                <widget name="channel" position="240,345" size="270,30" font="Regular;22" />
        </screen>
        <screen name="PictureInPicture" position="400,60" size="240,192" zPosition="-1" flags="wfNoBorder" >
-               <widget name="video" position="0,0" size="240,192" />
+               <widget name="video" position="0,0" size="240,192" backgroundColor="transparent" />
        </screen>
 
        <screen name="SubtitleDisplay" position="0,0" size="720,568" zPosition="-1" flags="wfNoBorder" />
@@ -433,36 +436,36 @@ from enigma import eSize, ePoint
 
 orgwidth = self.instance.size().width()
 orgpos = self.instance.position()
-textsize = self["text"].getSize()
+textsize = self[&quot;text&quot;].getSize()
 
 # y size still must be fixed in font stuff...
 textsize = (textsize[0] + 50, textsize[1] + 50)
 count = len(self.list)
-if count > 10:
+if count &gt; 10:
        count = 10
 offset = 25 * count
 wsizex = textsize[0] + 60
 wsizey = textsize[1] + offset
 
-if (450 > wsizex):
-       wsizex = 450
+if (520 &gt; wsizex):
+       wsizex = 520
 wsize = (wsizex, wsizey)
 
-
 # resize
 self.instance.resize(eSize(*wsize))
 
 # resize label
-self["text"].instance.resize(eSize(*textsize))
+self[&quot;text&quot;].instance.resize(eSize(*textsize))
 
 # move list
 listsize = (wsizex, 25 * count)
-self["list"].instance.move(ePoint(0, textsize[1]))
-self["list"].instance.resize(eSize(*listsize))
+self[&quot;list&quot;].instance.move(ePoint(0, textsize[1]))
+self[&quot;list&quot;].instance.resize(eSize(*listsize))
 
 # center window
 newwidth = wsize[0]
-#self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
+self.instance.move(ePoint((720-wsizex)/2, (576-wsizey)/(count &gt; 7 and 2 or 3)))
+
                </applet>
        </screen>
        <screen name="TimerEdit" position="70,100" size="590,335" title="Timer Edit">
@@ -477,6 +480,8 @@ newwidth = wsize[0]
                <widget name="list" position="50,100" size="450,378" scrollbarMode="showOnDemand" />
                <widget name="rc" pixmap="rc.png" position="540,50" zPosition="10" size="154,475" transparent="1" alphatest="on"/>
                <widget name="arrowup" pixmap="arrowup.png" position="585,425" zPosition="11" size="37,70" transparent="1" alphatest="on"/>
+               <widget name="sh_arrowup" pixmap="arrowup.png" position="580,75" zPosition="11" size="37,70" transparent="1" alphatest="on"/>
+               <widget name="long_key" position="320,520" zPosition="3" size="350,50" font="Regular;25" halign="right" foregroundColor="yellow" />
                <eLabel position="400,40" size="220,60" text="help..." font="Regular;50" />
        </screen>
        <screen name="PVRState" flags="wfNoBorder" position="70,70" size="150,30" backgroundColor="transpBlack" zPosition="2">
@@ -511,7 +516,7 @@ from enigma import eSize, ePoint
 
 orgwidth = self.instance.size().width()
 orgpos = self.instance.position()
-textsize = self["text"].getSize()
+textsize = self[&quot;text&quot;].getSize()
 
 # y size still must be fixed in font stuff...
 textsize = (textsize[0] + 50, textsize[1] + 50)
@@ -520,7 +525,7 @@ if self.type == self.TYPE_YESNO:
        offset = 60
 wsizex = textsize[0] + 60
 wsizey = textsize[1] + offset
-if (280 > wsizex):
+if (280 &gt; wsizex):
        wsizex = 280
 wsize = (wsizex, wsizey)
 
@@ -529,12 +534,12 @@ wsize = (wsizex, wsizey)
 self.instance.resize(eSize(*wsize))
 
 # resize label
-self["text"].instance.resize(eSize(*textsize))
+self[&quot;text&quot;].instance.resize(eSize(*textsize))
 
 # move list
 listsize = (wsizex, 50)
-self["list"].instance.move(ePoint(0, textsize[1]))
-self["list"].instance.resize(eSize(*listsize))
+self[&quot;list&quot;].instance.move(ePoint(0, textsize[1]))
+self[&quot;list&quot;].instance.resize(eSize(*listsize))
 
 # center window
 newwidth = wsize[0]