Merge branch 'master' of git://git.opendreambox.org/git/acidburn/enigma2-master

[enigma2.git] / data / skin_default.xml

diff --git a/data/skin_default.xml b/data/skin_default.xml
old mode 100755 (executable)
new mode 100644 (file)
index 5946097..67f8d16
--- a/data/skin_default.xml
+++ b/data/skin_default.xml
@@ -172,9 +172,9 @@ self.instance.move(ePoint((720-wsizex)/2, (576-wsizey)/(count > 7 and 2 or 3)
                <widget name="bottom" position="10,230" size="430,25" font="Regular;23" />
        </screen>
        <!-- Common interface - selection -->
                <widget name="bottom" position="10,230" size="430,25" font="Regular;23" />
        </screen>
        <!-- Common interface - selection -->

-       <screen name="CiSelection" position="140,226" size="440,160" title="Common Interface">
+       <screen name="CiSelection" position="140,226" size="440,185" title="Common Interface">

                <widget name="text" position="10,10" size="430,25" font="Regular;23" />
                <widget name="text" position="10,10" size="430,25" font="Regular;23" />

-               <widget name="entries" position="10,55" size="420,100" scrollbarMode="showOnDemand" />
+               <widget name="entries" position="10,55" size="420,125" scrollbarMode="showOnDemand" />

        </screen>
        <!-- Console -->
        <screen name="Console" position="90,95" size="560,430" title="Command execution...">
        </screen>
        <!-- Console -->
        <screen name="Console" position="90,95" size="560,430" title="Command execution...">


@@ -368,12 +368,6 @@ self.instance.move(ePoint((720-wsizex)/2, (576-wsizey)/(count &gt; 7 and 2 or 3)
                <widget name="arrowup2" pixmap="skin_default/arrowup.png" position="-100,-100" zPosition="11" size="37,70" alphatest="on" />
                <widget name="long_key" position="320,520" size="350,50" font="Regular;25" halign="right" foregroundColor="yellow" />
        </screen>
                <widget name="arrowup2" pixmap="skin_default/arrowup.png" position="-100,-100" zPosition="11" size="37,70" alphatest="on" />
                <widget name="long_key" position="320,520" size="350,50" font="Regular;25" halign="right" foregroundColor="yellow" />
        </screen>

-       <!-- Image Wizard -->
-       <screen name="ImageWizard" position="0,0" size="720,576" title="Welcome..." flags="wfNoBorder">
-               <widget name="text" position="50,100" size="440,250" font="Regular;22" />
-               <widget name="list" position="50,350" zPosition="1" size="440,200" />
-               <widget name="config" position="50,350" zPosition="1" size="440,200" transparent="1" scrollbarMode="showOnDemand" />
-       </screen>

        <!-- Inputbox -->
        <screen name="InputBox" position="80,250" size="550,90" title="Input">
                <widget name="text" position="10,20" size="550,25" font="Regular;23" />
        <!-- Inputbox -->
        <screen name="InputBox" position="80,250" size="550,90" title="Input">
                <widget name="text" position="10,20" size="550,25" font="Regular;23" />


@@ -454,7 +448,7 @@ self.instance.move(ePoint((720-wsizex)/2, (576-wsizey)/(count &gt; 7 and 2 or 3)
                <widget name="PositionGauge" position="15,138" size="396,10" pointer="skin_default/position_pointer.png:540,0" seek_pointer="skin_default/position_pointer.png:540,0" transparent="1" />
                <widget name="repeat" pixmaps="skin_default/icons/repeat_off.png,skin_default/icons/repeat_on.png" position="416,135" size="22,15" transparent="1" alphatest="on"/>
                <widget name="filelist" position="15,163" size="550,138" scrollbarMode="showOnDemand" />
                <widget name="PositionGauge" position="15,138" size="396,10" pointer="skin_default/position_pointer.png:540,0" seek_pointer="skin_default/position_pointer.png:540,0" transparent="1" />
                <widget name="repeat" pixmaps="skin_default/icons/repeat_off.png,skin_default/icons/repeat_on.png" position="416,135" size="22,15" transparent="1" alphatest="on"/>
                <widget name="filelist" position="15,163" size="550,138" scrollbarMode="showOnDemand" />

-               <widget name="playlist" position="15,314" size="550,154" scrollbarMode="showOnDemand" selectionDisabled="1" />
+               <widget name="playlist" position="15,322" size="550,138" scrollbarMode="showOnDemand" selectionDisabled="1" />

                <widget name="currenttext" position="0,0" size="0,0" />
                <widget name="titletext" position="0,0" size="0,0" />
        </screen>
                <widget name="currenttext" position="0,0" size="0,0" />
                <widget name="titletext" position="0,0" size="0,0" />
        </screen>


@@ -919,10 +913,6 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
                <widget name="arrowup" pixmap="skin_default/arrowup.png" position="-100,-100" zPosition="11" size="37,70" alphatest="on" />
                <widget name="arrowup2" pixmap="skin_default/arrowup.png" position="-100,-100" zPosition="11" size="37,70" alphatest="on" />
        </screen>
                <widget name="arrowup" pixmap="skin_default/arrowup.png" position="-100,-100" zPosition="11" size="37,70" alphatest="on" />
                <widget name="arrowup2" pixmap="skin_default/arrowup.png" position="-100,-100" zPosition="11" size="37,70" alphatest="on" />
        </screen>

-       <!-- Subservice selection -->
-       <screen name="SubserviceSelection" position="210,163" size="300,255" title="Subservices">
-               <widget name="subservices" position="20,10" size="260,230" scrollbarMode="showOnDemand" />
-       </screen>

        <!-- Subservice quickzap -->
        <screen name="SubservicesQuickzap" position="124,470" size="512,200" title="Subservices" backgroundColor="transparent" flags="wfNoBorder">
                <widget source="session.RecordState" render="Pixmap" pixmap="skin_default/icons/record.png" position="450,0" zPosition="2" size="14,14" alphatest="on" >
        <!-- Subservice quickzap -->
        <screen name="SubservicesQuickzap" position="124,470" size="512,200" title="Subservices" backgroundColor="transparent" flags="wfNoBorder">
                <widget source="session.RecordState" render="Pixmap" pixmap="skin_default/icons/record.png" position="450,0" zPosition="2" size="14,14" alphatest="on" >


@@ -940,6 +930,11 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
        </screen>
        <!-- Subtitle area -->
        <screen name="SubtitleDisplay" position="0,0" size="720,576" zPosition="-1" flags="wfNoBorder" backgroundColor="transparent" />
        </screen>
        <!-- Subtitle area -->
        <screen name="SubtitleDisplay" position="0,0" size="720,576" zPosition="-1" flags="wfNoBorder" backgroundColor="transparent" />

+       <!-- TextBox -->
+       <screen name="TextBox" position="90,50" size="550,400" title="Message...">
+               <widget name="text" position="0,0" size="540,390" font="Regular;18" />
+               <!--widget source="text" render="Label" position="0,0" size="540,390" font="Regular;18" /-->
+       </screen>

        <!-- Time & date input -->
        <screen name="TimeDateInput" position="160,150" size="400,200" title="Time/Date Input">
                <widget name="cancel" pixmap="skin_default/buttons/red.png" position="10,0" size="140,40" alphatest="on" />
        <!-- Time & date input -->
        <screen name="TimeDateInput" position="160,150" size="400,200" title="Time/Date Input">
                <widget name="cancel" pixmap="skin_default/buttons/red.png" position="10,0" size="140,40" alphatest="on" />