better resizing
[enigma2.git] / data / skin.xml
index 5969ce10dec82c3ee3ff32c6a3f827d225fd4a03..2d920f846313ce1a595a87f8930ef5ba5d5de0df 100644 (file)
@@ -3,12 +3,14 @@
                        <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" />
@@ -19,7 +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">
@@ -43,6 +46,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">
                        <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" />
+               <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" />
                        <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" />
                <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="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="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" />
                        <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="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>
 
 
                        <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,60" 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="ChoiceBox" position="100,100" size="550,400" title="Input" >
+                       <widget name="text" position="0,0" size="550,25" font="Regular;20" />
+                       <widget name="list" position="0,30" size="550,335" scrollbarMode="showOnDemand" />
+                       <applet type="onLayoutFinish">
+# this should be factored out into some helper code, but currently demonstrates applets.
+from enigma import eSize, ePoint
+
+orgwidth = self.instance.size().width()
+orgpos = self.instance.position()
+textsize = self["text"].getSize()
+
+# y size still must be fixed in font stuff...
+textsize = (textsize[0] + 50, textsize[1] + 50)
+count = len(self.list)
+if count > 6:
+       count = 6
+offset = 30 * count
+wsizex = textsize[0] + 60
+wsizey = textsize[1] + offset
+if (400 > wsizex):
+       wsizex = 400
+wsize = (wsizex, wsizey)
+
+
+# resize
+self.instance.resize(eSize(*wsize))
+
+# resize label
+self["text"].instance.resize(eSize(*textsize))
+
+# move list
+listsize = (wsizex, 30 * len(self.list))
+self["list"].instance.move(ePoint(0, textsize[1]))
+self["list"].instance.resize(eSize(*listsize))
+
+# center window
+newwidth = wsize[0]
+self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
+                       </applet>                       
                </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="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" position="100,100" size="150,150" >
-                       <widget name="state" position="0,0" size="100,100" />
+               <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
@@ -363,7 +429,7 @@ if (280 > wsizex):
 wsize = (wsizex, wsizey)
 
 
-# resize 
+# resize
 self.instance.resize(eSize(*wsize))
 
 # resize label