add ability to select in scan what is todo with existing services (Clear before scan)

[enigma2.git] / data / skin_default.xml

diff --git a/data/skin_default.xml b/data/skin_default.xml
index 5d5d196f4f95ec066dd04452f7ec15e7a8b53e2d..aeaef247ad06e7cc298af50701e0204d78101ec6 100644 (file)
--- a/data/skin_default.xml
+++ b/data/skin_default.xml
@@ -15,23 +15,23 @@
        <screen name="Scart" position="0,0" size="720,576">
        </screen>
        <screen name="MediaPlayer" position="100,100" size="550,400" title="MediaPlayer" >
-               <widget name="currenttext" position="0,0" size="550,30" font="Regular;18" valign="center" backgroundColor="#101258" />
+               <widget name="currenttext" position="0,0" size="550,40" font="Regular;18" valign="center" backgroundColor="#101258" />
                
-               <widget name="filelist" position="10,30" size="255,265" scrollbarMode="showOnDemand" />
-               <widget name="playlist" position="265,30" size="285,265" scrollbarMode="showOnDemand" selectionDisabled="1" />
+               <widget name="filelist" position="0,42" size="265,255" scrollbarMode="showOnDemand" />
+               <widget name="playlist" position="275,42" size="275,255" scrollbarMode="showOnDemand" selectionDisabled="1" />
                        
-               <ePixmap position="10,365" zPosition="0" size="177,32" pixmap="dvr-buttons-small-fs8.png" />
-               <widget name="PositionGauge" position="10,335" size="177,20" zPosition="2" pointer="position_pointer.png:3,5"/>
+               <ePixmap position="0,365" zPosition="0" size="177,32" pixmap="dvr-buttons-small-fs8.png" />
+               <widget name="PositionGauge" position="0,335" size="177,20" zPosition="2" pointer="position_pointer.png:3,5"/>
                        
-               <widget name="artisttext" position="200,300" size="70,23" font="Regular;18" valign="center" backgroundColor="#101258" />
+               <widget name="artisttext" position="185,300" size="85,23" font="Regular;18" valign="center" backgroundColor="#101258" />
                <widget name="artist" position="270,300" size="280,23" font="Regular;18" valign="center" backgroundColor="#101258" />
-               <widget name="titletext" position="200,323" size="70,23" font="Regular;18" valign="center" backgroundColor="#101258" />
+               <widget name="titletext" position="185,323" size="85,23" font="Regular;18" valign="center" backgroundColor="#101258" />
                <widget name="title" position="270,323" size="280,23" font="Regular;18" valign="center" backgroundColor="#101258" />
-               <widget name="albumtext" position="200,346" size="70,23" font="Regular;18" valign="center" backgroundColor="#101258" />
+               <widget name="albumtext" position="185,346" size="85,23" font="Regular;18" valign="center" backgroundColor="#101258" />
                <widget name="album" position="270,346" size="280,23" font="Regular;18" valign="center" backgroundColor="#101258" />
-               <widget name="yeartext" position="200,369" size="70,23" font="Regular;18" valign="center" backgroundColor="#101258" />
-               <widget name="year" position="270,369" size="100,23" font="Regular;18" valign="center" backgroundColor="#101258" />
-               <widget name="genretext" position="370,369" size="70,23" font="Regular;18" valign="center" backgroundColor="#101258" />
+               <widget name="yeartext" position="185,369" size="85,23" font="Regular;18" valign="center" backgroundColor="#101258" />
+               <widget name="year" position="270,369" size="70,23" font="Regular;18" valign="center" backgroundColor="#101258" />
+               <widget name="genretext" position="340,369" size="100,23" font="Regular;18" valign="center" backgroundColor="#101258" />
                <widget name="genre" position="440,369" size="110,23" font="Regular;18" valign="center" backgroundColor="#101258" />
        </screen>
        <screen name="ServiceInfo" position="100,120" size="560,370" title="Serviceinfo">
@@ -68,8 +68,8 @@
                <widget name="cancel" position="240,240" size="100,30" pixmap="cancel.png" />
                <widget name="canceltext" position="240,240" size="100,30" valign="center" halign="center" zPosition="2" font="Regular;20" transparent="1" />
        </screen>
-       <screen name="LanguageSelection" position="200,125" size="220,250" title="Language selection">
-               <widget name="list" position="10,0" size="190,250" scrollbarMode="showOnDemand" />
+       <screen name="LanguageSelection" position="200,125" size="320,260" title="Language selection">
+               <widget name="list" position="0,0" size="310,250" scrollbarMode="showOnDemand" />
        </screen>
        <screen name="PluginBrowser" position="170,125" size="400,350" title="Plugin browser">
                <widget name="red" position="0,0" size="200,40" backgroundColor="red" valign="center" halign="center" font="Regular;20" />
@@ -193,7 +193,7 @@
                <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="00,45" size="560,364" scrollbarMode="showOnDemand" />
+               <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" />
@@ -259,8 +259,11 @@
                <widget name="duration" position="140,345" size="100,30" font="Regular;22" />
                <widget name="channel" position="240,345" size="270,30" font="Regular;22" />
        </screen>
-       <screen name="PictureInPicture" position="500,100" size="180,140" zPosition="-1" flags="wfNoBorder" >
-               <widget name="video" position="0,0" size="160,120" />
+       <screen name="PictureInPicture" position="400,60" size="240,192" zPosition="-1" flags="wfNoBorder" >
+               <widget name="video" position="0,0" size="240,192" />
+       </screen>
+       <screen name="PiPSetup" backgroundColor="transparent" position="70,400" size="600,150" title="PiPSetup" flags="wfNoBorder">
+               <widget name="text" position="0,0" size="600,150" font="Regular;23" />
        </screen>
        <screen name="MovieSelection" position="90,98" size="560,415" title="Select a movie">
                <widget name="waitingtext" position="0,0" size="500,335" zPosition="2" font="Regular;22" />
@@ -291,13 +294,14 @@ textsize = self["text"].getSize()
 # y size still must be fixed in font stuff...
 textsize = (textsize[0] + 50, textsize[1] + 50)
 count = len(self.list)
-if count > 6:
-       count = 6
-offset = 30 * count
+if count > 10:
+       count = 10
+offset = 25 * count
 wsizex = textsize[0] + 60
 wsizey = textsize[1] + offset
-if (400 > wsizex):
-       wsizex = 400
+
+if (450 > wsizex):
+       wsizex = 450
 wsize = (wsizex, wsizey)
 
 
@@ -308,7 +312,7 @@ self.instance.resize(eSize(*wsize))
 self["text"].instance.resize(eSize(*textsize))
 
 # move list
-listsize = (wsizex, 30 * len(self.list))
+listsize = (wsizex, 25 * count)
 self["list"].instance.move(ePoint(0, textsize[1]))
 self["list"].instance.resize(eSize(*listsize))
 
@@ -341,6 +345,14 @@ newwidth = wsize[0]
                <widget name="timeshift" position="0,30" size="150,30" font="Regular;25" halign="center" 
                        backgroundColor="transpBlack" foregroundColor="white" />
        </screen>
+       <screen name="TimeDateInput" position="150,150" size="400,200" title="Time/Date Input">
+               <widget name="config" position="5,10" size="380,150" />
+               <widget name="ok" position="110,165" size="53,30" pixmap="ok.png" />
+               <widget name="oktext" position="110,165" size="53,30" valign="center" halign="center" zPosition="2" font="Regular;20" transparent="1" />
+               <widget name="cancel" position="210,165" size="100,30" pixmap="cancel.png" />
+               <widget name="canceltext" position="210,165" size="100,30" valign="center" halign="center" zPosition="2" font="Regular;20" transparent="1" />
+       </screen>
+
        <screen name="MessageBox" position="60,300" size="600,10" title="Message">
                <widget name="text" position="60,10" size="520,0" font="Regular;22" />
                <widget name="ErrorPixmap" pixmap="error.png" position="0,0" zPosition="3" size="53,53" alphatest="on" transparent="1" />