X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/c638db5a20fd3c781c55322f993a26f9907ce441..d6c68fa2ec0f3c8b6248444a7414942291b571e1:/data/skin.xml

diff --git a/data/skin.xml b/data/skin.xml
index 6b05295b..26b6b9dd 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" />
@@ -94,8 +93,8 @@
 			<widget name="entries" position="20,70" size="320,150" scrollbarMode="showOnDemand" />
 			<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="550,450" scrollbarMode="showOnDemand" />
+		<screen name="NimSetup" position="90,98" size="560,410" title="Satconfig">
+			<widget name="config" position="0,0" size="560,402" 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" />
@@ -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" />
@@ -203,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>
 
 
@@ -221,7 +222,7 @@
 		<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>
@@ -239,15 +240,17 @@
 			<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 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 name="BlinkingPoint" pixmap="/usr/share/enigma2/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" />
 		</screen>
 		<screen name="SimpleChannelSelection" position="90,98" size="560,417" title="Channel Selection">
 			<widget name="list" position="00,45" size="560,364" scrollbarMode="showOnDemand" />