non blocking diseqc and sec stuff

[enigma2.git] / skin.py

diff --git a/skin.py b/skin.py
index 9de0a722bd5df209e86e9d0a017ed8c5e87bf858..72cef1a970c1b2057218673dfaabc3363d1cb56f 100644 (file)
--- a/skin.py
+++ b/skin.py
@@ -2,6 +2,7 @@ from enigma import *
 import xml.dom.minidom
 from xml.dom import EMPTY_NAMESPACE
 
+from Tools.XMLTools import elementsWithTag
 
 colorNames = dict()
 
@@ -71,12 +72,15 @@ dom = xml.dom.minidom.parseString(
                <screen name="configTest" position="300,100" size="300,300" title="config menu">
                        <widget name="config" position="10,30" size="280,140" />
                </screen>
+               <screen name="TimerEditList" position="160,100" size="420,430" title="Timer Editor">
+                       <widget name="timerlist" position="10,30" size="400,300" />
+               </screen>
                <screen name="clockDisplay" position="300,100" size="300,300">
                        <widget name="okbutton" position="10,10" size="280,40" />
                        <widget name="title" position="10,120" size="280,50" />
                        <widget name="theClock" position="10,60" size="280,50" />
                </screen>
-               <screen name="infoBar" position="0,380" size="720,151" title="InfoBar" flags="wfNoBorder">
+               <screen name="InfoBar" position="0,380" size="720,151" title="InfoBar" flags="wfNoBorder">
                        <ePixmap position="0,0" size="720,151" pixmap="data/info-bg.png" />
                        
                        <widget name="ServiceName" position="69,30" size="427,26" valign="center" font="Arial;32" backgroundColor="#101258" />
@@ -87,7 +91,7 @@ dom = xml.dom.minidom.parseString(
                        <widget name="Event_Next_Duration" position="555,98" size="70,26" font="Arial;26" backgroundColor="dark" />
 <!--                   <eLabel position="70,0" size="300,30" text=".oO skin Oo." font="Arial;20" /> -->
                </screen>
-               <screen name="channelSelection" position="90,100" size="560,420" title="Channel Selection">
+               <screen name="ChannelSelection" position="90,100" size="560,420" title="Channel Selection">
                        <widget name="list" position="0,50" size="560,340" />
 <!--                   <widget name="okbutton" position="340,50" size="140,30" />-->
                        <widget name="key_red" position="0,0" size="140,40" backgroundColor="red" />
@@ -95,27 +99,20 @@ dom = xml.dom.minidom.parseString(
                        <widget name="key_yellow" position="280,0" size="140,40" backgroundColor="yellow" />
                        <widget name="key_blue" position="420,0" size="140,40" backgroundColor="blue" />
                </screen>
-               <screen name="serviceScan" position="150,100" size="300,200" title="Service Scan">
+               <screen name="ServiceScan" position="150,100" size="300,200" title="Service Scan">
                        <widget name="scan_progress" position="10,10" size="280,50" />
                        <widget name="scan_state" position="10,60" size="280,30" />
                </screen>
+               <screen name="TimerEdit" position="70,100" size="590,335" title="Timer Edit">
+                       <widget name="description" position="10,10" size="580,40" />
+                       <widget name="lbegin" position="405,102" size="103,30" />
+                       <widget name="lend" position="405,158" size="103,30" />
+                       <widget name="begin" position="508,105" size="72,35" font="Arial;30" />
+                       <widget name="end" position="508,150" size="72,35" font="Arial;30" />
+                       <widget name="apply" position="10,240" size="250,35" />
+               </screen>
        </skin>""")
 
-# filters all elements of childNode with the specified function
-# example: nodes = elementsWithTag(childNodes, lambda x: x == "bla")
-def elementsWithTag(el, tag):
-
-       # fiiixme! (works but isn't nice)
-       if tag.__class__ == "".__class__:
-               str = tag
-               tag = lambda x: x == str
-               
-       for x in el:
-               if x.nodeType != xml.dom.minidom.Element.nodeType:
-                       continue
-               if tag(x.tagName):
-                       yield x
-
 def parsePosition(str):
        x, y = str.split(',')
        return ePoint(int(x), int(y))