X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/93fe9a37c89cbb2c4ea31808bf3196b1603ad234..747171602db43ec70d198ea092f5c18f70504855:/data/skin.xml

diff --git a/data/skin.xml b/data/skin.xml
index c1b9aa94..80e38d63 100644
--- a/data/skin.xml
+++ b/data/skin.xml
@@ -1,183 +1,101 @@
 <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" />
-		</colors>
-		<windowstyle type="skinned">
-			<color name="Background" color="#4075a7" />
-			<color name="LabelForeground" color="#ffffff" />
-			<color name="ListboxBackground" color="#4075a7" />
-			<color name="ListboxForeground" color="#ffffff" />
-			<color name="ListboxSelectedBackground" color="#404080" />
-			<color name="ListboxSelectedForeground" color="#ffffff" />
-			<color name="ListboxMarkedBackground" color="#ff0000" />
-			<color name="ListboxMarkedForeground" color="#ffffff" />
-			<borderset name="bsWindow">
-				<pixmap pos="bpTopLeft"     filename="/usr/share/enigma2/b_w_tl.png" />
-				<pixmap pos="bpTop"         filename="/usr/share/enigma2/b_w_t.png"  />
-				<pixmap pos="bpTopRight"    filename="/usr/share/enigma2/b_w_tr.png" />
-				<pixmap pos="bpLeft"        filename="/usr/share/enigma2/b_w_l.png"  />
-				<pixmap pos="bpRight"       filename="/usr/share/enigma2/b_w_r.png"  />
-				<pixmap pos="bpBottomLeft"  filename="/usr/share/enigma2/b_w_bl.png" />
-				<pixmap pos="bpBottom"      filename="/usr/share/enigma2/b_w_b.png"  />
-				<pixmap pos="bpBottomRight" filename="/usr/share/enigma2/b_w_br.png" />
-			</borderset>
-		</windowstyle> """ """
-		<screen name="Menu" position="210,150" size="300,235" title="real 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"/>
-		</screen>
-		<screen name="ScartLoopThrough" position="0,0" size="720,576">
-		</screen>
-		<screen name="HarddiskSelection" position="140,165" size="360,100">
-			<widget name="hddlist" position="20,10" size="320,75" />
-		</screen>
-		<screen name="HarddiskSetup" position="140,165" size="360,100">
-			<widget name="model" position="20,10" size="300,20" />
-			<widget name="capacity" position="20,30" size="300,20" />
-			<widget name="bus" position="20,50" size="300,20" />
-			<widget name="initialize" position="40,80" size="75,20" font="Arial;20" backgroundColor="red" />
-		</screen>
-		<screen name="Setup" position="140,125" size="460,280" title="Setup">
-			<widget name="title" position="10,10" size="280,35" font="Arial;23" />
-			<widget name="config" position="10,50" size="420,175" />
-			<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="NimSelection" position="140,165" size="360,100">
-			<widget name="nimlist" position="20,10" size="320,75" />
-		</screen>
-		<screen name="CiSelection" position="140,165" size="360,100">
-			<widget name="entries" position="20,10" size="320,75" />
-		</screen>
-		<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="bottom" position="20,230" size="320,25" font="Arial;23" />
-		</screen>
-		<screen name="NimSetup" position="140,165" size="360,180">
-			<widget name="config" position="20,10" size="320,150" />
-		</screen>
-		<screen name="Satconfig" position="140,125" size="460,280" title="Satconfig">
-			<widget name="config" position="10,50" size="420,150" />
-		</screen>
-		<screen name="ScanSetup" position="100,100" size="500,400" title="Service scan">
-			<widget name="config" position="20,10" size="460,350" />
-			<widget name="introduction" position="20,360" size="280,30" font="Arial;23" />
-		</screen>
-		<screen name="TimerEntry" position="390,100" size="250,400" title="Timer entry">
-			<widget name="config" position="5,10" size="240,350" />
-			<widget name="introduction" position="20,360" size="250,30" font="Arial;23" />
-		</screen>
-		<screen name="NetworkSetup" position="140,125" size="460,280" title="Network Setup">
-			<widget name="config" position="10,50" size="420,175" />
-			<widget name="introduction" position="10,230" size="400,30" font="Arial;23" />
-		</screen>
-		<screen name="PluginBrowser" position="190,125" size="360,250" title="Plugins">
-			<widget name="title" position="10,10" size="280,35" font="Arial;23" />
-			<widget name="pluginlist" position="10,50" size="320,200" />
-		</screen>
-		<screen name="About" position="140,125" size="360,250" title="About">
-			<widget name="text" position="10,30" size="420,40" font="Arial;18"/>
-			<widget name="tuner" position="10,80" size="420,20" font="Arial;18"/>
-			<widget name="tuner0" position="10,100" size="420,20" font="Arial;18"/>
-			<widget name="tuner1" position="10,120" size="420,20" font="Arial;18"/>
-			<widget name="hdd" position="10,170" size="420,20" font="Arial;18"/>
-			<widget name="hddA" position="10,190" size="420,20" font="Arial;18"/>
-		</screen>
-		<screen name="configOSD" position="140,125" size="460,350" title="OSD Settings">
-			<widget name="okbutton" position="20,270" size="205,40" />
-			<widget name="txt_alpha" position="20,20" size="110,20" />
-			<widget name="sld_alpha" position="150,20" size="290,20" />
-			<widget name="txt_brightness" position="20,60" size="120,20" />
-			<widget name="sld_brightness" position="150,20" size="290,20" />
-			<widget name="txt_gamma" position="20,100" size="120,20" />
-			<widget name="sld_gamma" position="150,100" size="290,20" />
-		</screen>
-		<screen name="configTest" position="300,100" size="300,300" title="config menu">
-			<widget name="config" position="10,30" size="420,220" />
-		</screen>
-<!--		<screen name="TimerEditList" position="160,100" size="420,430" title="Timer Editor">-->
-		<screen name="TimerEditList" position="70,100" size="300,400" title="Timer Editor">
-			<widget name="timerlist" position="10,30" size="280,300" />
-		</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" />
-			<widget name="theClock" position="10,60" size="280,50" />
-		</screen>
+	<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" />
+		<color name="LabelForeground" color="#ffffff" />
+		<color name="ListboxBackground" color="#33294a6b" />
+		<color name="ListboxForeground" color="#ffffff" />
+		<color name="ListboxSelectedBackground" color="#225b7395" />
+		<color name="ListboxSelectedForeground" color="#ffffff" />
+		<color name="ListboxMarkedBackground" color="#ff0000" />
+		<color name="ListboxMarkedForeground" color="#ffffff" />
+		<color name="ListboxMarkedAndSelectedBackground" color="#800000" />
+		<color name="ListboxMarkedAndSelectedForeground" color="#ffffff" />
+		<color name="WindowTitleForeground" color="#ffffff" />
+		<color name="WindowTitleBackground" color="#33294a6b" />
+		<borderset name="bsWindow">
+			<pixmap pos="bpTopLeft"     filename="b_w_tl.png" />
+			<pixmap pos="bpTop"         filename="b_w_t.png"  />
+			<pixmap pos="bpTopRight"    filename="b_w_tr.png" />
+			<pixmap pos="bpLeft"        filename="b_w_l.png"  />
+			<pixmap pos="bpRight"       filename="b_w_r.png"  />
+			<pixmap pos="bpBottomLeft"  filename="b_w_bl.png" />
+			<pixmap pos="bpBottom"      filename="b_w_b.png"  />
+			<pixmap pos="bpBottomRight" filename="b_w_br.png" />
+		</borderset>
+	</windowstyle>
+
 		<screen name="InfoBar" flags="wfNoBorder" position="0,380" size="720,148" title="InfoBar">
-			<ePixmap position="0,0" size="720,148" pixmap="/usr/share/enigma2/info-bg.png" />
-			
-			<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" />
-			<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" />
-<!--			<eLabel position="70,0" size="300,30" text=".oO skin Oo." font="Arial;20" /> -->
-		</screen>
-		<screen name="Volume" flags="wfNoBorder" position="140,125" size="180,60" title="Volume">
-			<ePixmap position="0,0" size="180,60" pixmap="/usr/share/enigma2/volumeslider-fs8.png" />
-			
-			<widget name="Volume" position="8,38" size="164,11" backgroundColor="dark" />
-		</screen>
- 		<screen name="ChannelSelection" position="90,100" size="560,420" title="Channel Selection">
-			<widget name="list" position="0,50" size="560,320" />
-<!--			<widget name="okbutton" position="340,50" size="140,30" />-->
-			<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="MovieSelection" position="150,100" size="400,420" title="Select-a-movie">
-			<widget name="list" position="0,50" size="400,300" />
-			<widget name="freeDiskSpace" position="0,360" size="400,40" />
-		</screen>
-		<screen name="ServiceScan" position="200,100" size="300,200" title="Service Scan">
-			<widget name="scan_progress" position="10,10" size="300,20" />
-			<widget name="scan_state" position="10,40" size="280,60" font="Arial;20" />
-		</screen>
-		<screen name="TimerEdit" position="70,100" size="590,335" title="Timer Edit">
-			<widget name="description" position="10,10" size="580,40" font="Arial;25" />
-			<widget name="lbegin" position="405,102" size="103,30" font="Arial;25" foregroundColor="red" />
-			<widget name="lend" position="405,158" size="103,30" font="Arial;25" foregroundColor="green" />
-			<widget name="begin" position="508,105" size="72,35" font="Arial;25" />
-			<widget name="end" position="508,150" size="72,35" font="Arial;25" />
-			<widget name="apply" position="10,240" size="250,35" />
-		</screen>
-		<screen name="MessageBox" position="0,300" size="720,10" title="Message">
-			<widget name="text" position="0,0" size="650,0" font="Arial;22" />
-			<applet type="onLayoutFinish">
-# this should be factored out into some helper code, but currently demonstrated applets.
-from enigma import eSize, ePoint
+			<ePixmap position="0,0" zPosition="-1" size="720,148" pixmap="info-bg.png" />
 
-orgwidth = self.instance.size().width()
-orgpos = self.instance.position()
-textsize = self["text"].getSize()
+			<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" pixmap="rtgbar.png" />
+			<widget name="agc_progress" position="447,8" size="88,6" pixmap="rtgbar.png" />
+			<widget name="ber_progress" position="447,15" size="88,6" />
 
-# y size still must be fixed in font stuff...
-textsize = (textsize[0], textsize[1] + 20)
-wsize = (textsize[0] + 20, textsize[1] + 20)
+			<widget name="BlinkingPoint" pixmap="record.png" position="430,31" zPosition="2" size="58,25" alphatest="on" />
+			<widget name="CryptActive" pixmap="crypt.png" position="570,40" size="12,15" />
+			<widget name="DolbyActive" pixmap="dolby.png" position="585,40" size="25,15" />
+			<widget name="FormatActive" pixmap="format.png" position="613,40" size="28,15" />
 
-# resize 
-self.instance.resize(eSize(*wsize))
+			<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="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" />
 
-# resize label
-self["text"].instance.resize(eSize(*textsize))
+			<widget name="ButtonRed" pixmap="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="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="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="button_blue.png" position="540,132" size="27,12" />
+			<widget name="ButtonBlueText" position="570,130" size="95,22" font="Regular;14" backgroundColor="blue" transparent="1" />
+		</screen>
 
-# center window
-newwidth = wsize[0]
-self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
-			</applet>
+		<screen name="MoviePlayer" flags="wfNoBorder" position="0,370" size="720,148" title="InfoBar">
+			<ePixmap position="0,0" zPosition="-1" size="720,148" pixmap="info-bg.png" />
+			<ePixmap position="210,83" zPosition="0" size="433,42" pixmap="dvr-buttons.png" />
+			<!--<ePixmap position="0,0" zPosition="1" size="720,148" pixmap="movieplayer.png" />
+-->
+<!--			<ePixmap position="230,70" zPosition="0" size="40,40" pixmap="rewindbutton.png" />
+			<ePixmap position="275,70" zPosition="0" size="40,40" pixmap="playbutton.png" />
+			<ePixmap position="320,70" zPosition="0" size="40,40" pixmap="pausebutton.png" />
+			<ePixmap position="365,70" zPosition="0" size="40,40" pixmap="forwardbutton.png" />
+			<ePixmap position="410,70" zPosition="0" size="40,40" pixmap="stopbutton.png" />
+			<ePixmap position="455,70" zPosition="0" size="40,40" pixmap="recordbutton.png" />
+-->
+<!--			<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" 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="position_pointer.png:3,5"/>
 		</screen>
-	</skin>
+	
+</skin>