X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/a7bc9fd319677465f0561773401ff0390ae3af9c..784137020888a4be481b786d2feddf6537663ec8:/data/skin.xml

diff --git a/data/skin.xml b/data/skin.xml
index 9ce0bb7c..d43613f2 100644
--- a/data/skin.xml
+++ b/data/skin.xml
@@ -1,5 +1,4 @@
 <skin>
-	
 		<colors>
 			<color name="white" 	value="#ffffff" />
 			<color name="black" 	value="#000000" />
@@ -139,7 +138,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" />
@@ -164,7 +163,6 @@
 			<widget name="ber_progress" position="447,15" size="88,6" />
 
 			<widget name="BlinkingPoint" pixmap="/usr/share/enigma2/record.png" position="430,31" zPosition="2" size="58,25" alphatest="on" />
-
 			<widget name="CryptActive" pixmap="/usr/share/enigma2/crypt.png" position="570,40" size="12,15" />
 			<widget name="DolbyActive" pixmap="/usr/share/enigma2/dolby.png" position="585,40" size="25,15" />
 			<widget name="FormatActive" pixmap="/usr/share/enigma2/format.png" position="613,40" size="28,15" />
@@ -177,6 +175,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" />
@@ -184,7 +183,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">
@@ -204,7 +202,9 @@
 			<eLabel position="70,0" size="300,30" text=".oO Movie Player Oo." font="Regular;20" />
 -->
 			<widget name="ServiceName" position="69,25" size="427,26" valign="center" font="Regular;22" backgroundColor="#101258" />
-			<widget name="CurrentTime" position="575,10" size="90,30" backgroundColor="dark" font="Regular;19" />
+			<widget name="CurrentTime" position="575,10" size="90,25" backgroundColor="dark" font="Regular;19" />
+			   <!-- fixme -->
+			<widget name="ElapsedTime" position="575,35" size="90,30" backgroundColor="dark" font="Regular;19" />
 		</screen>
 
 
@@ -215,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>
@@ -234,12 +233,22 @@
 			<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,417" title="Channel Selection">
-			<widget name="list" position="00,45" size="560,304" scrollbarMode="showOnDemand" />
+		<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" />
@@ -266,9 +275,10 @@
 			<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" />