whitespace fixes, add NumericalTextInputHelpDialog

[enigma2.git] / data / skin_default.xml

diff --git a/data/skin_default.xml b/data/skin_default.xml
index 72f346750001baba73279aae33f4014e95f8673f..e49d6a5ce229d65716b3c8e01875eb0796a265e2 100644 (file)
--- a/data/skin_default.xml
+++ b/data/skin_default.xml
@@ -4,7 +4,9 @@
        <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" />-->
        <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="menu" position="10,55" size="290,205" scrollbarMode="showOnDemand" />
+               <widget source="menu" render="Listbox" position="10,55" size="290,205" scrollbarMode="showOnDemand" >
+                       <convert type="StringList" />
+               </widget>

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


@@ -15,7 +17,7 @@
        <screen name="Scart" position="0,0" size="720,576">
        </screen>
        <screen name="MediaPlayer" position="104,83" size="512,442" title="MediaPlayer">
        <screen name="Scart" position="0,0" size="720,576">
        </screen>
        <screen name="MediaPlayer" position="104,83" size="512,442" title="MediaPlayer">

-               <eLabel position="11,9" zPosition="1" size="359,78" backgroundColor="#182C40" />                
+               <eLabel position="11,9" zPosition="1" size="359,78" backgroundColor="#182C40" />

                <widget name="artisttext" position="13,11" zPosition="3" size="65,17" font="Regular;16" valign="top" foregroundColor="#cccccc" backgroundColor="#33294a6b" shadowColor="#000000" shadowOffset="-2,-2"/>
                <widget name="artist" position="78,11" zPosition="3" size="290,17" font="Regular;16" valign="top" foregroundColor="#dddddd" backgroundColor="#33294a6b" />
                <widget name="albumtext" position="13,30" zPosition="3" size="65,17" font="Regular;16" valign="top" foregroundColor="#cccccc" backgroundColor="#33294a6b" shadowColor="#000000" shadowOffset="-2,-2"/>
                <widget name="artisttext" position="13,11" zPosition="3" size="65,17" font="Regular;16" valign="top" foregroundColor="#cccccc" backgroundColor="#33294a6b" shadowColor="#000000" shadowOffset="-2,-2"/>
                <widget name="artist" position="78,11" zPosition="3" size="290,17" font="Regular;16" valign="top" foregroundColor="#dddddd" backgroundColor="#33294a6b" />
                <widget name="albumtext" position="13,30" zPosition="3" size="65,17" font="Regular;16" valign="top" foregroundColor="#cccccc" backgroundColor="#33294a6b" shadowColor="#000000" shadowOffset="-2,-2"/>


@@ -27,17 +29,17 @@
                <widget name="titletext" position="0,0" zPosition="3" size="0,0" font="Regular;16" valign="top" backgroundColor="#33294a6b" />
                <eLabel name="nowPlaying" position="13,97" zPosition="3" size="355,14" text="Now Playing" font="Regular;12" foregroundColor="#00ff66" backgroundColor="#33294a6b" shadowColor="#000000" shadowOffset="-1,-1"/>
                <widget name="title" position="13,111" zPosition="3" size="355,18" font="Regular;16" valign="top" backgroundColor="#33294a6b" />
                <widget name="titletext" position="0,0" zPosition="3" size="0,0" font="Regular;16" valign="top" backgroundColor="#33294a6b" />
                <eLabel name="nowPlaying" position="13,97" zPosition="3" size="355,14" text="Now Playing" font="Regular;12" foregroundColor="#00ff66" backgroundColor="#33294a6b" shadowColor="#000000" shadowOffset="-1,-1"/>
                <widget name="title" position="13,111" zPosition="3" size="355,18" font="Regular;16" valign="top" backgroundColor="#33294a6b" />

-               <eLabel position="383,9" zPosition="1" size="120,120" backgroundColor="#182C40" />                                      
-               <widget name="coverArt" position="385,11" zPosition="3" size="116,116" pixmap="no_coverArt.png" transparent="1" alphatest="on" />       
-               <eLabel position="11,137" zPosition="1" size="491,109" backgroundColor="#182C40" />             
-               <widget name="filelist" position="13,139" zPosition="2" size="487,105" scrollbarMode="showOnDemand" />  
-               <eLabel position="11,251" zPosition="1" size="491,109" backgroundColor="#182C40" />                             
+               <eLabel position="383,9" zPosition="1" size="120,120" backgroundColor="#182C40" />
+               <widget name="coverArt" position="385,11" zPosition="3" size="116,116" pixmap="no_coverArt.png" transparent="1" alphatest="on" />
+               <eLabel position="11,137" zPosition="1" size="491,109" backgroundColor="#182C40" />
+               <widget name="filelist" position="13,139" zPosition="2" size="487,105" scrollbarMode="showOnDemand" />
+               <eLabel position="11,251" zPosition="1" size="491,109" backgroundColor="#182C40" />

                <widget name="playlist" position="13,253" zPosition="2" size="487,105" scrollbarMode="showOnDemand" selectionDisabled="1" />
                <widget name="playlist" position="13,253" zPosition="2" size="487,105" scrollbarMode="showOnDemand" selectionDisabled="1" />

-               <eLabel position="11,365" zPosition="1" size="491,12" backgroundColor="#182C40" />                                                              
-               <widget name="PositionGauge" position="13,367" size="487,8" zPosition="3" pointer="position_pointer.png:3,8" backgroundColor="#33294a6b" />
-               <widget name="currenttext" position="13,383" zPosition="3" size="490,18" font="Regular;16" halign="center" foregroundColor="#dddddd" /> 
-               <ePixmap position="170,406" zPosition="1" size="177,32" pixmap="dvr-buttons-small-fs8.png" transparent="1" alphatest="on" />                                            
-       </screen>                       
+               <eLabel position="11,365" zPosition="1" size="491,12" backgroundColor="#182C40" />
+               <widget name="PositionGauge" position="13,367" size="487,8" zPosition="3" pointer="position_pointer.png:3,8" seek_pointer="position_pointer.png:3,8" backgroundColor="#33294a6b" />
+               <widget name="currenttext" position="13,383" zPosition="3" size="490,18" font="Regular;16" halign="center" foregroundColor="#dddddd" />
+               <ePixmap position="170,406" zPosition="1" size="177,32" pixmap="dvr-buttons-small-fs8.png" transparent="1" alphatest="on" />
+       </screen>

        <screen name="ServiceInfo" position="80,103" 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="80,103" 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" />


@@ -45,6 +47,14 @@
                <widget name="blue" position="420,0" size="140,40" backgroundColor="blue" valign="center" halign="center" font="Regular;21" />
                <widget name="infolist" position="20,50" size="560,365" selectionDisabled="1"/>
        </screen>
                <widget name="blue" position="420,0" size="140,40" backgroundColor="blue" valign="center" halign="center" font="Regular;21" />
                <widget name="infolist" position="20,50" size="560,365" selectionDisabled="1"/>
        </screen>

+       <screen name="SubservicesQuickzap" position="124,470" size="512,200" title="Subservices" flags="wfNoBorder" backgroundColor="transparent">
+               <widget name="BlinkingPoint" pixmap="BlinkingPoint-fs8.png" position="450,0" zPosition="2" size="15,15" alphatest="on" />
+               <eLabel position="0,0" size="470,20" backgroundColor="#33294a6b" font="Regular;13" text="Subservices" />
+               <widget name="CurrentSubserviceNumber" position="0,20" size="50,34" font="Regular;22" backgroundColor="#33294a6b" shadowColor="black" shadowOffset="-1,-1" />
+               <widget source="CurrentService" render="Label" position="50,20" size="420,34" font="Regular;22" backgroundColor="#33294a6b" shadowColor="black" shadowOffset="-1,-1" >
+                       <convert type="ServiceName">Name</convert>
+               </widget>
+       </screen>

        <screen name="AudioSelection" position="210,203" size="300,170" title="Audio">
                <widget name="tracks" position="20,10" size="260,150" scrollbarMode="showOnDemand" />
        </screen>
        <screen name="AudioSelection" position="210,203" size="300,170" title="Audio">
                <widget name="tracks" position="20,10" size="260,150" scrollbarMode="showOnDemand" />
        </screen>


@@ -90,8 +100,8 @@
        <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="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="180,238" size="360,100" title="Common Interface">
-               <widget name="entries" position="10,10" size="340,75" />
+       <screen name="CiSelection" position="140,226" size="440,125" title="Common Interface">
+               <widget name="entries" position="10,10" size="420,100" />

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


@@ -112,7 +122,7 @@
                <widget name="footer" position="20,250" size="360,25" font="Regular;23"/>
                <!--<widget name="introduction" position="20,360" size="280,30" font="Regular;23" />-->
        </screen>
                <widget name="footer" position="20,250" size="360,25" font="Regular;23"/>
                <!--<widget name="introduction" position="20,360" size="280,30" font="Regular;23" />-->
        </screen>

-       <screen name="TimerEntry" position="110,188" size="500,400" title="Timer entry">
+       <screen name="TimerEntry" position="110,88" size="500,400" title="Timer entry">

                <widget name="config" position="5,10" size="480,350" />
                <widget name="ok" position="140,365" size="53,30" pixmap="ok.png" />
                <widget name="oktext" position="140,365" size="53,30" valign="center" halign="center" zPosition="2" font="Regular;20" transparent="1" />
                <widget name="config" position="5,10" size="480,350" />
                <widget name="ok" position="140,365" size="53,30" pixmap="ok.png" />
                <widget name="oktext" position="140,365" size="53,30" valign="center" halign="center" zPosition="2" font="Regular;20" transparent="1" />


@@ -209,16 +219,39 @@
                <widget name="list" position="0,45" size="560,252" scrollbarMode="showOnDemand" />
        </screen>
        <screen name="RadioInfoBar" position="90,420" size="560,105" zPosition="-1">
                <widget name="list" position="0,45" size="560,252" scrollbarMode="showOnDemand" />
        </screen>
        <screen name="RadioInfoBar" position="90,420" size="560,105" zPosition="-1">

-               <widget name="ServiceName" position="0,0" size="390,26" font="Regular;22" backgroundColor="dark" />
+               <widget source="CurrentService" render="Label" position="0,0" size="390,26" font="Regular;22" backgroundColor="dark" >
+                       <convert type="ServiceName">Name</convert>
+               </widget>

                <widget name="BlinkingPoint" pixmap="record.png" position="400,0" zPosition="2" size="58,25" />
                <widget name="BlinkingPoint" pixmap="record.png" position="400,0" zPosition="2" size="58,25" />

-               <widget name="Clock" position="465,0" size="95,28" font="Regular;22" backgroundColor="dark" />
-               <widget name="Now_ProgressBar" position="465,27" size="90,9" zPosition="1" borderWidth="2" />
-               <widget name="Event_Now_StartTime" position="0,44" size="60,22" font="Regular;20" backgroundColor="dark" />
-               <widget name="Event_Next_StartTime" position="0,74" size="60,22" font="Regular;20" backgroundColor="dark" />
-               <widget name="Event_Now" position="80,44" size="380,22" font="Regular;20" backgroundColor="dark" />
-               <widget name="Event_Next" position="80,74" size="380,22" font="Regular;20" backgroundColor="dark" />
-               <widget name="Event_Now_Duration" position="470,44" size="150,22" font="Regular;20" backgroundColor="dark" />
-               <widget name="Event_Next_Duration" position="470,74" size="150,22" font="Regular;20" backgroundColor="dark" />
+               <widget source="CurrentTime" render="Label" position="465,0" size="95,28" font="Regular;22" backgroundColor="dark" >
+                       <convert type="ClockToText">WithSeconds</convert>
+               </widget>
+               <widget source="Event_Now" render="Progress" position="465,27" size="90,9" zPosition="1" borderWidth="2" >
+                       <convert type="EventTime">Progress</convert>
+               </widget>
+               <widget source="Event_Now" render="Label" position="0,44" size="60,22" font="Regular;20" backgroundColor="dark" >
+                       <convert type="EventTime">StartTime</convert>
+                       <convert type="ClockToText">Default</convert>
+               </widget>
+               <widget source="Event_Next" render="Label" position="0,74" size="60,22" font="Regular;20" backgroundColor="dark" >
+                       <convert type="EventTime">StartTime</convert>
+                       <convert type="ClockToText">Default</convert>
+               </widget>
+               <widget source="Event_Now" render="Label" position="80,44" size="380,22" font="Regular;20" backgroundColor="dark" >
+                       <convert type="EventName">Name</convert>
+               </widget>
+               <widget source="Event_Next" render="Label" position="80,74" size="380,22" font="Regular;20" backgroundColor="dark" >
+                       <convert type="EventName">Name</convert>
+               </widget>
+
+               <widget source="Event_Now" render="Label" position="470,44" size="150,22" font="Regular;20" backgroundColor="dark" >
+                       <convert type="EventTime">Remaining</convert>
+                       <convert type="RemainingToText">InMinutes</convert>
+               </widget>
+               <widget source="Event_Next" render="Label" position="470,74" size="150,22" font="Regular;20" backgroundColor="dark" >
+                       <convert type="EventTime">Duration</convert>
+                       <convert type="ClockToText">InMinutes</convert>
+               </widget>

        </screen>
        <screen name="SimpleChannelSelection" position="90,98" size="560,417" title="Channel Selection">
                <widget name="list" position="00,45" size="560,364" scrollbarMode="showOnDemand" />
        </screen>
        <screen name="SimpleChannelSelection" position="90,98" size="560,417" title="Channel Selection">
                <widget name="list" position="00,45" size="560,364" scrollbarMode="showOnDemand" />


@@ -323,7 +356,7 @@ self["list"].instance.resize(eSize(*listsize))
 # center window
 newwidth = wsize[0]
 #self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
 # center window
 newwidth = wsize[0]
 #self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))

-               </applet>                       
+               </applet>

        </screen>
        <screen name="TimerEdit" position="70,100" size="590,335" title="Timer Edit">
                <widget name="description" position="10,10" size="580,40" font="Regular;25" />
        </screen>
        <screen name="TimerEdit" position="70,100" size="590,335" title="Timer Edit">
                <widget name="description" position="10,10" size="580,40" font="Regular;25" />


@@ -334,7 +367,7 @@ newwidth = wsize[0]
                <widget name="apply" position="10,240" size="250,35" />
        </screen>
        <screen name="HelpMenu" flags="wfNoBorder" position="0,0" size="720,576" title="Menu">
                <widget name="apply" position="10,240" size="250,35" />
        </screen>
        <screen name="HelpMenu" flags="wfNoBorder" position="0,0" size="720,576" title="Menu">

-               <widget name="list" position="50,100" size="450,375" scrollbarMode="showOnDemand" />
+               <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"/>
                <eLabel position="400,40" size="220,60" text="help..." font="Regular;50" />
                <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"/>
                <eLabel position="400,40" size="220,60" text="help..." font="Regular;50" />


@@ -346,8 +379,10 @@ newwidth = wsize[0]
        <screen name="TimeshiftState" flags="wfNoBorder" position="70,70" size="150,60" backgroundColor="transpBlack" zPosition="2">
                <widget name="state" position="0,0" size="150,30" font="Regular;25" halign="center" 
                        backgroundColor="transpBlack" foregroundColor="white" />
        <screen name="TimeshiftState" flags="wfNoBorder" position="70,70" size="150,60" backgroundColor="transpBlack" zPosition="2">
                <widget name="state" position="0,0" size="150,30" font="Regular;25" halign="center" 
                        backgroundColor="transpBlack" foregroundColor="white" />

-               <widget name="timeshift" position="0,30" size="150,30" font="Regular;25" halign="center" 
-                       backgroundColor="transpBlack" foregroundColor="white" />
+               <widget source="CurrentService" render="Label" position="0,30" size="150,30" font="Regular;25" halign="center" 
+                       backgroundColor="transpBlack" foregroundColor="white" >
+                       <convert type="ServicePosition">Remaining</convert>
+               </widget>

        </screen>
        <screen name="TimeDateInput" position="150,150" size="400,200" title="Time/Date Input">
                <widget name="config" position="5,10" size="380,150" />
        </screen>
        <screen name="TimeDateInput" position="150,150" size="400,200" title="Time/Date Input">
                <widget name="config" position="5,10" size="380,150" />


@@ -399,4 +434,17 @@ newwidth = wsize[0]
 self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
                </applet>
        </screen>
 self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
                </applet>
        </screen>

+       <screen name="NumericalTextInputHelpDialog" position="300,370" size="300,90" zPosition="2">
+               <widget name="key1" position="0,0" size="100,30" font="Regular;16" halign="center" />
+               <widget name="key2" position="100,0" size="100,30" font="Regular;16" halign="center" />
+               <widget name="key3" position="200,0" size="100,30" font="Regular;16" halign="center" />
+
+               <widget name="key4" position="0,30" size="100,30" font="Regular;16" halign="center" />
+               <widget name="key5" position="100,30" size="100,30" font="Regular;16" halign="center" />
+               <widget name="key6" position="200,30" size="100,30" font="Regular;16" halign="center" />
+
+               <widget name="key7" position="0,60" size="100,30" font="Regular;16" halign="center" />
+               <widget name="key8" position="100,60" size="100,30" font="Regular;16" halign="center" />
+               <widget name="key9" position="200,60" size="100,30" font="Regular;16" halign="center" />
+       </screen>

 </skin>
 </skin>