forgotten sdl-fix

[enigma2.git] / skin.py

diff --git a/skin.py b/skin.py
index 5706507618e2f2d056f8695a0392af1875dcdf99..67b461f17090591a8c049ed2968f3b0933b2fd27 100644 (file)
--- a/skin.py
+++ b/skin.py
@@ -81,18 +81,19 @@ dom = xml.dom.minidom.parseString(
                        <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">
-                       <ePixmap position="0,0" size="720,151" pixmap="data/info-bg.png" />
+               <screen name="InfoBar" flags="wfNoBorder" position="0,380" size="720,148" title="InfoBar">
+                       <ePixmap position="0,0" size="720,148" pixmap="data/info-bg.png" />
                        
-                       <widget name="ServiceName" position="69,30" size="427,26" valign="center" font="Arial;32" backgroundColor="#101258" />
-                       <widget name="CurrentTime" position="575,10" size="66,30" backgroundColor="dark" font="Arial;16" />
-                       <widget name="Event_Now" position="273,68" size="282,30" font="Arial;29" backgroundColor="dark" />
-                       <widget name="Event_Next" position="273,98" size="282,30" font="Arial;29" backgroundColor="dark" />
-                       <widget name="Event_Now_Duration" position="555,68" size="70,26" font="Arial;26" backgroundColor="dark" />
-                       <widget name="Event_Next_Duration" position="555,98" size="70,26" font="Arial;26" backgroundColor="dark" />
+                       <widget name="ServiceName" position="69,25" size="427,26" valign="center" font="Arial;22" backgroundColor="#101258" />
+                       <widget name="CurrentTime" position="575,10" size="80,30" backgroundColor="dark" font="Arial;19" />
+                       <widget name="Volume" position="575,45" size="100,5" backgroundColor="dark" />
+                       <widget name="Event_Now" position="273,68" size="282,30" font="Arial;22" backgroundColor="dark" />
+                       <widget name="Event_Next" position="273,98" size="282,30" font="Arial;22" backgroundColor="dark" />
+                       <widget name="Event_Now_Duration" position="555,68" size="70,26" font="Arial;22" backgroundColor="dark" />
+                       <widget name="Event_Next_Duration" position="555,98" size="70,26" font="Arial;22" 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" />
@@ -100,6 +101,9 @@ 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="MovieSelection" position="150,100" size="400,420" title="Select-a-movie">
+                       <widget name="list" position="0,50" size="400,300" />
+               </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" />
@@ -170,7 +174,7 @@ def collectAttributes(skinAttributes, node):
                # TODO: localization? as in e1?
                value = str(a.value)
                
-               skinAttributes[attrib] = value
+               skinAttributes.append((attrib, value))
 
 def applySingleAttribute(guiObject, desktop, attrib, value):           
        # and set attributes
@@ -232,7 +236,7 @@ def applySingleAttribute(guiObject, desktop, attrib, value):
                print "widget %s (%s) doesn't support attribute %s!" % ("", guiObject.__class__.__name__, attrib)
 
 def applyAllAttributes(guiObject, desktop, attributes):
-       for (attrib, value) in attributes.items():
+       for (attrib, value) in attributes:
                applySingleAttribute(guiObject, desktop, attrib, value)
 
 def loadSkin(desktop):
@@ -298,7 +302,7 @@ def readSkin(screen, skin, name, desktop):
        
        assert myscreen != None, "no skin for screen '" + name + "' found!"
 
-       screen.skinAttributes = { }     
+       screen.skinAttributes = [ ]
        collectAttributes(screen.skinAttributes, myscreen)
        
        screen.additionalWidgets = [ ]
@@ -312,7 +316,7 @@ def readSkin(screen, skin, name, desktop):
                
                # get corresponding gui object
                try:
-                       attributes = screen[wname].skinAttributes = { }
+                       attributes = screen[wname].skinAttributes = [ ]
                except:
                        raise str("component with name '" + wname + "' was not found in skin of screen '" + name + "'!")
                
@@ -345,7 +349,7 @@ def readSkin(screen, skin, name, desktop):
                else:
                        raise str("unsupported stuff : %s" % widget.tagName)
                
-               w.skinAttributes = { }
+               w.skinAttributes = [ ]
                collectAttributes(w.skinAttributes, widget)
                
                # applyAttributes(guiObject, widget, desktop)