Merge branch 'master' of /git/enigma2

[vuplus_dvbapp] / data / skin_default.xml

diff --git a/data/skin_default.xml b/data/skin_default.xml
index bb62af5..065d99d 100755 (executable)
--- a/data/skin_default.xml
+++ b/data/skin_default.xml
@@ -893,16 +893,16 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
                <widget source="introduction" render="Label" position="0,370" size="560,30" zPosition="10" font="Regular;21" halign="center" valign="center" backgroundColor="#25062748" transparent="1" />
        </screen>
        <!-- Sleeptimer edit -->
-       <screen name="SleepTimerEdit" position="center,center" size="500,200" title="Sleep Timer">
+       <screen name="SleepTimerEdit" position="center,center" size="500,240" title="Sleep Timer">
                <widget name="current_status" position="40,40" size="400,30" valign="center" font="Regular;20" />
                <widget name="red" pixmap="skin_default/buttons/button_red.png" position="10,88" size="12,12" alphatest="on" />
                <widget name="green" pixmap="skin_default/buttons/button_green.png" position="10,128" size="12,12" alphatest="on" />
                <widget name="yellow" pixmap="skin_default/buttons/button_yellow.png" position="10,168" size="12,12" alphatest="on" />
-               <widget name="blue" pixmap="skin_default/buttons/button_blue.png" position="10,168" size="12,12" alphatest="on" />
+               <widget name="blue" pixmap="skin_default/buttons/button_blue.png" position="10,208" size="12,12" alphatest="on" />
                <widget name="red_text" position="40,80" size="400,30" valign="center" font="Regular;20" />
                <widget name="green_text" position="40,120" size="400,30" valign="center" font="Regular;20" />
                <widget name="yellow_text" position="40,160" size="400,30" valign="center" font="Regular;20" />
-               <widget name="blue_text" position="40,200" size="400,30" valign="center" font="Regular;20" />
+               <widget name="blue_text" position="40,200" size="450,30" valign="center" font="Regular;20" />
                <widget name="pretext" position="15,10" size="235,25" font="Regular;19" />
                <widget name="input" position="260,10" size="40,25" font="Regular;19" />
                <widget name="aftertext" position="305,10" size="100,25" font="Regular;19" />
@@ -1125,6 +1125,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
                        <convert type="ConditionalShowHide">Blink</convert>
                </widget>
        </screen>
+       <!-- JobView -->
        <screen name="JobView" position="center,center" size="520,350" title="Job View">
                <widget source="job_name" render="Label" position="20,12" size="480,60" font="Regular;28" />
                <widget source="job_task" render="Label" position="20,90" size="480,50" font="Regular;23" />
@@ -1153,6 +1154,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
                        <convert type="ConditionalShowHide" />
                </widget>
        </screen>
+       <!-- JobView Summary -->
        <screen name="JobView_summary" position="0,0" size="132,64">
                <widget source="parent.summary_job_name" render="Label" position="6,4" size="120,42" font="Regular;16" />
                <widget source="parent.summary_job_task" render="Label" position="6,22" size="120,26" font="Regular;12" />
@@ -1161,10 +1163,27 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
                        <convert type="ProgressToText" />
                </widget>
        </screen>
+       <!-- VirtualKeyBoard -->
        <screen name="VirtualKeyBoard" position="center,center" size="560,350" zPosition="99" title="Virtual KeyBoard">
                <ePixmap pixmap="skin_default/vkey_text.png" position="9,35" zPosition="-4" size="542,52" alphatest="on" />
                <widget name="header" position="10,10" size="500,20" font="Regular;20" transparent="1" noWrap="1" />
                <widget name="text" position="12,35" size="536,46" font="Regular;46" transparent="1" noWrap="1" halign="right" />
                <widget name="list" position="10,100" size="540,225" selectionDisabled="1" transparent="1" />
        </screen>
+       <!-- FileBrowser -->
+       <screen name="FileBrowser" position="center,center" size="520,430" title="DVD File Browser" >
+               <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on" />
+               <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on" />
+               <widget source="key_red" render="Label" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
+               <widget source="key_green" render="Label" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
+               <widget name="filelist" position="5,50" size="510,370" scrollbarMode="showOnDemand" />
+       </screen>
+       <!-- VideoSetup (VideoMode Plugin) -->
+       <screen name="VideoSetup" position="center,center" size="560,430" title="VideoSetup">
+               <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on" />
+               <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on" />
+               <widget source="key_red" render="Label" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
+               <widget source="key_green" render="Label" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
+               <widget name="config" position="5,50" size="550,325" scrollbarMode="showOnDemand" />
+       </screen>
 </skin>