X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/84702da5d3a6df33717b399b859008a3cf8a1522..ac2766df1ddb2de286bf324b002cb1a6911ff1dd:/data/skin_default.xml

diff --git a/data/skin_default.xml b/data/skin_default.xml
index 3ed48eab..2dbea2db 100644
--- a/data/skin_default.xml
+++ b/data/skin_default.xml
@@ -1,10 +1,16 @@
 <skin>
+	<fonts>
+		<font filename="lcd.ttf" name="LCD" scale="100" />
+	</fonts>
+
 	<screen name="Standby" flags="wfNoBorder" position="0,0" size="720,576" title="Standby">
 	</screen>
-	<screen name="Menu" position="210,150" size="300,265" title="Main menu">
+	<screen name="Menu" position="210,150" size="300,285" 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,225" 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" />
@@ -14,53 +20,65 @@
 	</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,40" font="Regular;18" valign="center" backgroundColor="#101258" />
-		
-		<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="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="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="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="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="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">
+	<screen name="MediaPlayer" position="104,83" size="512,442" title="MediaPlayer">
+		<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="album" position="78,30" zPosition="3" size="290,17" font="Regular;16" valign="top" foregroundColor="#dddddd" backgroundColor="#33294a6b" />
+		<widget name="yeartext" position="13,49" zPosition="3" size="65,17" font="Regular;16" valign="top" foregroundColor="#cccccc" backgroundColor="#33294a6b" shadowColor="#000000" shadowOffset="-2,-2"/>
+		<widget name="year" position="78,49" zPosition="3" size="290,17" font="Regular;16" valign="top" foregroundColor="#dddddd" backgroundColor="#33294a6b" />
+		<widget name="genretext" position="13,68" zPosition="3" size="65,17" font="Regular;16" valign="top" foregroundColor="#cccccc" backgroundColor="#33294a6b" shadowColor="#000000" shadowOffset="-2,-2"/>
+		<widget name="genre" position="78,68" zPosition="3" size="290,17" font="Regular;16" valign="top" foregroundColor="#dddddd" 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" />
+		<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" 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" />
 		<widget name="yellow" position="280,0" size="140,40" backgroundColor="yellow" valign="center" halign="center" font="Regular;21" />
 		<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="AudioSelection" position="210,150" size="300,170" title="Audio">
+	<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="SubserviceSelection" position="210,150" size="300,250" title="Subservices">
+	<screen name="SubserviceSelection" position="210,163" size="300,250" title="Subservices">
 		<widget name="subservices" position="20,10" size="260,230" scrollbarMode="showOnDemand" />
 	</screen>
-	<screen name="HarddiskWait" position="140,165" size="360,60">
-		<widget name="wait" position="20,10" size="320,25" font="Regular;23"/>
+		<screen name="HarddiskWait" position="100,150" size="540,60">
+		<widget name="wait" position="20,10" size="500,25" font="Regular;23"/>
 	</screen>
-	<screen name="HarddiskSelection" position="140,165" size="360,100" title="Select HDD">
-		<widget name="hddlist" position="20,10" size="320,75" />
+	<screen name="HarddiskSelection" position="100,150" size="540,100" title="Select HDD">
+		<widget name="hddlist" position="20,10" size="500,75" />
 	</screen>
-	<screen name="HarddiskSetup" position="140,165" size="420,160" title="Harddisk">
+	<screen name="HarddiskSetup" position="150,150" size="420,160" title="Harddisk">
 		<widget name="model" position="20,10" size="380,25" font="Regular;23"  />
 		<widget name="capacity" position="20,40" size="380,25" font="Regular;23"  />
 		<widget name="bus" position="20,70" size="380,25" font="Regular;23"  />
-		<widget name="initialize" position="40,110" size="120,30" zPosition="1" pixmap="init.png" />
-		<widget name="initializetext" position="40,110" size="120,30" valign="center" halign="center" zPosition="2" font="Regular;20" transparent="1" />
+		<widget name="initialize" position="150,120" zPosition="1" size="120,30" pixmap="init.png"  transparent="1" alphatest="on" />
+		<widget name="initializetext" position="150,120" size="120,30" valign="center" halign="center" zPosition="2" font="Regular;20" transparent="1" />
 	</screen>
-	<screen name="Setup" position="100,125" size="540,280" title="Setup">
+	<screen name="Setup" position="90,148" size="540,280" title="Setup">
 		<widget name="title" position="10,10" size="280,35" font="Regular;23" />
 		<widget name="config" position="10,50" size="520,175" scrollbarMode="showOnDemand" />
 		<widget name="ok" position="140,240" size="53,30" pixmap="ok.png" />
@@ -68,59 +86,67 @@
 		<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="320,260" title="Language selection">
+	<screen name="LanguageSelection" position="200,158" 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" />
-		<widget name="green" position="200,0" size="200,40" backgroundColor="green" valign="center" halign="center" font="Regular;20" />
-
-		<widget name="list" position="10,50" size="380,280" scrollbarMode="showOnDemand" />
+	<screen name="PluginBrowser" position="150,115" size="420,370" title="Plugin browser">
+		<widget name="red" position="5,0" size="200,40" backgroundColor="red" valign="center" halign="center" font="Regular;20" />
+		<widget name="green" position="215,0" size="200,40" backgroundColor="green" valign="center" halign="center" font="Regular;20" />
+		<widget name="list" position="10,50" size="400,300" scrollbarMode="showOnDemand" />
 	</screen>
-	<screen name="PluginDownloadBrowser" position="170,125" size="400,350" title="Downloadable plugins">
+	<screen name="PluginDownloadBrowser" position="160,113" size="400,350" title="Downloadable plugins">
 		<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="140,165" size="400,100" title="select Slot">
+	<screen name="NimSelection" position="160,238" size="400,100" title="select Slot">
 		<widget name="nimlist" position="20,10" size="360,75" />
 	</screen>
-	<screen name="CiWait" position="140,165" size="360,50" title="Common Interface">
+	<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,165" 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="130,165" size="450,270">
+	<screen name="CiMmi" position="135,153" size="450,270">
 		<widget name="title" position="10,10" size="430,25" font="Regular;23" />
 		<widget name="subtitle" position="10,35" size="430,25" font="Regular;23" />
 		<widget name="entries" position="10,70" size="430,150" scrollbarMode="showOnDemand" />
 		<widget name="bottom" position="10,230" size="430,25" font="Regular;23" />
 	</screen>
-	<screen name="NimSetup" position="90,98" size="560,410" title="Satconfig">
+	<screen name="NimSetup" position="80,83" size="560,410" title="Reception Settings">
 		<widget name="config" position="0,0" size="560,402" scrollbarMode="showOnDemand" />
 	</screen>
-	<screen name="ScanSetup" position="90,100" size="520,400" title="Service scan">
+	<screen name="ScanSetup" position="100,88" size="520,400" title="Service scan">
 		<widget name="config" position="20,10" size="460,350" scrollbarMode="showOnDemand" />
 		<widget name="introduction" position="20,360" size="350,30" font="Regular;23" />
 	</screen>
-	<screen name="ScanSimple" position="150,100" size="400,300" title="Service scan">
+	<screen name="ScanSimple" position="160,138" size="400,300" title="Service scan">
 		<widget name="header" position="20,10" size="280,25" font="Regular;23"/>
 		<widget name="config" position="20,45" size="360,200" scrollbarMode="showOnDemand" />
 		<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="100,100" size="500,400" title="Timer entry">
+	<screen name="Subtitles" position="150,130" size="420,350" title="Subtitle selection">
+		<widget name="config" position="10,10" size="405,325" scrollbarMode="showOnDemand" />
+	</screen>
+	<screen name="ParentalControlSetup" position="100,88" size="520,400" title="Parental control setup">
+		<widget name="config" position="20,10" size="460,350" scrollbarMode="showOnDemand" />
+	</screen>
+	<screen name="ParentalControlEditor" position="100,88" size="520,400" title="Parental control services Editor">
+		<widget name="servicelist" position="20,10" size="460,350" scrollbarMode="showOnDemand" />
+	</screen>
+	<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="cancel" position="240,365" size="100,30" pixmap="cancel.png" />
 		<widget name="canceltext" position="240,365" size="100,30" valign="center" halign="center" zPosition="2" font="Regular;20" transparent="1" />
 	</screen>
-	<screen name="NetworkSetup" position="140,125" size="460,280" title="Network Setup">
+	<screen name="NetworkSetup" position="130,148" size="460,280" title="Network Setup">
 		<widget name="config" position="10,50" size="420,175" scrollbarMode="showOnDemand" />
 		<widget name="introduction" position="10,230" size="400,30" font="Regular;23" />
 	</screen>
-	<screen name="About" position="140,125" size="360,250" title="About">
+	<screen name="About" position="180,163" size="360,250" 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,80" size="420,20" font="Regular;18"/>
@@ -129,7 +155,7 @@
 		<widget name="hdd" position="10,170" size="420,20" font="Regular;18"/>
 		<widget name="hddA" position="10,190" size="420,40" font="Regular;18"/>
 	</screen>
-	<screen name="configOSD" position="140,125" size="460,350" title="OSD Settings">
+	<screen name="configOSD" position="130,113" size="460,350" title="OSD Settings">
 		<widget name="okbutton" position="20,270" size="205,40" />
 		<widget name="txt_alpha" position="20,20" size="110,20" />
 		<widget name="sld_alpha" position="150,20" size="290,20" />
@@ -173,10 +199,9 @@
 		<widget name="title" position="10,120" size="280,50" />
 		<widget name="theClock" position="10,60" size="280,50" />
 	</screen>
-
-	<screen name="NumberZap" position="200,140" size="280,60" title="Channel">
-		<widget name="channel" position="50,15" size="110,25" font="Regular;23" />
-		<widget name="number" position="160,15" size="80,25" halign="right" font="Regular;23" />
+	<screen name="NumberZap" position="235,255" size="250,60" title="Channel">
+		<widget name="channel" position="35,15" size="110,25" font="Regular;23" />
+		<widget name="number" position="145,15" size="80,25" halign="right" font="Regular;23" />
 	</screen>
 	<screen name="MinuteInput" position="200,140" size="280,60" title="Seek">
 		<widget name="minutes" position="80,15" size="160,25" halign="right" font="Regular;23" />
@@ -193,7 +218,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" />
@@ -204,19 +229,45 @@
 		<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="list" position="0,45" size="560,252" scrollbarMode="showOnDemand" />
+		<widget name="list" position="0,45" size="560,196" scrollbarMode="showOnDemand" />
+		<widget source="RadioText" render="Label" position="0,241" size="560,66" font="LCD;25" >
+			<convert type="RadioText">RadioText</convert>
+		</widget>
 	</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="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" />
@@ -259,16 +310,24 @@
 		<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="SubtitleDisplay" position="0,0" size="720,568" zPosition="-1" flags="wfNoBorder" >
 	</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" />
-		<widget name="list" position="0,0" size="560,375" zPosition="1" scrollbarMode="showOnDemand" />
-		<widget name="freeDiskSpace" position="10,380" size="540,30" font="Regular;25" />
+	<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="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" />
 	</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" />
@@ -280,6 +339,16 @@
 		<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="PinInput" position="100,100" size="550,160" title="Pin code needed" >
+		<widget name="service" position="0,0" size="550,25" font="Regular;20" />
+		<widget name="text" position="0,30" size="550,25" font="Regular;20" />
+		<widget name="tries" position="0,60" size="550,25" font="Regular;20" />
+		<widget name="input" position="200,100" size="550,25" font="Regular;50" />
+		
+	</screen>
+	<screen name="ParentalControlChangePin" position="100,100" size="550,160" title="Change pin code" >
+		<widget name="config" position="20,10" size="460,350" scrollbarMode="showOnDemand" />
+	</screen>
 	<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" />
@@ -319,7 +388,7 @@ self["list"].instance.resize(eSize(*listsize))
 # 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" />
@@ -330,7 +399,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="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" />
@@ -342,8 +411,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" />
-		<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" />
@@ -353,11 +424,11 @@ newwidth = wsize[0]
 		<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" />
-		<widget name="QuestionPixmap" pixmap="question.png" position="0,0" zPosition="3" size="53,53" alphatest="on" transparent="1" />
-		<widget name="InfoPixmap" pixmap="info.png" position="0,0" zPosition="3" size="53,53" alphatest="on" transparent="1" />
+	<screen name="MessageBox" position="60,245" size="600,10" title="Message">
+		<widget name="text" position="65,8" size="520,0" font="Regular;22" />
+		<widget name="ErrorPixmap" pixmap="error.png" position="5,5" zPosition="3" size="53,53" alphatest="on" transparent="1" />
+		<widget name="QuestionPixmap" pixmap="question.png" position="5,5" zPosition="3" size="53,53" alphatest="on" transparent="1" />
+		<widget name="InfoPixmap" pixmap="info.png" position="5,5" zPosition="3" size="53,53" alphatest="on" transparent="1" />
 		<widget name="list" position="100,100" size="480,375" />
 		<applet type="onLayoutFinish">
 # this should be factored out into some helper code, but currently demonstrates applets.
@@ -395,4 +466,18 @@ newwidth = wsize[0]
 self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
 		</applet>
 	</screen>
-</skin>
\ No newline at end of file
+	<screen name="NumericalTextInputHelpDialog" flags="wfNoBorder" position="250,370" size="400,100" zPosition="2" backgroundColor="#202020">
+		<eLabel position="3,3" size="392,92" backgroundColor="#c0c0c0" zPosition="-1" />
+		<widget name="key1" position="5,5" size="130,30" font="Regular;16" halign="center" />
+		<widget name="key2" position="135,5" size="130,30" font="Regular;16" halign="center" />
+		<widget name="key3" position="265,5" size="130,30" font="Regular;16" halign="center" />
+
+		<widget name="key4" position="5,35" size="130,30" font="Regular;16" halign="center" />
+		<widget name="key5" position="135,35" size="130,30" font="Regular;16" halign="center" />
+		<widget name="key6" position="265,35" size="130,30" font="Regular;16" halign="center" />
+
+		<widget name="key7" position="5,65" size="130,30" font="Regular;16" halign="center" />
+		<widget name="key8" position="135,65" size="130,30" font="Regular;16" halign="center" />
+		<widget name="key9" position="265,65" size="130,30" font="Regular;16" halign="center" />
+	</screen>
+</skin>