revert

[enigma2.git] / data / skin_default.xml

diff --git a/data/skin_default.xml b/data/skin_default.xml
index ea80091e525279e309384c4fd873c4272afc70d5..34e69f5877fff1f58c7e4c930d3192e0be501fc8 100644 (file)
--- a/data/skin_default.xml
+++ b/data/skin_default.xml
@@ -1,10 +1,10 @@
 <skin>
        <screen name="Standby" flags="wfNoBorder" position="0,0" size="720,576" title="Standby">
        </screen>
 <skin>
        <screen name="Standby" flags="wfNoBorder" position="0,0" size="720,576" title="Standby">
        </screen>

-       <screen name="Menu" position="210,150" size="300,235" title="Main menu">
+       <screen name="Menu" position="210,150" size="300,265" title="Main menu">

                <widget name="title" position="10,10" size="280,35" font="Regular;23" />
                <!--<widget name="menu" position="10,55" size="280,150" font="Regular;23" />-->
                <widget name="title" position="10,10" size="280,35" font="Regular;23" />
                <!--<widget name="menu" position="10,55" size="280,150" font="Regular;23" />-->

-               <widget name="menu" position="10,55" size="290,175" scrollbarMode="showOnDemand" />
+               <widget name="menu" position="10,55" size="290,205" scrollbarMode="showOnDemand" />

        </screen>
        <screen name="BouquetSelector" position="210,150" size="300,195" title="Choose bouquet">
                <widget name="menu" position="10,10" size="280,175" scrollbarMode="showOnDemand" />
        </screen>
        <screen name="BouquetSelector" position="210,150" size="300,195" title="Choose bouquet">
                <widget name="menu" position="10,10" size="280,175" scrollbarMode="showOnDemand" />


@@ -14,6 +14,26 @@
        </screen>
        <screen name="Scart" position="0,0" size="720,576">
        </screen>
        </screen>
        <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="filelist" position="10,30" size="255,265" scrollbarMode="showOnDemand" />
+               <widget name="playlist" position="265,30" size="285,265" 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"/>
+                       
+               <widget name="artisttext" position="200,300" size="70,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="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="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="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">
                <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" />
        <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" />


@@ -48,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>
                <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" />
        </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" />


@@ -128,6 +148,9 @@
                <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>
                <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="TimerSelection" position="70,100" size="560,400" title="Timer selection">
+               <widget name="timerlist" position="0,45" size="560,350" scrollbarMode="showOnDemand" />
+       </screen>

        <screen name="TimerSanityConflict" position="70,100" size="600,400" title="Timer sanity error">
                <widget name="timer1" position="0,45" size="290,80" scrollbarMode="showOnDemand" />
                <widget name="timer2" position="310,45" size="280,80" scrollbarMode="showOnDemand" />
        <screen name="TimerSanityConflict" position="70,100" size="600,400" title="Timer sanity error">
                <widget name="timer1" position="0,45" size="290,80" scrollbarMode="showOnDemand" />
                <widget name="timer2" position="310,45" size="280,80" scrollbarMode="showOnDemand" />


@@ -236,6 +259,9 @@
                <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>
                <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>

        <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" />
                <widget name="list" position="0,0" size="560,375" zPosition="1" scrollbarMode="showOnDemand" />
        <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" />
                <widget name="list" position="0,0" size="560,375" zPosition="1" scrollbarMode="showOnDemand" />


@@ -251,7 +277,7 @@
                <widget name="text" position="0,0" size="550,25" font="Regular;20" />
                <widget name="input" position="0,30" size="550,25" font="Regular;20" />
        </screen>
                <widget name="text" position="0,0" size="550,25" font="Regular;20" />
                <widget name="input" position="0,30" size="550,25" font="Regular;20" />
        </screen>

-       <screen name="ChoiceBox" position="100,100" size="550,400" title="Input" >
+       <screen name="ChoiceBox" position="150,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" scrollbarMode="showOnDemand" />
                <applet type="onLayoutFinish">
                <widget name="text" position="0,0" size="550,25" font="Regular;20" />
                <widget name="list" position="0,30" size="550,335" scrollbarMode="showOnDemand" />
                <applet type="onLayoutFinish">


@@ -288,7 +314,7 @@ self["list"].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(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))

                </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">