- fixed console input mode restore

[enigma2.git] / skin.py

diff --git a/skin.py b/skin.py
index 5d482fdb32f0ab4b751f22f2a331a6aa5626fb47..936dcc965ab96dacd18f81d805e4f9111aec6462 100644 (file)
--- a/skin.py
+++ b/skin.py
@@ -11,11 +11,34 @@ def dump(x, i=0):
                None
 
 dom = xml.dom.minidom.parseString(
-       "<screen name=\"clockDialog\" position=\"300,100\" size=\"300,300\"> \
-               <widget name=\"okbutton\" position=\"10,10\" size=\"280,40\" /> \
-               <widget name=\"theClock\" position=\"10,60\" size=\"280,50\" /> \
-               <widget name=\"title\" position=\"10,120\" size=\"280,50\" /> \
-       </screen>")
+       """
+       <skin>
+               <screen name="mainMenu" position="300,100" size="300,300" title="real main menu">
+                       <widget name="okbutton" position="10,190" size="280,50" />
+                       <widget name="title" position="10,10" size="280,20" />
+                       <widget name="menu" position="10,30" size="280,140" />
+               </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="100,100" size="300,400" title="InfoBar">
+                       <widget name="channelSwitcher" position="10,190" size="280,50" />
+               </screen>
+               <screen name="channelSelection" position="300,100" size="300,300" title="Channel Selection">
+                       <widget name="okbutton" position="10,190" size="280,50" />
+                       <widget name="list" position="10,30" size="280,140" />
+               </screen>
+               <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" />
+                       <widget name="okbutton" position="10,100" size="280,40" />
+               </screen>
+       </skin>
+""")
+
+
 
 def parsePosition(str):
        x, y = str.split(',')
@@ -30,35 +53,49 @@ def applyAttributes(guiObject, node):
        for p in range(node.attributes.length):
                a = node.attributes.item(p)
                
+               # convert to string (was: unicode)
+               attrib = str(a.name)
+               # TODO: proper UTF8 translation?! (for value)
+               # TODO: localization? as in e1?
+               value = str(a.value)
+               
                # and set attributes
-               if a.name == 'position':
-                       guiObject.move(parsePosition(a.value))
-               elif a.name == 'size':
-                       guiObject.resize(parseSize(a.value))
-               elif a.name != 'name':
-                       print "unsupported attribute " + a.name
+               if attrib == 'position':
+                       guiObject.move(parsePosition(value))
+               elif attrib == 'size':
+                       guiObject.resize(parseSize(value))
+               elif attrib == 'title':
+                       guiObject.setTitle(value)
+               elif attrib != 'name':
+                       print "unsupported attribute " + attrib + "=" + value
 
-def applyGUIskin(screen, skin, name):
+def applyGUIskin(screen, parent, skin, name):
        
        myscreen = None
        
        # first, find the corresponding screen element
-       screens = dom.getElementsByTagName("screen")
+       skin = dom.getElementsByTagName("skin")[0]
+       screens = skin.getElementsByTagName("screen")
+       del skin
        for x in screens:
                if x.getAttribute('name') == name:
                        myscreen = x
        
-       if myscreen == None:
-               print "no skin for screen " + name + " found!"
-               return;
+       assert myscreen != None, "no skin for screen '" + name + "' found!"
+       
+       applyAttributes(parent, myscreen)
        
        # now walk all widgets
        for widget in myscreen.getElementsByTagName("widget"):
-               name = widget.getAttribute('name')
-               if name == None:
+               wname = widget.getAttribute('name')
+               if wname == None:
                        print "widget has no name!"
                        continue
                
                # get corresponding gui object
-               guiObject = screen.data[name]["instance"]
+               try:
+                       guiObject = screen.data[wname]["instance"]
+               except:
+                       raise str("component with name '" + wname + "' was not found in skin of screen '" + name + "'!")
+               
                applyAttributes(guiObject, widget)