better resizing

[enigma2.git] / data / skin.xml

diff --git a/data/skin.xml b/data/skin.xml
index 9375f97bb98e1da32f9fb51dd541fddbede2eb4c..2d920f846313ce1a595a87f8930ef5ba5d5de0df 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">
@@ -138,7 +140,7 @@
                        <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" />
@@ -333,10 +335,55 @@
                        <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" />
@@ -356,12 +403,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="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="550,375" />
+                       <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