remove deprecated and unused code

[enigma2.git] / data / skin_default.xml

diff --git a/data/skin_default.xml b/data/skin_default.xml
index 3de4d593089a0f791a19e98f5d1602d698e2af24..726b8518015635d60dc07241ac8113e605dde3ed 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">


@@ -538,7 +538,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>


@@ -761,7 +763,9 @@ 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" />
                <widget source="CurrentService" render="Label" position="50,20" size="420,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">