X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/7a5004310012b60d8bf1fbd8b36add992a666bb0..257e83090ef5d12a6a99565df23934ffc4cb68e4:/data/skin_default.xml

diff --git a/data/skin_default.xml b/data/skin_default.xml
index e72095f4..7aaff38f 100755
--- a/data/skin_default.xml
+++ b/data/skin_default.xml
@@ -43,7 +43,9 @@
 		<widget source="Adaptertext" render="Label" position="10,355" size="120,21" zPosition="10" font="Regular;20" halign="left" backgroundColor="#25062748" transparent="1" />
 		<widget source="Adapter" render="Label" position="120,355" size="400,21" zPosition="10" font="Regular;20" halign="left" backgroundColor="#25062748" transparent="1" />
 		<widget source="introduction2" render="Label" position="10,380" size="540,21" zPosition="10" font="Regular;21" halign="center" valign="center" backgroundColor="#25062748" transparent="1"/>
-		<widget name="VKeyIcon" pixmap="skin_default/buttons/key_text.png" position="10,380" zPosition="10" size="35,25" transparent="1" alphatest="on" />
+		<widget source="VKeyIcon" render="Pixmap" pixmap="skin_default/buttons/key_text.png" position="10,380" zPosition="10" size="35,25" transparent="1" alphatest="on" >
+			<convert type="ConditionalShowHide" />
+		</widget>
 		<widget name="HelpWindow" pixmap="skin_default/vkey_icon.png" position="160,315" zPosition="1" size="1,1" transparent="1" alphatest="on" />
 	</screen>
 
@@ -68,8 +70,8 @@
 		<widget name="menu" position="10,10" size="290,225" scrollbarMode="showOnDemand" />
 	</screen>
 	<!-- Channel context menu -->
-	<screen name="ChannelContextMenu" position="center,center" size="300,255" title="Channellist menu">
-		<widget name="menu" position="10,10" size="290,230" scrollbarMode="showOnDemand" />
+	<screen name="ChannelContextMenu" position="center,center" size="350,255" title="Channellist menu">
+		<widget name="menu" position="10,10" size="340,230" scrollbarMode="showOnDemand" />
 	</screen>
 	<!-- Channel selection - TV -->
 	<screen name="ChannelSelection" position="center,center" size="560,430" title="Channel Selection">
@@ -109,7 +111,7 @@
 		</widget>
 	</screen>
 	<!-- Channel selection - Radio -->
-	<screen name="ChannelSelectionRadio" position="center,center" size="560,298" title="Channel Selection">
+	<screen name="ChannelSelectionRadio" position="center,95" size="560,298" title="Channel Selection">
 		<ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on" />
 		<ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on" />
 		<ePixmap pixmap="skin_default/buttons/yellow.png" position="280,0" size="140,40" alphatest="on" />
@@ -248,7 +250,7 @@ self.instance.move(ePoint((720-wsizex)/2, (576-wsizey)/(count &gt; 7 and 2 or 3)
 			<widget name="arrowup2" pixmap="skin_default/arrowup.png" position="-100,-100" zPosition="11" size="37,70" transparent="1" alphatest="on"/>
 	</screen>
 	<!-- Dish -->
-	<screen name="Dish" flags="wfNoBorder" position="300,100" size="130,160" title="Dish" zPosition="-1" backgroundColor="transparent">
+	<screen name="Dish" flags="wfNoBorder" position="300,100" size="130,160" title="Dish" zPosition="100" backgroundColor="transparent">
 		<widget name="Dishpixmap" pixmap="skin_default/icons/dish.png" position="0,0" size="130,160" alphatest="off" />
 	</screen>
 	<!-- EPG Selection - Single -->
@@ -655,18 +657,10 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
 		<widget name="key0" position="132,92" size="130,30" font="Console;12" halign="center" valign="center" />
 		<widget name="help2" position="262,92" size="130,30" font="Console;16" halign="center" valign="center" />
 	</screen>
-	<!-- Parental control - change pin -->
-	<screen name="ParentalControlChangePin" position="center,center" size="520,160" title="Change pin code">
-		<widget name="config" position="10,10" size="500,350" scrollbarMode="showOnDemand" />
-	</screen>
 	<!-- Parental control - editor -->
 	<screen name="ParentalControlEditor" position="center,center" size="520,400" title="Parental control services Editor">
 		<widget name="servicelist" position="10,10" size="500,350" scrollbarMode="showOnDemand" />
 	</screen>
-	<!-- Parental control - setup -->
-	<screen name="ParentalControlSetup" position="center,center" size="520,400" title="Parental control setup">
-		<widget name="config" position="10,10" size="500,350" scrollbarMode="showOnDemand" />
-	</screen>
 	<!-- Picture in picture -->
 	<screen name="PictureInPicture" position="400,60" zPosition="-1" size="240,192" flags="wfNoBorder">
 		<widget name="video" position="0,0" size="240,192" backgroundColor="transparent" />
@@ -700,7 +694,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
 		<widget name="state" position="0,0" size="150,30" font="Regular;25" halign="center" backgroundColor="transpBlack" foregroundColor="white" />
 	</screen>
 	<!-- Radio infobar -->
-	<screen name="RadioInfoBar" position="85,408" size="560,120" zPosition="-1" title="Radio">
+	<screen name="RadioInfoBar" position="center,408" size="560,120" zPosition="-1" title="Radio">
 		<widget source="session.CurrentService" render="Label" position="5,1" size="325,26" font="Regular;20" noWrap="1" transparent="1">
 			<convert type="ServiceName">Name</convert>
 		</widget>
@@ -811,9 +805,9 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
 		<widget name="config" position="10,165" size="500,225" scrollbarMode="showOnDemand" />
 	</screen>
 	<!-- Scan setup -->
-	<screen name="ScanSetup" position="center,center" size="520,390" title="Service scan">
+	<screen name="ScanSetup" position="center,center" size="520,450" title="Service scan">
 		<widget name="config" position="10,10" size="500,350" scrollbarMode="showOnDemand" />
-		<widget name="introduction" position="10,365" size="500,25" font="Regular;20" halign="center" />
+		<widget name="introduction" position="10,365" size="500,75" font="Regular;20" halign="center" />
 	</screen>
 	<!-- Scan simple -->
 	<screen name="ScanSimple" position="center,center" size="420,350" title="Service scan">
@@ -861,14 +855,11 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
 	</screen>
 	<!-- Setup -->
 	<screen name="Setup" position="center,center" size="560,430" title="Setup">
-		<widget name="cancel" pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on" />
-		<widget name="ok" pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on" />
-		<ePixmap pixmap="skin_default/buttons/yellow.png" position="280,0" size="140,40" alphatest="on" />
-		<ePixmap pixmap="skin_default/buttons/blue.png" position="420,0" size="140,40" alphatest="on" />
-		<widget name="canceltext" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
-		<widget name="oktext" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
-		<widget name="title" position="10,45" size="280,35" font="Regular;23" />
-		<widget name="config" position="10,95" size="540,325" scrollbarMode="showOnDemand" />
+		<ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on" />
+		<ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on" />
+		<widget source="key_red" render="Label" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
+		<widget source="key_green" render="Label" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
+		<widget name="config" position="5,50" size="550,325" scrollbarMode="showOnDemand" />
 	</screen>
 	<!-- Simple channelselection -->
 	<screen name="SimpleChannelSelection" position="center,center" size="560,430" title="Channel Selection">
@@ -893,16 +884,16 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
 		<widget source="introduction" render="Label" position="0,370" size="560,30" zPosition="10" font="Regular;21" halign="center" valign="center" backgroundColor="#25062748" transparent="1" />
 	</screen>
 	<!-- Sleeptimer edit -->
-	<screen name="SleepTimerEdit" position="center,center" size="500,200" title="Sleep Timer">
+	<screen name="SleepTimerEdit" position="center,center" size="500,240" title="Sleep Timer">
 		<widget name="current_status" position="40,40" size="400,30" valign="center" font="Regular;20" />
 		<widget name="red" pixmap="skin_default/buttons/button_red.png" position="10,88" size="12,12" alphatest="on" />
 		<widget name="green" pixmap="skin_default/buttons/button_green.png" position="10,128" size="12,12" alphatest="on" />
 		<widget name="yellow" pixmap="skin_default/buttons/button_yellow.png" position="10,168" size="12,12" alphatest="on" />
-		<widget name="blue" pixmap="skin_default/buttons/button_blue.png" position="10,168" size="12,12" alphatest="on" />
+		<widget name="blue" pixmap="skin_default/buttons/button_blue.png" position="10,208" size="12,12" alphatest="on" />
 		<widget name="red_text" position="40,80" size="400,30" valign="center" font="Regular;20" />
 		<widget name="green_text" position="40,120" size="400,30" valign="center" font="Regular;20" />
 		<widget name="yellow_text" position="40,160" size="400,30" valign="center" font="Regular;20" />
-		<widget name="blue_text" position="40,200" size="400,30" valign="center" font="Regular;20" />
+		<widget name="blue_text" position="40,200" size="450,30" valign="center" font="Regular;20" />
 		<widget name="pretext" position="15,10" size="235,25" font="Regular;19" />
 		<widget name="input" position="260,10" size="40,25" font="Regular;19" />
 		<widget name="aftertext" position="305,10" size="100,25" font="Regular;19" />
@@ -1107,13 +1098,13 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
 	</screen>
 	<!-- LCD screen (setup) -->
 	<screen name="SetupSummary" position="0,0" size="132,64">
-		<widget name="SetupTitle" position="6,0" size="120,16" font="Regular;12" />
-		<widget name="SetupEntry" position="6,16" size="120,32" font="Regular;12" />
-		<widget name="SetupValue" position="6,48" size="120,16" font="Regular;12" />
+		<widget source="SetupTitle" render="Label" position="6,0" size="120,16" font="Regular;12" />
+		<widget source="SetupEntry" render="Label" position="6,16" size="120,32" font="Regular;12" />
+		<widget source="SetupValue" render="Label" position="6,48" size="120,16" font="Regular;12" />
 	</screen>
 	<!-- LCD screen (misc) -->
 	<screen name="SimpleSummary" position="0,0" size="132,64">
-		<widget name="Title" position="6,0" size="120,64" font="Regular;16" halign="center" valign="center" />
+		<widget source="parent.Title" render="Label" position="6,0" size="120,64" font="Regular;16" halign="center" valign="center" />
 	</screen>
 	<!-- LCD screen (standby) -->
 	<screen name="StandbySummary" position="0,0" size="132,64">
@@ -1178,12 +1169,4 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
 		<widget source="key_green" render="Label" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
 		<widget name="filelist" position="5,50" size="510,370" scrollbarMode="showOnDemand" />
 	</screen>
-	<!-- VideoSetup (VideoMode Plugin) -->
-	<screen name="VideoSetup" position="center,center" size="560,430" title="VideoSetup">
-		<ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on" />
-		<ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on" />
-		<widget source="key_red" render="Label" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
-		<widget source="key_green" render="Label" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
-		<widget name="config" position="5,50" size="550,325" scrollbarMode="showOnDemand" />
-	</screen>
 </skin>