move dish screen behind subtitle screen (this fixes clipping problems with

[enigma2.git] / data / skin_default.xml

diff --git a/data/skin_default.xml b/data/skin_default.xml
index d8077d4b075b9bc039e5c6e451e6b8d9b7c8754c..f0d25871bc608700c970c86ecbee8ecfdf751c3b 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>
                <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>
        <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" />
        </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="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="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" />
        </screen>
        <screen name="configOSD" position="130,113" size="460,350" title="OSD Settings">
                <widget name="okbutton" position="20,270" size="205,40" />


@@ -231,16 +234,33 @@
        <screen name="Mute" flags="wfNoBorder" position="100,100" size="59,80" title="Mute" zPosition="-1">
                <ePixmap position="0,0" size="59,80" pixmap="mute-fs8.png" />
        </screen>
        <screen name="Mute" flags="wfNoBorder" position="100,100" size="59,80" title="Mute" zPosition="-1">
                <ePixmap position="0,0" size="59,80" pixmap="mute-fs8.png" />
        </screen>

-       <screen name="Dish" flags="wfNoBorder" position="300,100" size="100,107" title="Dish" zPosition="-10" >
-               <widget name="transparent" zPosition="-1" position="0,0" size="100,107" backgroundColor="transparent" />
+       <screen name="Dish" flags="wfNoBorder" position="300,100" size="100,107" title="Dish" zPosition="-2" backgroundColor="transparent" >

                <widget name="Dishpixmap" pixmap="dish.png" position="0,0" size="100,107" />
        </screen>
                <widget name="Dishpixmap" pixmap="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="0,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 name="ChannelSelection" position="90,98" size="560,417" title="Channel Selection">
+               <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" />
+               <widget name="key_blue" position="420,0" size="140,30" backgroundColor="blue" font="Regular;21" />
+               <widget name="list" position="0,35" size="560,280" scrollbarMode="showOnDemand" />
+               <ePixmap position="0,316" size="560,101" pixmap="border_eventinfo-fs8.png" zPosition="1" transparent="1" alphatest="on" />
+               <widget source="ServiceEvent" render="Label" position="0,322" size="55,22" font="Regular;19" halign="right" >
+                       <convert type="EventTime">StartTime</convert>
+                       <convert type="ClockToText"></convert>
+               </widget>
+               <widget source="ServiceEvent" render="Label" position="62,322" size="70,22" font="Regular;19" >
+                       <convert type="EventTime">EndTime</convert>
+                       <convert type="ClockToText">Format:- %H:%M</convert>
+               </widget>
+               <widget source="ServiceEvent" render="Progress" position="140,326" size="100,13" borderWidth="2" >
+                       <convert type="EventTime">Progress</convert>
+               </widget>
+               <widget source="CurrentTime" render="Label" position="495,322" size="65,28" font="Regular;19" >
+                       <convert type="ClockToText"></convert>
+               </widget>
+               <widget source="ServiceEvent" render="Label" position="4,347" size="552,66" font="Regular;19" >
+                       <convert type="EventName">ExtendedDescription</convert>
+               </widget>

        </screen>
        <screen name="ChannelSelectionRadio" position="90,98" size="560,307" title="Channel Selection">
                <widget name="key_red" position="0,0" size="140,40" backgroundColor="red" font="Regular;21" />
        </screen>
        <screen name="ChannelSelectionRadio" position="90,98" size="560,307" title="Channel Selection">
                <widget name="key_red" position="0,0" size="140,40" backgroundColor="red" font="Regular;21" />


@@ -321,6 +341,33 @@
                <widget name="date" position="410,40" size="140,40" valign="center" halign="right" font="Regular;24" />
                <widget name="list" position="00,85" size="560,325" scrollbarMode="showOnDemand" />
        </screen>
                <widget name="date" position="410,40" size="140,40" valign="center" halign="right" font="Regular;24" />
                <widget name="list" position="00,85" size="560,325" scrollbarMode="showOnDemand" />
        </screen>

+       <screen name="GraphMultiEPG" position="90,95" size="560,430" title="Electronic Program Guide">
+               <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 source="Clock" render="Label" position="420,0" size="130,30" font="Regular;21" valign="center" halign="right" >
+                       <convert type="ClockToText">WithSeconds</convert>
+               </widget>
+               <widget name="timeline_text" position="0,35" size="560,25" />
+               <widget name="list" position="0,60" size="560,324" scrollbarMode="showOnDemand" />
+               <widget name="timeline0" position="0,55" size="1,334" pixmap="timeline-fs8.png" zPosition="1" />
+               <widget name="timeline1" position="0,55" size="1,334" pixmap="timeline-fs8.png" zPosition="1" />
+               <widget name="timeline2" position="0,55" size="1,334" pixmap="timeline-fs8.png" zPosition="1" />
+               <widget name="timeline3" position="0,55" size="1,334" pixmap="timeline-fs8.png" zPosition="1" />
+               <widget name="timeline4" position="0,55" size="1,334" pixmap="timeline-fs8.png" zPosition="1" />
+               <widget name="timeline5" position="0,55" size="1,334" pixmap="timeline-fs8.png" zPosition="1" />
+               <widget name="timeline_now" position="0,55" size="1,334" pixmap="timeline-now-fs8.png" zPosition="1" />
+               <widget source="Event" render="Label" position="0,395" size="55,30" font="Regular;19" halign="right" >
+                       <convert type="EventTime">StartTime</convert>
+                       <convert type="ClockToText"></convert>
+               </widget>
+               <widget source="Event" render="Label" position="62,395" size="70,30" font="Regular;19" >
+                       <convert type="EventTime">EndTime</convert>
+                       <convert type="ClockToText">Format:- %H:%M</convert>
+               </widget>
+               <widget source="Event" render="Label" position="135,395" size="425,30" font="Regular;19" >
+                       <convert type="EventName"></convert>
+               </widget>
+       </screen>

        <screen name="EventView" position="100,100" size="520,380" title="Eventview">
                <widget name="key_red" position="0,0" size="130,30" backgroundColor="red" font="Regular;21" />
                <widget name="key_green" position="130,0" size="130,30" backgroundColor="green" font="Regular;21" />
        <screen name="EventView" position="100,100" size="520,380" title="Eventview">
                <widget name="key_red" position="0,0" size="130,30" backgroundColor="red" font="Regular;21" />
                <widget name="key_green" position="130,0" size="130,30" backgroundColor="green" font="Regular;21" />


@@ -332,7 +379,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="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" />
        </screen>
 
        <screen name="SubtitleDisplay" position="0,0" size="720,568" zPosition="-1" flags="wfNoBorder" />


@@ -378,16 +425,34 @@
                <widget name="text" position="0,0" size="600,150" font="Regular;23" />
        </screen>
 
                <widget name="text" position="0,0" size="600,150" font="Regular;23" />
        </screen>
 

+       <screen name="MovieContextMenu" position="150,150" size="400,250" title="Movielist menu">
+               <widget name="menu" position="10,10" size="390,230" scrollbarMode="showOnDemand" />
+       </screen>
+

        <screen name="MovieSelection" position="90,78" size="560,455" title="Select a movie">
                <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 name="MovieSelection" position="90,78" size="560,455" title="Select a movie">
                <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" />
 

-               <widget name="waitingtext" position="0,40" size="500,335" zPosition="2" font="Regular;22" />
-               <widget name="list" position="0,40" size="560,375" zPosition="1" scrollbarMode="showOnDemand" />
+               <widget name="waitingtext" position="0,40" size="500,335" zPosition="4" font="Regular;22" />
+               <widget name="list" position="0,40" size="560,375" zPosition="2" scrollbarMode="showOnDemand" />

                <widget name="freeDiskSpace" position="10,420" size="510,30" font="Regular;22" />
                <ePixmap position="520,430" zPosition="1" size="36,20" pixmap="key_menu-fs8.png" transparent="1" alphatest="on" />
                <widget name="freeDiskSpace" position="10,420" size="510,30" font="Regular;22" />
                <ePixmap position="520,430" zPosition="1" size="36,20" pixmap="key_menu-fs8.png" transparent="1" alphatest="on" />

+               <widget name="DescriptionBorder" position="0,316" size="560,101" pixmap="border_eventinfo-fs8.png" zPosition="1" transparent="1" alphatest="on" />
+               <widget source="Service" render="Label" position="4,318" size="326,22" font="Regular;17" zPosition="1" >
+                       <convert type="MovieInfo">ShortDescription</convert>
+               </widget>
+               <widget source="Service" render="Label" position="330,319" size="155,22" font="Regular;15" zPosition="1" halign="right" >
+                       <convert type="MovieInfo">RecordServiceName</convert>
+               </widget>
+               <widget source="Service" render="Label" position="487,319" size="60,22" font="Regular;15" zPosition="1" halign="right" >
+                       <convert type="ServiceTime">Duration</convert>
+                       <convert type="ClockToText">AsLength</convert>
+               </widget>
+               <widget source="Service" render="Label" position="4,344" size="552,66" font="Regular;19" zPosition="1" >
+                       <convert type="EventName">ExtendedDescription</convert>
+               </widget>

        </screen>
        <screen name="ServiceScan" position="200,100" size="300,330" title="Service Scan">
                <widget name="pass" position="10,10" size="280,30" font="Regular;20" />
        </screen>
        <screen name="ServiceScan" position="200,100" size="300,330" title="Service Scan">
                <widget name="pass" position="10,10" size="280,30" font="Regular;20" />


@@ -433,36 +498,36 @@ from enigma import eSize, ePoint
 
 orgwidth = self.instance.size().width()
 orgpos = self.instance.position()
 
 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)
 
 # 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
 
        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)
 
 wsize = (wsizex, wsizey)
 

-

 # resize
 self.instance.resize(eSize(*wsize))
 
 # resize label
 # 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)
 
 # 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]
 
 # 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">
                </applet>
        </screen>
        <screen name="TimerEdit" position="70,100" size="590,335" title="Timer Edit">


@@ -477,6 +542,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="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">
                <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 +578,7 @@ from enigma import eSize, ePoint
 
 orgwidth = self.instance.size().width()
 orgpos = self.instance.position()
 
 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)
 
 # y size still must be fixed in font stuff...
 textsize = (textsize[0] + 50, textsize[1] + 50)


@@ -520,7 +587,7 @@ if self.type == self.TYPE_YESNO:
        offset = 60
 wsizex = textsize[0] + 60
 wsizey = textsize[1] + offset
        offset = 60
 wsizex = textsize[0] + 60
 wsizey = textsize[1] + offset

-if (280 > wsizex):
+if (280 &gt; wsizex):

        wsizex = 280
 wsize = (wsizex, wsizey)
 
        wsizex = 280
 wsize = (wsizex, wsizey)
 


@@ -529,12 +596,12 @@ wsize = (wsizex, wsizey)
 self.instance.resize(eSize(*wsize))
 
 # resize label
 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)
 
 # 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]
 
 # center window
 newwidth = wsize[0]