add special color for marked and selected

[enigma2.git] / data / skin.xml

diff --git a/data/skin.xml b/data/skin.xml
index f12d27bdd4f2bab7f080f858e3804dfa48ef7cd4..689856300b31720452720dc2e7486445a6bce1dc 100644 (file)
--- a/data/skin.xml
+++ b/data/skin.xml
@@ -21,6 +21,8 @@
                        <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">
@@ -82,8 +84,15 @@
                <screen name="LanguageSelection" position="200,125" size="220,250" title="Language selection">
                        <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" />
+               <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="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" />
@@ -125,12 +134,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" />
@@ -206,12 +216,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" />
@@ -228,7 +240,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>
 
 
@@ -322,11 +335,16 @@
                        <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,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 name="ServiceScan" position="200,100" size="300,330" title="Service Scan">
+                       <widget name="pass" position="10,10" size="280,30" font="Regular;20" />
+                       <widget name="scan_progress" position="10,45" size="280,20" />
+                       <widget name="scan_state" position="10,65" size="280,60" font="Regular;20" />
+                       <widget name="servicelist" position="10,135" size="280,175" selectionDisabled="1" />
                </screen>
+               <screen name="InputBox" position="100,100" size="550,400" title="Input" >
+                       <widget name="text" position="0,0" size="550,25" font="Regular;20" />
+                       <widget name="input" position="0,30" size="550,25" font="Regular;20" />
+               </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" />
                        <widget name="lbegin" position="405,102" size="103,30" font="Regular;25" foregroundColor="red" />
@@ -345,11 +363,12 @@
                        <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