X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/fffbe6bde30871bcaf04df8f8d69e53caa844567..6f43d8cd46f2f30f615e6105e78b35a0297f0ffe:/data/skin.xml

diff --git a/data/skin.xml b/data/skin.xml
index 50dcf150..dd969cd4 100644
--- a/data/skin.xml
+++ b/data/skin.xml
@@ -9,6 +9,7 @@
 			<color name="green" 	value="#00ff00" />
 			<color name="blue" 		value="#0000ff" />
 			<color name="yellow"	value="#c0c000" />
+			<color name="transparent" 	value="#ffffffff" />
 		</colors>
 		<windowstyle type="skinned">
 			<color name="Background" color="#33294a6b" />
@@ -38,7 +39,7 @@
 		<screen name="Menu" position="210,150" size="300,235" title="Main menu">
 			<widget name="title" position="10,10" size="280,35" font="Arial;23" />
 			<!--<widget name="menu" position="10,55" size="280,150" font="Arial;23" />-->
-			<widget name="menu" position="10,55" size="280,175"/>
+			<widget name="menu" position="10,55" size="280,175" scrollbarMode="showOnDemand" />
 		</screen>
 		<screen name="ScartLoopThrough" position="0,0" size="720,576">
 		</screen>
@@ -46,7 +47,10 @@
 			<widget name="infolist" position="20,10" size="360,325" selectionDisabled="1"/>
 		</screen>
 		<screen name="AudioSelection" position="210,150" size="300,170" title="Audio">
-			<widget name="tracks" position="20,10" size="260,150" />
+			<widget name="tracks" position="20,10" size="260,150" scrollbarMode="showOnDemand" />
+		</screen>
+		<screen name="SubserviceSelection" position="210,150" size="300,250" title="Subservices">
+			<widget name="subservices" position="20,10" size="260,300" scrollbarMode="showOnDemand" />
 		</screen>
 		<screen name="HarddiskWait" position="140,165" size="360,60">
 			<widget name="wait" position="20,10" size="320,25" font="Arial;23"/>
@@ -62,10 +66,13 @@
 		</screen>
 		<screen name="Setup" position="100,125" size="540,280" title="Setup">
 			<widget name="title" position="10,10" size="280,35" font="Arial;23" />
-			<widget name="config" position="10,50" size="520,175" />
+			<widget name="config" position="10,50" size="520,175" scrollbarMode="showOnDemand" />
 			<widget name="ok" position="140,240" size="38,20" font="Arial;20" backgroundColor="green" />
 			<widget name="cancel" position="240,240" size="70,20" font="Arial;20" backgroundColor="red" />
 		</screen>
+		<screen name="LanguageSelection" position="200,125" size="220,250" title="Language selection">
+			<widget name="list" position="10,0" size="190,240" scrollbarMode="showOnDemand" />
+		</screen>
 		<screen name="NimSelection" position="140,165" size="400,100" title="select Slot">
 			<widget name="nimlist" position="20,10" size="360,75" />
 		</screen>
@@ -78,22 +85,22 @@
 		<screen name="CiMmi" position="140,165" size="360,260">
 			<widget name="title" position="10,0" size="320,25" font="Arial;23" />
 			<widget name="subtitle" position="10,35" size="320,25" font="Arial;23" />
-			<widget name="entries" position="20,70" size="320,150" />
+			<widget name="entries" position="20,70" size="320,150" scrollbarMode="showOnDemand" />
 			<widget name="bottom" position="20,230" size="320,25" font="Arial;23" />
 		</screen>
 		<screen name="NimSetup" position="140,165" size="360,250" title="Satconfig">
 			<widget name="config" position="20,10" size="320,220" />
 		</screen>
 		<screen name="Satconfig" position="140,125" size="460,280" title="Satconfig">
-			<widget name="config" position="10,50" size="420,150" />
+			<widget name="config" position="10,50" size="420,150" scrollbarMode="showOnDemand" />
 		</screen>
 		<screen name="ScanSetup" position="90,100" size="520,400" title="Service scan">
-			<widget name="config" position="20,10" size="460,350" />
+			<widget name="config" position="20,10" size="460,350" scrollbarMode="showOnDemand" />
 			<widget name="introduction" position="20,360" size="350,30" font="Arial;23" />
 		</screen>
 		<screen name="ScanSimple" position="150,100" size="400,300" title="Service scan">
 			<widget name="header" position="20,10" size="280,25" font="Arial;23"/>
-			<widget name="config" position="20,45" size="360,200" />
+			<widget name="config" position="20,45" size="360,200" scrollbarMode="showOnDemand" />
 			<widget name="footer" position="20,250" size="360,25" font="Arial;23"/>
 			<!--<widget name="introduction" position="20,360" size="280,30" font="Arial;23" />-->
 		</screen>
@@ -103,7 +110,7 @@
 			<widget name="cancel" position="240,365" size="70,20" font="Arial;20" backgroundColor="red" />
 		</screen>
 		<screen name="NetworkSetup" position="140,125" size="460,280" title="Network Setup">
-			<widget name="config" position="10,50" size="420,175" />
+			<widget name="config" position="10,50" size="420,175" scrollbarMode="showOnDemand" />
 			<widget name="introduction" position="10,230" size="400,30" font="Arial;23" />
 		</screen>
 		<screen name="PluginBrowser" position="190,125" size="360,250" title="Plugins">
@@ -131,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="10,50" size="520,300" />
+			<widget name="timerlist" position="10,50" size="520,300" scrollbarMode="showOnDemand" />
 			<widget name="key_red" position="0,0" size="140,40" backgroundColor="red" font="Arial;21" />
 			<widget name="key_green" position="140,0" size="140,40" backgroundColor="green" font="Arial;21" />
 			<widget name="key_yellow" position="280,0" size="140,40" backgroundColor="yellow" font="Arial;21" />
@@ -144,25 +151,36 @@
 		</screen>
 		<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="BlinkingPoint" pixmap="/usr/share/enigma2/record.png" position="430,31" zPosition="2" size="58,25" />
+
+			<widget name="snr" text="SNR:" position="195,0" size="40,22" valign="center" font="Arial;15" transparent="1" />
+			<widget name="agc" text="AGC:" position="275,0" size="40,22" valign="center" font="Arial;15" transparent="1" />
+			<widget name="ber" text="BER:" position="355,0" size="40,22" valign="center" font="Arial;15" transparent="1" />
+			<widget name="snr_percent" position="232,0" size="40,22" valign="center" font="Arial;15" transparent="1" />
+			<widget name="agc_percent" position="314,0" size="40,22" valign="center" font="Arial;15" transparent="1" />
+			<widget name="ber_count" position="392,0" size="53,22" valign="center" font="Arial;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,25" size="427,26" valign="center" font="Arial;22" backgroundColor="#101258" />
+			<widget name="ServiceName" position="69,26" size="427,34" valign="center" font="Arial;22" backgroundColor="#101258" />
 			<widget name="CurrentTime" position="575,10" size="90,30" backgroundColor="dark" font="Arial;19" />
 			<widget name="Event_Now_StartTime" position="210,68" size="60,22" font="Arial;20" backgroundColor="dark" />
 			<widget name="Event_Next_StartTime" position="210,98" size="60,22" font="Arial;20" backgroundColor="dark" />
 			<widget name="Event_Now" position="273,68" size="282,22" font="Arial;20" backgroundColor="dark" />
 			<widget name="Event_Next" position="273,98" size="282,22" font="Arial;20" backgroundColor="dark" />
-			<widget name="Event_Now_Duration" position="555,68" size="70,26" font="Arial;22" backgroundColor="dark" />
-			<widget name="Event_Next_Duration" position="555,98" size="70,26" font="Arial;22" backgroundColor="dark" />
+			<widget name="Event_Now_Duration" position="555,68" size="150,26" font="Arial;22" backgroundColor="dark" />
+			<widget name="Event_Next_Duration" position="555,98" size="150,26" font="Arial;22" backgroundColor="dark" />
 
 			<widget name="ButtonRed" pixmap="/usr/share/enigma2/button_red.png" position="210,132" size="27,12" />
-			<widget name="ButtonRedText" position="240,130" size="75,22" font="Arial;14" backgroundColor="blue" transparent="1" />
+			<widget name="ButtonRedText" position="240,130" size="85,22" font="Arial;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="Arial;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" />
 			
@@ -170,24 +188,22 @@
 
 		<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="-1" size="433,57" pixmap="/usr/share/enigma2/dvr-buttons.png" />
+			<ePixmap position="200,60" zPosition="0" size="433,57" pixmap="/usr/share/enigma2/dvr-buttons.png" />
 			<!--<ePixmap position="0,0" zPosition="1" size="720,148" pixmap="/usr/share/enigma2/movieplayer.png" />
-
-			<ePixmap position="50,40" zPosition="0" size="40,40" pixmap="/usr/share/enigma2/rewindbutton.png" />
-			<ePixmap position="95,40" zPosition="0" size="40,40" pixmap="/usr/share/enigma2/playbutton.png" />
-			<ePixmap position="140,40" zPosition="0" size="40,40" pixmap="/usr/share/enigma2/pausebutton.png" />
-			<ePixmap position="185,40" zPosition="0" size="40,40" pixmap="/usr/share/enigma2/forwardbutton.png" />
-			<ePixmap position="230,40" zPosition="0" size="40,40" pixmap="/usr/share/enigma2/stopbutton.png" />
-			<ePixmap position="275,40" zPosition="0" size="40,40" pixmap="/usr/share/enigma2/recordbutton.png" />
-
-			<widget name="ServiceName" position="250,75" size="427,26" valign="center" font="Arial;22" backgroundColor="#101258" />
+-->
+<!--			<ePixmap position="230,70" zPosition="0" size="40,40" pixmap="/usr/share/enigma2/rewindbutton.png" />
+			<ePixmap position="275,70" zPosition="0" size="40,40" pixmap="/usr/share/enigma2/playbutton.png" />
+			<ePixmap position="320,70" zPosition="0" size="40,40" pixmap="/usr/share/enigma2/pausebutton.png" />
+			<ePixmap position="365,70" zPosition="0" size="40,40" pixmap="/usr/share/enigma2/forwardbutton.png" />
+			<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="Arial;22" backgroundColor="#101258" />
 			<widget name="CurrentTime" position="575,85" size="90,30" backgroundColor="dark" font="Arial;19" />
 			<eLabel position="70,0" size="300,30" text=".oO Movie Player Oo." font="Arial;20" />
 -->
 			<widget name="ServiceName" position="69,25" size="427,26" valign="center" font="Arial;22" backgroundColor="#101258" />
 			<widget name="CurrentTime" position="575,10" size="90,30" backgroundColor="dark" font="Arial;19" />
-
-
 		</screen>
 
 
@@ -203,27 +219,30 @@
 		<screen name="Mute" flags="wfNoBorder" position="100,100" size="59,80" title="Mute">
 			<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">
+			<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>
  		<screen name="ChannelSelection" position="90,98" size="560,417" title="Channel Selection">
-			<widget name="list" position="10,45" size="540,364" />
+			<widget name="list" position="10,45" size="540,364" scrollbarMode="showOnDemand" />
 			<widget name="key_red" position="0,0" size="140,40" backgroundColor="red" font="Arial;21" />
 			<widget name="key_green" position="140,0" size="140,40" backgroundColor="green" font="Arial;21" />
 			<widget name="key_yellow" position="280,0" size="140,40" backgroundColor="yellow" font="Arial;21" />
 			<widget name="key_blue" position="420,0" size="140,40" backgroundColor="blue" font="Arial;21" />
 		</screen>
 		<screen name="SimpleChannelSelection" position="90,98" size="560,417" title="Channel Selection">
-			<widget name="list" position="10,45" size="540,364" />
+			<widget name="list" position="10,45" size="540,364" scrollbarMode="showOnDemand" />
 			<widget name="key_red" position="0,0" size="140,40" backgroundColor="red" font="Arial;21" />
 			<widget name="key_green" position="140,0" size="140,40" backgroundColor="green" font="Arial;21" />
 			<widget name="key_yellow" position="280,0" size="140,40" backgroundColor="yellow" font="Arial;21" />
 			<widget name="key_blue" position="420,0" size="140,40" backgroundColor="blue" font="Arial;21" />
 		</screen>
 		<screen name="EPGSelection" position="90,100" size="560,415" title="EPG Selection">
+			<widget name="list" position="10,40" size="550,370" scrollbarMode="showOnDemand" />
 			<widget name="key_red" position="0,0" size="140,30" backgroundColor="red" font="Arial;21" />
 			<widget name="key_green" position="140,0" size="140,30" backgroundColor="green" font="Arial;21" />
 			<widget name="key_yellow" position="280,0" size="140,30" backgroundColor="yellow" font="Arial;21" />
 			<widget name="key_blue" position="420,0" size="140,30" backgroundColor="blue" font="Arial;21" />
-
-			<widget name="list" position="10,40" size="550,370" />
 		</screen>
 		<screen name="EventView" position="100,100" size="520,380" title="Eventview">
 			<widget name="epg_description" position="10,5" size="500,335" font="Arial;22" />
@@ -231,9 +250,9 @@
 			<widget name="duration" position="140,345" size="100,30" font="Arial;22" />
 			<widget name="channel" position="240,345" size="270,30" font="Arial;22" />
 		</screen>
-		<screen name="MovieSelection" position="50,50" size="620,476" title="Select-a-movie">
-			<widget name="list" position="0,30" size="600,375" />
-			<widget name="freeDiskSpace" position="0,440" size="400,30" />
+		<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="freeDiskSpace" position="10,380" size="540,30" font="Arial;25" />
 		</screen>
 		<screen name="ServiceScan" position="200,100" size="300,200" title="Service Scan">
 			<widget name="scan_progress" position="10,10" size="300,20" />
@@ -248,7 +267,7 @@
 			<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" />
+			<widget name="list" position="100,100" size="550,375" scrollbarMode="showOnDemand" />
 			<eLabel position="500,40" size="220,60" text="help..." font="Arial;50" />
 		</screen>
 		<screen name="MessageBox" position="0,300" size="720,10" title="Message">
@@ -264,7 +283,7 @@ orgpos = self.instance.position()
 textsize = self["text"].getSize()
 
 # y size still must be fixed in font stuff...
-textsize = (textsize[0], textsize[1] + 50)
+textsize = (textsize[0] + 50, textsize[1] + 50)
 wsizex = textsize[0] + 50
 wsizey = textsize[1] + 50
 if (280 > wsizex):