X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/4cdeb9ebe328382bb4ef6a01b67ff840adcc84ad..b4b2da42d470a2795311814daa9a1e6497a35cdc:/data/skin.xml

diff --git a/data/skin.xml b/data/skin.xml
index 5c4482b5..e9e476be 100644
--- a/data/skin.xml
+++ b/data/skin.xml
@@ -1,15 +1,16 @@
 <skin>
-	
 		<colors>
 			<color name="white" 	value="#ffffff" />
 			<color name="black" 	value="#000000" />
 			<color name="dark"  	value="#20294a6b" />
-			
+
 			<color name="red" 		value="#ff0000" />
 			<color name="green" 	value="#00ff00" />
 			<color name="blue" 		value="#0000ff" />
 			<color name="yellow"	value="#c0c000" />
 			<color name="transparent" 	value="#ffffffff" />
+
+			<color name="transpBlack" value="#80000000" />
 		</colors>
 		<windowstyle type="skinned">
 			<color name="Background" color="#33294a6b" />
@@ -20,7 +21,6 @@
 			<color name="ListboxSelectedForeground" color="#ffffff" />
 			<color name="ListboxMarkedBackground" color="#ff0000" />
 			<color name="ListboxMarkedForeground" color="#ffffff" />
-			
 			<color name="WindowTitleForeground" color="#ffffff" />
 			<color name="WindowTitleBackground" color="#33294a6b" />
 			<borderset name="bsWindow">
@@ -41,6 +41,12 @@
 			<!--<widget name="menu" position="10,55" size="280,150" font="Regular;23" />-->
 			<widget name="menu" position="10,55" size="290,175" scrollbarMode="showOnDemand" />
 		</screen>
+		<screen name="BouquetSelector" position="210,150" size="300,195" title="Choose bouquet">
+			<widget name="menu" position="10,10" size="280,175" scrollbarMode="showOnDemand" />
+		</screen>
+		<screen name="ChannelContextMenu" position="210,150" size="300,195" title="Channellist menu">
+			<widget name="menu" position="10,10" size="280,175" scrollbarMode="showOnDemand" />
+		</screen>
 		<screen name="Scart" position="0,0" size="720,576">
 		</screen>
 		<screen name="ServiceInfo" position="160,120" size="400,330" title="Serviceinfo">
@@ -74,7 +80,7 @@
 			<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" />
+			<widget name="list" position="10,0" size="190,250" scrollbarMode="showOnDemand" />
 		</screen>
 		<screen name="PluginBrowser" position="100,125" size="400,350" title="Plugin browser">
 			<widget name="list" position="10,0" size="380,340" scrollbarMode="showOnDemand" />
@@ -86,16 +92,16 @@
 			<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="20,10" size="320,75" />
+			<widget name="entries" position="10,10" size="340,75" />
 		</screen>
-		<screen name="CiMmi" position="140,165" size="360,260">
-			<widget name="title" position="10,0" size="320,25" font="Regular;23" />
-			<widget name="subtitle" position="10,35" size="320,25" font="Regular;23" />
-			<widget name="entries" position="20,70" size="320,150" scrollbarMode="showOnDemand" />
-			<widget name="bottom" position="20,230" size="320,25" font="Regular;23" />
+		<screen name="CiMmi" position="130,165" 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="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" />
@@ -145,6 +151,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="TimerSanityConflict" position="70,100" size="600,400" title="Timer sanity error">
+			<widget name="timer1" position="0,45" size="290,80" scrollbarMode="showOnDemand" />
+			<widget name="timer2" position="310,45" size="280,80" scrollbarMode="showOnDemand" />
+			<widget name="list" position="0,160" size="250,240" scrollbarMode="showOnDemand" />
+			<widget name="key_red" position="0,0" size="145,40" backgroundColor="red" font="Regular;21" />
+			<widget name="key_green" position="145,0" size="145,40" backgroundColor="green" font="Regular;21" />
+			<widget name="key_yellow" position="310,0" size="145,40" backgroundColor="yellow" font="Regular;21" />
+			<widget name="key_blue" position="455,0" size="145,40" backgroundColor="blue" font="Regular;21" />
+		</screen>
+		<screen name="TimerLog" position="70,100" size="560,400" title="Timer log">
+			<widget name="loglist" position="0,45" size="560,250" scrollbarMode="showOnDemand" />
+			<widget name="logentry" position="0,300" size="560,140" font="Regular;20" />
+			<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" />
+		</screen>
 		<screen name="clockDisplay" position="300,100" size="300,300">
 			<widget name="okbutton" position="10,10" size="280,40" />
 			<widget name="title" position="10,120" size="280,50" />
@@ -153,43 +176,44 @@
 		<screen name="InfoBar" flags="wfNoBorder" position="0,380" size="720,148" title="InfoBar">
 			<ePixmap position="0,0" zPosition="-1" size="720,148" pixmap="/usr/share/enigma2/info-bg.png" />
 
-			<widget name="snr" text="SNR:" position="195,0" size="40,22" valign="center" font="Regular;15" transparent="1" />
-			<widget name="agc" text="AGC:" position="275,0" size="40,22" valign="center" font="Regular;15" transparent="1" />
-			<widget name="ber" text="BER:" position="355,0" size="40,22" valign="center" font="Regular;15" transparent="1" />
-			<widget name="snr_percent" position="232,0" size="40,22" valign="center" font="Regular;15" transparent="1" />
-			<widget name="agc_percent" position="314,0" size="40,22" valign="center" font="Regular;15" transparent="1" />
-			<widget name="ber_count" position="392,0" size="53,22" valign="center" font="Regular;15" transparent="1" />
+			<widget name="snr" text="SNR:" position="195,0" size="40,22" font="Regular;15" transparent="1" />
+			<widget name="agc" text="AGC:" position="275,0" size="40,22" font="Regular;15" transparent="1" />
+			<widget name="ber" text="BER:" position="355,0" size="40,22" font="Regular;15" transparent="1" />
+			<widget name="snr_percent" position="232,0" size="40,22" font="Regular;15" transparent="1" />
+			<widget name="agc_percent" position="314,0" size="40,22" font="Regular;15" transparent="1" />
+			<widget name="ber_count" position="392,0" size="53,22" font="Regular;15" transparent="1" />
 			<widget name="snr_progress" position="447,1" size="88,6" />
 			<widget name="agc_progress" position="447,8" size="88,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" />
 
-			<widget name="ServiceName" position="69,26" size="427,34" valign="center" font="Regular;22" backgroundColor="#101258" />
+			<widget name="ServiceName" position="69,26" size="427,34" font="Regular;22" backgroundColor="#101258" />
 			<widget name="CurrentTime" position="575,10" size="90,30" backgroundColor="dark" font="Regular;19" />
 			<widget name="Event_Now_StartTime" position="210,68" size="60,22" font="Regular;20" backgroundColor="dark" />
 			<widget name="Event_Next_StartTime" position="210,98" size="60,22" font="Regular;20" backgroundColor="dark" />
 			<widget name="Event_Now" position="273,68" size="282,22" font="Regular;20" backgroundColor="dark" />
 			<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="Event_Now_Duration" position="555,68" size="100,26" font="Regular;22" backgroundColor="dark" halign="right" />
+			<widget name="Event_Next_Duration" position="555,98" size="100,26" font="Regular;22" backgroundColor="dark" halign="right" />
+			<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" />
 			<widget name="ButtonGreen" pixmap="/usr/share/enigma2/button_green.png" position="320,132" size="27,12" />
 			<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="ButtonYellowText" position="460,130" size="85,22" font="Regular;14" backgroundColor="blue" transparent="1" />
 			<widget name="ButtonBlue" pixmap="/usr/share/enigma2/button_blue.png" position="540,132" size="27,12" />
-			
+			<widget name="ButtonBlueText" position="570,130" size="85,22" font="Regular;14" backgroundColor="blue" transparent="1" />
 		</screen>
 
 		<screen name="MoviePlayer" flags="wfNoBorder" position="0,370" size="720,148" title="InfoBar">
 			<ePixmap position="0,0" zPosition="-1" size="720,148" pixmap="/usr/share/enigma2/info-bg.png" />
-			<ePixmap position="200,60" zPosition="0" size="433,57" pixmap="/usr/share/enigma2/dvr-buttons.png" />
+			<ePixmap position="210,88" zPosition="0" size="433,42" pixmap="/usr/share/enigma2/dvr-buttons.png" />
 			<!--<ePixmap position="0,0" zPosition="1" size="720,148" pixmap="/usr/share/enigma2/movieplayer.png" />
 -->
 <!--			<ePixmap position="230,70" zPosition="0" size="40,40" pixmap="/usr/share/enigma2/rewindbutton.png" />
@@ -199,12 +223,15 @@
 			<ePixmap position="410,70" zPosition="0" size="40,40" pixmap="/usr/share/enigma2/stopbutton.png" />
 			<ePixmap position="455,70" zPosition="0" size="40,40" pixmap="/usr/share/enigma2/recordbutton.png" />
 -->
-<!--			<widget name="ServiceName" position="250,75" size="427,26" valign="center" font="Regular;22" backgroundColor="#101258" />
+<!--			<widget name="ServiceName" position="250,75" size="427,26" font="Regular;22" backgroundColor="#101258" />
 			<widget name="CurrentTime" position="575,85" size="90,30" backgroundColor="dark" font="Regular;19" />
 			<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="ServiceName" position="69,25" size="427,26" font="Regular;22" backgroundColor="#101258" />
+			<widget name="CurrentTime" position="575,10" size="90,25" backgroundColor="dark" font="Regular;19" />
+			   <!-- fixme -->
+			<widget name="ElapsedTime" position="475,60" size="75,20" halign="left" backgroundColor="dark" font="Regular;18" />
+			<widget name="PositionGauge" position="247,60" size="225,20" zPosition="2" pointer="/usr/share/enigma2/position_pointer.png:3,5"/>
 		</screen>
 
 
@@ -215,15 +242,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>
@@ -241,15 +267,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">
-			<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" />
@@ -259,14 +287,35 @@
 			<widget name="key_blue" position="420,0" size="140,40" backgroundColor="blue" font="Regular;21" />
 		</screen>
 		<screen name="EPGSelection" position="90,100" size="560,420" title="EPG Selection">
+			<widget name="key_red" position="0,0" size="140,30" backgroundColor="red" font="Regular;21" />
+			<widget name="key_green" position="140,0" size="140,30" backgroundColor="green" font="Regular;21" />
+			<widget name="key_yellow" position="280,0" size="140,30" backgroundColor="yellow" font="Regular;21" />
+			<widget name="key_blue" position="420,0" size="140,30" backgroundColor="blue" font="Regular;21" />
 			<widget name="list" position="0,40" size="560,375" scrollbarMode="showOnDemand" />
+		</screen>
+		<screen name="EPGSelectionMulti" position="90,100" size="560,420" title="EPG Selection">
 			<widget name="key_red" position="0,0" size="140,30" backgroundColor="red" font="Regular;21" />
 			<widget name="key_green" position="140,0" size="140,30" backgroundColor="green" font="Regular;21" />
 			<widget name="key_yellow" position="280,0" size="140,30" backgroundColor="yellow" font="Regular;21" />
 			<widget name="key_blue" position="420,0" size="140,30" backgroundColor="blue" font="Regular;21" />
+			<widget name="now_button" position="10,40" size="123,40" pixmap="/usr/share/enigma2/button-fs8.png" />
+			<widget name="next_button" position="143,40" size="123,40" pixmap="/usr/share/enigma2/button-fs8.png" />
+			<widget name="more_button" position="276,40" size="123,40" pixmap="/usr/share/enigma2/button-fs8.png" />
+			<widget name="now_button_sel" position="10,40" size="123,40" pixmap="/usr/share/enigma2/button-selected-fs8.png" />
+			<widget name="next_button_sel" position="143,40" size="123,40" pixmap="/usr/share/enigma2/button-selected-fs8.png" />
+			<widget name="more_button_sel" position="276,40" size="123,40" pixmap="/usr/share/enigma2/button-selected-fs8.png" />
+			<widget name="now_text" text="NOW" zPosition="2" position="10,40" size="123,40" transparent="1" halign="center" valign="center" font="Regular;21" />
+			<widget name="next_text" text="NEXT" zPosition="2" position="143,40" size="123,40" transparent="1" halign="center" valign="center" font="Regular;21" />
+			<widget name="more_text" text="MORE" zPosition="2" position="276,40" size="123,40" transparent="1" halign="center" valign="center" font="Regular;21" />
+			<widget name="date" position="410,40" size="140,40" valign="center" halign="right" font="Regular;24" />
+			<widget name="list" position="00,85" size="560,325" scrollbarMode="showOnDemand" />
 		</screen>
 		<screen name="EventView" position="100,100" size="520,380" title="Eventview">
-			<widget name="epg_description" position="10,5" size="500,335" font="Regular;22" />
+			<widget name="key_red" position="0,0" size="130,30" backgroundColor="red" font="Regular;21" />
+			<widget name="key_green" position="130,0" size="130,30" backgroundColor="green" font="Regular;21" />
+			<widget name="key_yellow" position="260,0" size="130,30" backgroundColor="yellow" font="Regular;21" />
+			<widget name="key_blue" position="390,0" size="130,30" backgroundColor="blue" font="Regular;21" />
+			<widget name="epg_description" position="10,40" size="500,305" font="Regular;22" />
 			<widget name="datetime" position="10,345" size="130,30" font="Regular;22" />
 			<widget name="duration" position="140,345" size="100,30" font="Regular;22" />
 			<widget name="channel" position="240,345" size="270,30" font="Regular;22" />
@@ -276,9 +325,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" />
@@ -289,8 +339,14 @@
 			<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="100,100" size="550,375" scrollbarMode="showOnDemand" />
-			<eLabel position="500,40" size="220,60" text="help..." font="Regular;50" />
+			<widget name="list" position="50,100" size="450,375" scrollbarMode="showOnDemand" />
+			<widget name="rc" pixmap="/usr/share/enigma2/rc.png" position="540,50" zPosition="10" size="154,475" transparent="1" alphatest="on"/>
+			<widget name="arrowup" pixmap="/usr/share/enigma2/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" />
+		</screen>
+		<screen name="PVRState" flags="wfNoBorder" position="70,70" size="150,30" backgroundColor="transpBlack" zPosition="2">
+			<widget name="state" position="0,0" size="150,30" font="Regular;25" halign="center" 
+				backgroundColor="transpBlack" foregroundColor="white" />
 		</screen>
 		<screen name="MessageBox" position="0,300" size="720,10" title="Message">
 			<widget name="text" position="60,10" size="650,0" font="Regular;22" />
@@ -317,7 +373,7 @@ if (280 > wsizex):
 wsize = (wsizex, wsizey)
 
 
-# resize 
+# resize
 self.instance.resize(eSize(*wsize))
 
 # resize label