lots of improvements in the default wizard

[enigma2.git] / data / skin_default.xml

diff --git a/data/skin_default.xml b/data/skin_default.xml
index 3e8093a76ef0a87df01753a3091ccd31f6230480..85e5a430717b401dd8b5d639f784bbade2a35d41 100644 (file)
--- a/data/skin_default.xml
+++ b/data/skin_default.xml
@@ -19,15 +19,15 @@
        <!-- Adapter setup -->
        <screen name="AdapterSetup" position="130,140" size="460,330" title="Network Setup">
                <widget name="introduction2" position="10,10" size="440,20" font="Regular;23" />
        <!-- Adapter setup -->
        <screen name="AdapterSetup" position="130,140" size="460,330" title="Network Setup">
                <widget name="introduction2" position="10,10" size="440,20" font="Regular;23" />

-               <widget name="IPtext" position="10,50" size="130,21" font="Regular;21" />
-               <widget name="Netmasktext" position="10,75" size="130,21" font="Regular;21" />
-               <widget name="Gatewaytext" position="10,100" size="130,21" font="Regular;21" />
-               <widget name="IP" position="140,50" size="300,21" font="Regular;21" />
-               <widget name="Mask" position="140,75" size="300,21" font="Regular;21" />
-               <widget name="Gateway" position="140,100" size="300,21" font="Regular;21" />
-               <widget name="iface" position="10,150" size="440,23" font="Regular;23" />
-               <widget name="config" position="10,185" size="440,100" scrollbarMode="showOnDemand" />
-               <widget name="introduction" position="0,300" size="460,20" font="Regular;21" halign="center" />
+               <widget name="IPtext" position="10,45" size="130,21" font="Regular;21" />
+               <widget name="Netmasktext" position="10,70" size="130,21" font="Regular;21" />
+               <widget name="Gatewaytext" position="10,95" size="130,21" font="Regular;21" />
+               <widget name="IP" position="140,45" size="300,21" font="Regular;21" />
+               <widget name="Mask" position="140,70" size="300,21" font="Regular;21" />
+               <widget name="Gateway" position="140,95" size="300,21" font="Regular;21" />
+               <widget name="iface" position="10,135" size="440,23" font="Regular;23" />
+               <widget name="config" position="10,170" size="440,125" scrollbarMode="showOnDemand" />
+               <widget name="introduction" position="0,305" size="460,20" font="Regular;21" halign="center" />

        </screen>
        <!-- Audio selection -->
        <screen name="AudioSelection" position="210,203" size="300,170" title="Audio">
        </screen>
        <!-- Audio selection -->
        <screen name="AudioSelection" position="210,203" size="300,170" title="Audio">


@@ -168,6 +168,22 @@ self.instance.move(ePoint((720-wsizex)/2, (576-wsizey)/(count &gt; 7 and 2 or 3)
        <screen name="configTest" position="300,100" size="300,300" title="config menu">
                <widget name="config" position="10,30" size="420,220" />
        </screen>
        <screen name="configTest" position="300,100" size="300,300" title="config menu">
                <widget name="config" position="10,30" size="420,220" />
        </screen>

+       <!-- Default wizard -->
+       <screen name="DefaultWizard" position="0,0" size="720,576" title="Welcome..." flags="wfNoBorder" >
+                       <widget name="text" position="153,50" size="340,270" font="Regular;23" />
+                       <widget source="list" render="Listbox" position="50,300" size="440,200" scrollbarMode="showOnDemand" >
+                               <convert type="StringList" />
+                       </widget>
+                       <ePixmap pixmap="skin_default/buttons/button_red.png" position="40,225" size="15,16" alphatest="on" />
+                       <widget name="languagetext" position="55,225" size="95,30" font="Regular;18" />
+                       <widget name="config" position="50,300" zPosition="1" size="440,200" transparent="1" scrollbarMode="showOnDemand" />            
+                       <!--widget name="stepslider" position="50,500" zPosition="1" borderWidth="2" size="440,20" backgroundColor="dark" /-->
+                       <widget name="wizard" pixmap="skin_default/wizard.png" position="40,50" zPosition="10" size="110,174" transparent="1" alphatest="on"/>
+                       <widget name="rc" pixmap="skin_default/rc.png" position="500,600" zPosition="10" size="154,475" transparent="1" alphatest="on"/>
+                       <widget name="arrowdown" pixmap="skin_default/arrowdown.png" position="-100,-100" zPosition="11" size="37,70" transparent="1" alphatest="on"/>
+                       <widget name="arrowup" pixmap="skin_default/arrowup.png" position="-100,-100" zPosition="11" size="37,70" transparent="1" alphatest="on"/>
+                       <widget name="arrowup2" pixmap="skin_default/arrowup.png" position="-100,-100" zPosition="11" size="37,70" transparent="1" alphatest="on"/>
+               </screen>

        <!-- Dish -->
        <screen name="Dish" flags="wfNoBorder" position="300,100" size="130,160" title="Dish" zPosition="-1" backgroundColor="transparent">
                <widget name="Dishpixmap" pixmap="skin_default/icons/dish.png" position="0,0" size="130,160" alphatest="off" />
        <!-- Dish -->
        <screen name="Dish" flags="wfNoBorder" position="300,100" size="130,160" title="Dish" zPosition="-1" backgroundColor="transparent">
                <widget name="Dishpixmap" pixmap="skin_default/icons/dish.png" position="0,0" size="130,160" alphatest="off" />


@@ -538,7 +554,9 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
                        <convert type="RdsInfo">RasInteractiveAvailable</convert>
                        <convert type="ConditionalShowHide" />
                </widget>
                        <convert type="RdsInfo">RasInteractiveAvailable</convert>
                        <convert type="ConditionalShowHide" />
                </widget>

-               <widget name="BlinkingPoint" pixmap="skin_default/icons/record.png" position="480,3" zPosition="2" size="14,14" alphatest="on" />
+               <widget source="session.RecordState" render="Pixmap" pixmap="skin_default/icons/record.png" position="480,3" zPosition="2" size="14,14" alphatest="on" >
+                       <convert type="ConditionalShowHide">Blink</convert>
+               </widget>

                <ePixmap pixmap="skin_default/icons/clock.png" position="480,3" zPosition="1" size="14,14" alphatest="on" />
                <widget source="session.Event_Now" render="Progress" pixmap="skin_default/progress_medium.png" position="395,5" zPosition="2" size="71,11" borderWidth="2" borderColor="#cccccc" transparent="1">
                        <convert type="EventTime">Progress</convert>
                <ePixmap pixmap="skin_default/icons/clock.png" position="480,3" zPosition="1" size="14,14" alphatest="on" />
                <widget source="session.Event_Now" render="Progress" pixmap="skin_default/progress_medium.png" position="395,5" zPosition="2" size="71,11" borderWidth="2" borderColor="#cccccc" transparent="1">
                        <convert type="EventTime">Progress</convert>


@@ -657,7 +675,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
                <widget name="footer" position="10,310" size="400,20" font="Regular;20" halign="center" />
        </screen>
        <!-- Scart -->
                <widget name="footer" position="10,310" size="400,20" font="Regular;20" halign="center" />
        </screen>
        <!-- Scart -->

-       <screen name="Scart" position="0,0" size="720,576" />
+       <screen name="Scart" position="0,0" size="720,576" backgroundColor="transparent" />

        <!-- Service info -->
        <screen name="ServiceInfo" position="90,95" size="560,430" title="Serviceinfo">
                <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on" />
        <!-- Service info -->
        <screen name="ServiceInfo" position="90,95" size="560,430" title="Serviceinfo">
                <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on" />


@@ -742,13 +760,12 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
        <!-- Start Wizard -->
        <screen name="StartWizard" position="0,0" size="720,576" title="Welcome..." flags="wfNoBorder">
                <widget name="text" position="153,50" size="340,270" font="Regular;23" />
        <!-- Start Wizard -->
        <screen name="StartWizard" position="0,0" size="720,576" title="Welcome..." flags="wfNoBorder">
                <widget name="text" position="153,50" size="340,270" font="Regular;23" />

-               <widget source="list" render="Listbox" position="50,300" size="440,200" scrollbarMode="showOnDemand">
+               <widget source="list" render="Listbox" position="50,300" size="440,200" scrollbarMode="showOnDemand" >

                        <convert type="StringList" />
                </widget>
                        <convert type="StringList" />
                </widget>

-               <widget name="config" position="50,300" size="440,200" scrollbarMode="showOnDemand" />
+               <widget name="config" position="50,300" size="440,200" scrollbarMode="showOnDemand" zPosition="1" transparent="1" />

                <ePixmap pixmap="skin_default/buttons/button_red.png" position="40,225" size="15,16" alphatest="on" />
                <widget name="languagetext" position="55,225" size="95,30" font="Regular;18" />
                <ePixmap pixmap="skin_default/buttons/button_red.png" position="40,225" size="15,16" alphatest="on" />
                <widget name="languagetext" position="55,225" size="95,30" font="Regular;18" />

-               <widget name="stepslider" position="50,500" borderWidth="2" size="440,20" backgroundColor="background" />

                <widget name="wizard" pixmap="skin_default/wizard.png" position="40,50" zPosition="10" size="110,174" alphatest="on" />
                <widget name="rc" pixmap="skin_default/rc.png" position="500,600" zPosition="10" size="154,475" alphatest="on" />
                <widget name="arrowdown" pixmap="skin_default/arrowdown.png" position="0,0" zPosition="11" size="37,70" alphatest="on" />
                <widget name="wizard" pixmap="skin_default/wizard.png" position="40,50" zPosition="10" size="110,174" alphatest="on" />
                <widget name="rc" pixmap="skin_default/rc.png" position="500,600" zPosition="10" size="154,475" alphatest="on" />
                <widget name="arrowdown" pixmap="skin_default/arrowdown.png" position="0,0" zPosition="11" size="37,70" alphatest="on" />


@@ -761,10 +778,12 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
        </screen>
        <!-- Subservice quickzap -->
        <screen name="SubservicesQuickzap" position="124,470" size="512,200" title="Subservices" backgroundColor="transparent" flags="wfNoBorder">
        </screen>
        <!-- Subservice quickzap -->
        <screen name="SubservicesQuickzap" position="124,470" size="512,200" title="Subservices" backgroundColor="transparent" flags="wfNoBorder">

-               <widget name="BlinkingPoint" pixmap="skin_default/icons/record.png" position="450,0" zPosition="2" size="14,14" alphatest="on" />
+               <widget source="session.RecordState" render="Pixmap" pixmap="skin_default/icons/record.png" position="450,0" zPosition="2" size="14,14" alphatest="on" >
+                       <convert type="ConditionalShowHide">Blink</convert>
+               </widget>

                <eLabel text="Subservices" position="0,0" size="470,20" font="Regular;13" backgroundColor="#33294a6b" />
                <widget name="CurrentSubserviceNumber" position="0,20" size="50,34" font="Regular;22" backgroundColor="#33294a6b" shadowColor="black" shadowOffset="-1,-1" />
                <eLabel text="Subservices" position="0,0" size="470,20" font="Regular;13" backgroundColor="#33294a6b" />
                <widget name="CurrentSubserviceNumber" position="0,20" size="50,34" font="Regular;22" backgroundColor="#33294a6b" shadowColor="black" shadowOffset="-1,-1" />

-               <widget source="CurrentService" render="Label" position="50,20" size="420,34" font="Regular;22" backgroundColor="#33294a6b" shadowColor="black" shadowOffset="-1,-1">
+               <widget source="session.CurrentService" render="Label" position="50,20" size="420,34" font="Regular;22" backgroundColor="#33294a6b" shadowColor="black" shadowOffset="-1,-1">

                        <convert type="ServiceName">Name</convert>
                </widget>
        </screen>
                        <convert type="ServiceName">Name</convert>
                </widget>
        </screen>


@@ -773,7 +792,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
                <widget name="config" position="10,10" zPosition="1" size="360,275" scrollbarMode="showOnDemand" />
        </screen>
        <!-- Subtitle area -->
                <widget name="config" position="10,10" zPosition="1" size="360,275" scrollbarMode="showOnDemand" />
        </screen>
        <!-- Subtitle area -->

-       <screen name="SubtitleDisplay" position="0,0" size="720,576" zPosition="-1" flags="wfNoBorder" />
+       <screen name="SubtitleDisplay" position="0,0" size="720,576" zPosition="-1" flags="wfNoBorder" backgroundColor="transparent" />

        <!-- 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" />


@@ -952,4 +971,19 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
                        <convert type="ConditionalShowHide">Blink</convert>
                </widget>
        </screen>
                        <convert type="ConditionalShowHide">Blink</convert>
                </widget>
        </screen>

+       <screen name="JobView" position="84,122" size="522,324" title="Job View">
+               <widget source="job_progress" render="Progress" position="130,184" size="362,29" borderWidth="1" />
+               <widget source="job_status" render="Label" position="15,246" size="278,62" font="Regular;32" />
+               <widget source="job_name" render="Label" position="25,12" size="464,76" font="Regular;32" />
+               <widget source="job_task" render="Label" position="19,93" size="475,61" font="Regular;32" />
+               <widget source="job_progress" render="Label" position="18,164" size="106,65" font="Regular;48">
+                       <convert type="ProgressToText" />
+               </widget>
+               <widget source="finished" render="Pixmap" pixmap="skin_default/buttons/green.png" position="339,251" size="140,40" alphatest="on" >
+                       <convert type="ConditionalShowHide" />
+               </widget>
+               <widget source="finished" render="FixedLabel" text="OK" font="Regular;20" halign="center" valign="center" position="339,251" size="140,40" transparent="1" backgroundColor="#1f771f" >
+                       <convert type="ConditionalShowHide" />
+               </widget>
+       </screen>

 </skin>
 </skin>