fix hdd initialize button

[enigma2.git] / data / skin.xml

diff --git a/data/skin.xml b/data/skin.xml
index 4be94751a037b658937a9abc64e853f9aa487fa6..6ffd678264813ae86b9d91a097ed46a20d8ee140 100644 (file)
--- a/data/skin.xml
+++ b/data/skin.xml
@@ -41,7 +41,7 @@
                        <!--<widget name="menu" position="10,55" size="280,150" font="Regular;23" />-->
                        <widget name="menu" position="10,55" size="290,175" scrollbarMode="showOnDemand" />
                </screen>
-               <screen name="ScartLoopThrough" position="0,0" size="720,576">
+               <screen name="Scart" position="0,0" size="720,576">
                </screen>
                <screen name="ServiceInfo" position="160,120" size="400,330" title="Serviceinfo">
                        <widget name="infolist" position="20,10" size="360,325" selectionDisabled="1"/>
@@ -62,13 +62,16 @@
                        <widget name="model" position="20,10" size="380,25" font="Regular;23"  />
                        <widget name="capacity" position="20,40" size="380,25" font="Regular;23"  />
                        <widget name="bus" position="20,70" size="380,25" font="Regular;23"  />
-                       <widget name="initialize" position="40,110" size="100,28" font="Regular;25" backgroundColor="red" />
+                       <widget name="initialize" position="40,110" size="120,30" zPosition="1" pixmap="/usr/share/enigma2/init.png" transparent="1" />
+                       <widget name="initializetext" position="40,110" size="120,30" valign="center" halign="center" zPosition="2" font="Regular;20" />
                </screen>
                <screen name="Setup" position="100,125" size="540,280" title="Setup">
                        <widget name="title" position="10,10" size="280,35" font="Regular;23" />
                        <widget name="config" position="10,50" size="520,175" scrollbarMode="showOnDemand" />
-                       <widget name="ok" position="140,240" size="38,20" font="Regular;20" backgroundColor="green" />
-                       <widget name="cancel" position="240,240" size="70,20" font="Regular;20" backgroundColor="red" />
+                       <widget name="ok" position="140,240" size="53,30" pixmap="/usr/share/enigma2/ok.png" />
+                       <widget name="oktext" position="140,240" size="53,30" valign="center" halign="center" zPosition="2" font="Regular;20" transparent="1" />
+                       <widget name="cancel" position="240,240" size="100,30" pixmap="/usr/share/enigma2/cancel.png" />
+                       <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" />
@@ -91,11 +94,8 @@
                        <widget name="entries" position="20,70" size="320,150" scrollbarMode="showOnDemand" />
                        <widget name="bottom" position="20,230" size="320,25" font="Regular;23" />
                </screen>
-               <screen name="NimSetup" position="130,165" size="440,250" title="Satconfig">
-                       <widget name="config" position="20,10" size="400,220" />
-               </screen>
-               <screen name="Satconfig" position="140,125" size="460,280" title="Satconfig">
-                       <widget name="config" position="10,50" size="420,150" scrollbarMode="showOnDemand" />
+               <screen name="NimSetup" position="70,70" size="580,480" title="Satconfig">
+                       <widget name="config" position="20,10" size="550,450" scrollbarMode="showOnDemand" />
                </screen>
                <screen name="ScanSetup" position="90,100" size="520,400" title="Service scan">
                        <widget name="config" position="20,10" size="460,350" scrollbarMode="showOnDemand" />
@@ -109,8 +109,10 @@
                </screen>
                <screen name="TimerEntry" position="100,100" size="500,400" title="Timer entry">
                        <widget name="config" position="5,10" size="480,350" />
-                       <widget name="ok" position="140,365" size="38,20" font="Regular;20" backgroundColor="green" />
-                       <widget name="cancel" position="240,365" size="70,20" font="Regular;20" backgroundColor="red" />
+                       <widget name="ok" position="140,365" size="53,30" pixmap="/usr/share/enigma2/ok.png" />
+                       <widget name="oktext" position="140,365" size="53,30" valign="center" halign="center" zPosition="2" font="Regular;20" transparent="1" />
+                       <widget name="cancel" position="240,365" size="100,30" pixmap="/usr/share/enigma2/cancel.png" />
+                       <widget name="canceltext" position="240,365" size="100,30" valign="center" halign="center" zPosition="2" font="Regular;20" transparent="1" />
                </screen>
                <screen name="NetworkSetup" position="140,125" size="460,280" title="Network Setup">
                        <widget name="config" position="10,50" size="420,175" scrollbarMode="showOnDemand" />
@@ -137,7 +139,7 @@
                        <widget name="config" position="10,30" size="420,220" />
                </screen>
                <screen name="TimerEditList" position="70,100" size="560,400" title="Timer Editor">
-                       <widget name="timerlist" position="10,50" size="520,300" scrollbarMode="showOnDemand" />
+                       <widget name="timerlist" position="0,50" size="560,300" scrollbarMode="showOnDemand" />
                        <widget name="key_red" position="0,0" size="140,40" backgroundColor="red" font="Regular;21" />
                        <widget name="key_green" position="140,0" size="140,40" backgroundColor="green" font="Regular;21" />
                        <widget name="key_yellow" position="280,0" size="140,40" backgroundColor="yellow" font="Regular;21" />
@@ -211,7 +213,7 @@
                        <widget name="number" position="160,15" size="80,25" halign="right" font="Regular;23" />
                </screen>
                <screen name="MinuteInput" position="200,140" size="280,60" title="Seek">
-                       <widget name="minutes" position="160,15" size="80,25" halign="right" font="Regular;23" />
+                       <widget name="minutes" position="80,15" size="160,25" halign="right" font="Regular;23" />
                </screen>
                <screen name="Volume" flags="wfNoBorder" position="450,50" size="180,60" title="Volume">
                        <ePixmap position="0,0" zPosition="0" size="180,60" pixmap="/usr/share/enigma2/volumeslider-fs8.png" />
@@ -226,21 +228,21 @@
                        <widget name="Dishpixmap" pixmap="/usr/share/enigma2/dish.png" position="0,0" size="100,107" />
                </screen>
                <screen name="ChannelSelection" position="90,98" size="560,417" title="Channel Selection">
-                       <widget name="list" position="10,45" size="550,364" scrollbarMode="showOnDemand" />
+                       <widget name="list" position="00,45" size="560,364" scrollbarMode="showOnDemand" />
                        <widget name="key_red" position="0,0" size="140,40" backgroundColor="red" font="Regular;21" />
                        <widget name="key_green" position="140,0" size="140,40" backgroundColor="green" font="Regular;21" />
                        <widget name="key_yellow" position="280,0" size="140,40" backgroundColor="yellow" font="Regular;21" />
                        <widget name="key_blue" position="420,0" size="140,40" backgroundColor="blue" font="Regular;21" />
                </screen>
                <screen name="SimpleChannelSelection" position="90,98" size="560,417" title="Channel Selection">
-                       <widget name="list" position="10,45" size="540,364" scrollbarMode="showOnDemand" />
+                       <widget name="list" position="00,45" size="560,364" scrollbarMode="showOnDemand" />
                        <widget name="key_red" position="0,0" size="140,40" backgroundColor="red" font="Regular;21" />
                        <widget name="key_green" position="140,0" size="140,40" backgroundColor="green" font="Regular;21" />
                        <widget name="key_yellow" position="280,0" size="140,40" backgroundColor="yellow" font="Regular;21" />
                        <widget name="key_blue" position="420,0" size="140,40" backgroundColor="blue" font="Regular;21" />
                </screen>
-               <screen name="EPGSelection" position="90,100" size="560,415" title="EPG Selection">
-                       <widget name="list" position="10,40" size="550,370" scrollbarMode="showOnDemand" />
+               <screen name="EPGSelection" position="90,100" size="560,420" title="EPG Selection">
+                       <widget name="list" position="0,40" size="560,375" scrollbarMode="showOnDemand" />
                        <widget name="key_red" position="0,0" size="140,30" backgroundColor="red" font="Regular;21" />
                        <widget name="key_green" position="140,0" size="140,30" backgroundColor="green" font="Regular;21" />
                        <widget name="key_yellow" position="280,0" size="140,30" backgroundColor="yellow" font="Regular;21" />
@@ -290,7 +292,7 @@ textsize = (textsize[0] + 50, textsize[1] + 50)
 offset = 0
 if self.type == self.TYPE_YESNO:
        offset = 60
-wsizex = textsize[0] + offset
+wsizex = textsize[0] + 60
 wsizey = textsize[1] + offset
 if (280 > wsizex):
        wsizex = 280