X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/2df9bca44791364dcea669d9d2dbf11adb3239bd..76fd7edbde9597007b9ab33b59b735c378043980:/data/skin.xml

diff --git a/data/skin.xml b/data/skin.xml
index 3d63c60d..49f22893 100644
--- a/data/skin.xml
+++ b/data/skin.xml
@@ -62,13 +62,16 @@
 			<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="100,28" font="Regular;25" backgroundColor="red" />
+			<widget name="initialize" position="40,110" size="120,30" zPosition="1" pixmap="/usr/share/enigma2/init.png" />
+			<widget name="initializetext" position="40,110" 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">
 			<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="38,20" font="Regular;20" backgroundColor="green" />
-			<widget name="cancel" position="240,240" size="70,20" font="Regular;20" backgroundColor="red" />
+			<widget name="ok" position="140,240" size="53,30" pixmap="/usr/share/enigma2/ok.png" />
+			<widget name="oktext" position="140,240" size="53,30" valign="center" halign="center" zPosition="2" font="Regular;20" transparent="1" />
+			<widget name="cancel" position="240,240" size="100,30" pixmap="/usr/share/enigma2/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,240" scrollbarMode="showOnDemand" />
@@ -92,7 +95,7 @@
 			<widget name="bottom" position="20,230" size="320,25" font="Regular;23" />
 		</screen>
 		<screen name="NimSetup" position="70,70" size="580,480" title="Satconfig">
-			<widget name="config" position="20,10" size="560,450" scrollbarMode="showOnDemand" />
+			<widget name="config" position="20,10" size="550,450" scrollbarMode="showOnDemand" />
 		</screen>
 		<screen name="ScanSetup" position="90,100" size="520,400" title="Service scan">
 			<widget name="config" position="20,10" size="460,350" scrollbarMode="showOnDemand" />
@@ -106,8 +109,10 @@
 		</screen>
 		<screen name="TimerEntry" position="100,100" size="500,400" title="Timer entry">
 			<widget name="config" position="5,10" size="480,350" />
-			<widget name="ok" position="140,365" size="38,20" font="Regular;20" backgroundColor="green" />
-			<widget name="cancel" position="240,365" size="70,20" font="Regular;20" backgroundColor="red" />
+			<widget name="ok" position="140,365" size="53,30" pixmap="/usr/share/enigma2/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="/usr/share/enigma2/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">
 			<widget name="config" position="10,50" size="420,175" scrollbarMode="showOnDemand" />
@@ -134,7 +139,7 @@
 			<widget name="config" position="10,30" size="420,220" />
 		</screen>
 		<screen name="TimerEditList" position="70,100" size="560,400" title="Timer Editor">
-			<widget name="timerlist" position="0,50" size="560,300" scrollbarMode="showOnDemand" />
+			<widget name="timerlist" position="0,45" size="560,350" 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" />
@@ -172,6 +177,7 @@
 			<widget name="Event_Next" position="273,98" size="282,22" font="Regular;20" backgroundColor="dark" />
 			<widget name="Event_Now_Duration" position="555,68" size="150,26" font="Regular;22" backgroundColor="dark" />
 			<widget name="Event_Next_Duration" position="555,98" size="150,26" font="Regular;22" backgroundColor="dark" />
+			<widget name="Now_ProgressBar" position="304,60" size="121,8" zPosition="1" />
 
 			<widget name="ButtonRed" pixmap="/usr/share/enigma2/button_red.png" position="210,132" size="27,12" />
 			<widget name="ButtonRedText" position="240,130" size="85,22" font="Regular;14" backgroundColor="blue" transparent="1" />
@@ -179,7 +185,6 @@
 			<widget name="ButtonGreenText" position="350,130" size="85,22" font="Regular;14" backgroundColor="blue" transparent="1" />
 			<widget name="ButtonYellow" pixmap="/usr/share/enigma2/button_yellow.png" position="430,132" size="27,12" />
 			<widget name="ButtonBlue" pixmap="/usr/share/enigma2/button_blue.png" position="540,132" size="27,12" />
-			
 		</screen>
 
 		<screen name="MoviePlayer" flags="wfNoBorder" position="0,370" size="720,148" title="InfoBar">
@@ -210,15 +215,14 @@
 		<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" />
 		</screen>
-		<screen name="Volume" flags="wfNoBorder" position="450,50" size="180,60" title="Volume">
+		<screen name="Volume" flags="wfNoBorder" position="450,50" size="180,60" title="Volume" zPosition="1" >
 			<ePixmap position="0,0" zPosition="0" size="180,60" pixmap="/usr/share/enigma2/volumeslider-fs8.png" />
-			
 			<widget name="Volume" zPosition="1" position="8,38" size="164,11" backgroundColor="dark" />
 		</screen>
-		<screen name="Mute" flags="wfNoBorder" position="100,100" size="59,80" title="Mute">
+		<screen name="Mute" flags="wfNoBorder" position="100,100" size="59,80" title="Mute" zPosition="-1">
 			<ePixmap position="0,0" size="59,80" pixmap="/usr/share/enigma2/mute-fs8.png" />
 		</screen>
-		<screen name="Dish" flags="wfNoBorder" position="300,100" size="100,107" title="Dish">
+		<screen name="Dish" flags="wfNoBorder" position="300,100" size="100,107" title="Dish" zPosition="-10" >
 			<widget name="transparent" zPosition="-1" position="0,0" size="100,107" backgroundColor="transparent" />
 			<widget name="Dishpixmap" pixmap="/usr/share/enigma2/dish.png" position="0,0" size="100,107" />
 		</screen>
@@ -229,6 +233,23 @@
 			<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="ChannelSelectionRadio" position="90,98" size="560,307" title="Channel Selection">
+			<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="list" position="0,45" size="560,252" scrollbarMode="showOnDemand" />
+		</screen>
+		<screen name="ServiceInfoWindow" position="90,420" size="560,95" zPosition="-1">
+			<widget name="Service_Name" position="0,0" size="400,26" font="Regular;22" backgroundColor="dark" />
+			<widget name="Clock" position="470,0" size="90,26" font="Regular;22" backgroundColor="dark" />
+			<widget name="Event_Now_StartTime" position="0,35" size="60,22" font="Regular;20" backgroundColor="dark" />
+			<widget name="Event_Next_StartTime" position="0,65" size="60,22" font="Regular;20" backgroundColor="dark" />
+			<widget name="Event_Now" position="80,35" size="380,22" font="Regular;20" backgroundColor="dark" />
+			<widget name="Event_Next" position="80,65" size="380,22" font="Regular;20" backgroundColor="dark" />
+			<widget name="Event_Now_Duration" position="470,35" size="150,22" font="Regular;20" backgroundColor="dark" />
+			<widget name="Event_Next_Duration" position="470,65" size="150,22" font="Regular;20" backgroundColor="dark" />
+		</screen>
 		<screen name="SimpleChannelSelection" position="90,98" size="560,417" title="Channel Selection">
 			<widget name="list" position="00,45" size="560,364" scrollbarMode="showOnDemand" />
 			<widget name="key_red" position="0,0" size="140,40" backgroundColor="red" font="Regular;21" />
@@ -250,12 +271,14 @@
 			<widget name="channel" position="240,345" size="270,30" font="Regular;22" />
 		</screen>
 		<screen name="MovieSelection" position="90,98" size="560,415" title="Select a movie">
-			<widget name="list" position="0,0" size="560,375" scrollbarMode="showOnDemand" />
+			<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>
-		<screen name="ServiceScan" position="200,100" size="300,200" title="Service Scan">
+		<screen name="ServiceScan" position="200,100" size="300,300" title="Service Scan">
 			<widget name="scan_progress" position="10,10" size="300,20" />
 			<widget name="scan_state" position="10,40" size="280,60" font="Regular;20" />
+			<widget name="servicelist" position="10,110" size="280,175" selectionDisabled="1" />
 		</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" />