X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/13ac677921b00ceec937edf276b17dcdbb4e8c6f..fb24285c53bea1a2df38b84e897e017ee7acdf1a:/data/skin.xml

diff --git a/data/skin.xml b/data/skin.xml
index a5cb8174..88af192e 100644
--- a/data/skin.xml
+++ b/data/skin.xml
@@ -3,13 +3,13 @@
 			<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">
@@ -21,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">
@@ -45,6 +44,9 @@
 		<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">
@@ -78,10 +80,17 @@
 			<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="170,125" size="400,350" title="Plugin browser">
+			<widget name="red" position="0,0" size="200,40" backgroundColor="red" valign="center" halign="center" font="Regular;20" />
+			<widget name="green" position="200,0" size="200,40" backgroundColor="green" valign="center" halign="center" font="Regular;20" />
+
+			<widget name="list" position="10,50" size="380,280" 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" />
+		<screen name="PluginDownloadBrowser" position="170,125" size="400,350" title="Downloadable plugins">
+			<widget name="text" position="10,00" size="380,330" zPosition="1" font="Regular;20" />
+			<widget name="list" position="10,00" size="380,330" zPosition="2" scrollbarMode="showOnDemand" />
 		</screen>
 		<screen name="NimSelection" position="140,165" size="400,100" title="select Slot">
 			<widget name="nimlist" position="20,10" size="360,75" />
@@ -123,12 +132,13 @@
 			<widget name="introduction" position="10,230" size="400,30" font="Regular;23" />
 		</screen>
 		<screen name="About" position="140,125" size="360,250" title="About">
-			<widget name="text" position="10,30" size="420,40" font="Regular;18"/>
+			<widget name="text" position="10,30" size="420,20" font="Regular;18"/>
+			<widget name="fpVersion" position="10,50" size="420,20" font="Regular;18"/>
 			<widget name="tuner" position="10,80" size="420,20" font="Regular;18"/>
 			<widget name="tuner0" position="10,100" size="420,20" font="Regular;18"/>
 			<widget name="tuner1" position="10,120" size="420,20" font="Regular;18"/>
 			<widget name="hdd" position="10,170" size="420,20" font="Regular;18"/>
-			<widget name="hddA" position="10,190" size="420,20" font="Regular;18"/>
+			<widget name="hddA" position="10,190" size="420,40" font="Regular;18"/>
 		</screen>
 		<screen name="configOSD" position="140,125" size="460,350" title="OSD Settings">
 			<widget name="okbutton" position="20,270" size="205,40" />
@@ -195,8 +205,8 @@
 			<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" />
@@ -204,12 +214,14 @@
 			<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,83" 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" />
@@ -226,7 +238,8 @@
 			<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="575,35" size="90,30" backgroundColor="dark" font="Regular;19" />
+			<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>
 
 
@@ -334,18 +347,21 @@
 			<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" />
+		<screen name="MessageBox" position="60,300" size="600,10" title="Message">
+			<widget name="text" position="60,10" size="520,0" font="Regular;22" />
 			<widget name="ErrorPixmap" pixmap="/usr/share/enigma2/error.png" position="0,0" zPosition="3" size="53,53" alphatest="on" transparent="1" />
 			<widget name="QuestionPixmap" pixmap="/usr/share/enigma2/question.png" position="0,0" zPosition="3" size="53,53" alphatest="on" transparent="1" />
-			<widget name="list" position="100,100" size="550,375" />
+			<widget name="InfoPixmap" pixmap="/usr/share/enigma2/info.png" position="0,0" zPosition="3" size="53,53" alphatest="on" transparent="1" />
+			<widget name="list" position="100,100" size="480,375" />
 			<applet type="onLayoutFinish">
 # this should be factored out into some helper code, but currently demonstrates applets.
 from enigma import eSize, ePoint
@@ -366,7 +382,7 @@ if (280 > wsizex):
 wsize = (wsizex, wsizey)
 
 
-# resize 
+# resize
 self.instance.resize(eSize(*wsize))
 
 # resize label