fix playing file when adding to the playlist

[enigma2.git] / skin.py

diff --git a/skin.py b/skin.py
index 9de0a722bd5df209e86e9d0a017ed8c5e87bf858..5327d66c71f7d5edb729c54f58a96f7d7d08c518 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
 
 import xml.dom.minidom
 from xml.dom import EMPTY_NAMESPACE
 

+from Tools.XMLTools import elementsWithTag, mergeText

 
 colorNames = dict()
 
 
 colorNames = dict()
 


@@ -13,108 +14,11 @@ def dump(x, i=0):
        except:
                None
 
        except:
                None
 

-dom = xml.dom.minidom.parseString(
-       """<skin>
-       
-               <colors>
-                       <color name="white"     value="#ffffff" />
-                       <color name="black"     value="#000000" />
-                       <color name="dark"      value="#294a6b" />
-                       
-                       <color name="red"               value="#ff0000" />
-                       <color name="green"     value="#00ff00" />
-                       <color name="blue"              value="#0000ff" />
-                       <color name="yellow"    value="#c0c000" />
-               </colors>
-               <windowstyle type="skinned">
-                       <color name="Background" color="#4075a7" />
-                       <color name="LabelForeground" color="#ffffff" />
-                       <color name="ListboxBackground" color="#4075a7" />
-                       <color name="ListboxForeground" color="#ffffff" />
-                       <color name="ListboxSelectedBackground" color="#80ff80" />
-                       <color name="ListboxSelectedForeground" color="#ffffff" />
-                       <color name="ListboxMarkedBackground" color="#ff0000" />
-                       <color name="ListboxMarkedForeground" color="#ffffff" />
-                       <borderset name="bsWindow">
-                               <pixmap pos="bpTopLeft"     filename="data/b_w_tl.png" />
-                               <pixmap pos="bpTop"         filename="data/b_w_t.png"  />
-                               <pixmap pos="bpTopRight"    filename="data/b_w_tr.png" />
-                               <pixmap pos="bpLeft"        filename="data/b_w_l.png"  />
-                               <pixmap pos="bpRight"       filename="data/b_w_r.png"  />
-                               <pixmap pos="bpBottomLeft"  filename="data/b_w_bl.png" />
-                               <pixmap pos="bpBottom"      filename="data/b_w_b.png"  />
-                               <pixmap pos="bpBottomRight" filename="data/b_w_br.png" />
-                       </borderset>
-               </windowstyle>
-               <screen name="Menu" position="300,100" size="300,300" title="real main menu">
-<!--                   <widget name="okbutton" position="10,190" size="280,50" font="Arial;20" valign="center" halign="center" />-->
-                       <widget name="title" position="10,10" size="280,20" />
-                       <widget name="menu" position="10,30" size="280,200" />
-               </screen>
-               <screen name="ScartLoopThrough" position="0,0" size="720,576">
-               </screen>
-               <screen name="ConfigMenu" position="300,100" size="300,300" title="real main menu">
-                       <widget name="txt_var_1" position="20,20" size="100,20" />
-                       <widget name="btn_var_1" position="110,20" size="200,20" />
-                       <widget name="txt_var_2" position="20,60" size="100,20" />
-                       <widget name="btn_var_2" position="110,60" size="200,20" />
-               </screen>
-               <screen name="configOSD" position="140,125" size="460,350" title="OSD Settings">
-                       <widget name="okbutton" position="20,245" size="205,40" />
-                       <widget name="txt_alpha" position="20,20" size="110,20" />
-                       <widget name="sld_alpha" position="150,20" size="290,20" />
-                       <widget name="txt_brightness" position="20,60" size="120,20" />
-                       <widget name="sld_brightness" position="150,20" size="290,20" />
-                       <widget name="txt_gamma" position="20,100" size="120,20" />
-                       <widget name="sld_gamma" position="150,100" size="290,20" />
-               </screen>
-               <screen name="configTest" position="300,100" size="300,300" title="config menu">
-                       <widget name="config" 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="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" />
-                       <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" />
-<!--                   <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">
-                       <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" />
-                       <widget name="key_green" position="140,0" size="140,40" backgroundColor="green" />
-                       <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">
-                       <widget name="scan_progress" position="10,10" size="280,50" />
-                       <widget name="scan_state" position="10,60" size="280,30" />
-               </screen>
-       </skin>""")
+from Tools.Directories import resolveFilename, SCOPE_SKIN, SCOPE_SKIN_IMAGE

 
 

-# 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
+# read the skin
+dom_skin = xml.dom.minidom.parse(resolveFilename(SCOPE_SKIN, 'skin.xml'))
+dom_skin_default = xml.dom.minidom.parse(resolveFilename(SCOPE_SKIN, 'skin_default.xml'))

 
 def parsePosition(str):
        x, y = str.split(',')
 
 def parsePosition(str):
        x, y = str.split(',')


@@ -136,83 +40,128 @@ def parseColor(str):
                        raise ("color '%s' must be #aarrggbb or valid named color" % (str))
        return gRGB(int(str[1:], 0x10))
 
                        raise ("color '%s' must be #aarrggbb or valid named color" % (str))
        return gRGB(int(str[1:], 0x10))
 

-def applyAttributes(guiObject, node, desktop):
+def collectAttributes(skinAttributes, node, skin_path_prefix=None):

        # walk all attributes
        for p in range(node.attributes.length):
                a = node.attributes.item(p)
                
                # convert to string (was: unicode)
                attrib = str(a.name)
        # walk all attributes
        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?
                # TODO: localization? as in e1?

-               value = str(a.value)
+               value = a.value.encode("utf-8")

                
                

-               # and set attributes
-               try:
-                       if attrib == 'position':
-                               guiObject.move(parsePosition(value))
-                       elif attrib == 'size':
-                               guiObject.resize(parseSize(value))
-                       elif attrib == 'title':
-                               guiObject.setTitle(value)
-                       elif attrib == 'text':
-                               guiObject.setText(value)
-                       elif attrib == 'font':
-                               guiObject.setFont(parseFont(value))
-                       elif attrib == "pixmap":
-                               ptr = gPixmapPtr()
-                               if loadPNG(ptr, value):
-                                       raise "loading PNG failed!"
-                               x = ptr
-                               ptr = ptr.__deref__()
-                               print desktop
-                               desktop.makeCompatiblePixmap(ptr)
-                               guiObject.setPixmap(ptr)
-#                              guiObject.setPixmapFromFile(value)
-                       elif attrib == "valign":
-                               try:
-                                       guiObject.setVAlign(
-                                               { "top": guiObject.alignTop,
-                                                       "center": guiObject.alignCenter,
-                                                       "bottom": guiObject.alignBottom
-                                               }[value])
-                               except KeyError:
-                                       print "valign must be either top, center or bottom!"
-                       elif attrib == "halign":
+               if skin_path_prefix and attrib in ["pixmap", "pointer"] and len(value) and value[0:2] == "~/":
+                       value = skin_path_prefix + value[1:]
+               
+               skinAttributes.append((attrib, value))
+
+def loadPixmap(path):
+       ptr = loadPNG(path)
+       if ptr is None:
+               raise "pixmap file %s not found!" % (path)
+       return ptr
+
+def applySingleAttribute(guiObject, desktop, attrib, value):
+       # and set attributes
+       try:
+               if attrib == 'position':
+                       guiObject.move(parsePosition(value))
+               elif attrib == 'size':
+                       guiObject.resize(parseSize(value))
+               elif attrib == 'title':
+                       guiObject.setTitle(_(value))
+               elif attrib == 'text':
+                       guiObject.setText(value)
+               elif attrib == 'font':
+                       guiObject.setFont(parseFont(value))
+               elif attrib == 'zPosition':
+                       guiObject.setZPosition(int(value))
+               elif attrib == "pixmap":
+                       ptr = loadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, value))
+                       # that __deref__ still scares me!
+                       desktop.makeCompatiblePixmap(ptr.__deref__())
+                       guiObject.setPixmap(ptr.__deref__())
+                       # guiObject.setPixmapFromFile(value)
+               elif attrib == "alphatest": # used by ePixmap
+                       guiObject.setAlphatest(
+                               { "on": True,
+                                 "off": False
+                               }[value])
+               elif attrib == "orientation": # used by eSlider
+                       try:
+                               guiObject.setOrientation(
+                                       { "orVertical": guiObject.orVertical,
+                                               "orHorizontal": guiObject.orHorizontal
+                                       }[value])
+                       except KeyError:
+                               print "oprientation must be either orVertical or orHorizontal!"
+               elif attrib == "valign":
+                       try:
+                               guiObject.setVAlign(
+                                       { "top": guiObject.alignTop,
+                                               "center": guiObject.alignCenter,
+                                               "bottom": guiObject.alignBottom
+                                       }[value])
+                       except KeyError:
+                               print "valign must be either top, center or bottom!"
+               elif attrib == "halign":
+                       try:
+                               guiObject.setHAlign(
+                                       { "left": guiObject.alignLeft,
+                                               "center": guiObject.alignCenter,
+                                               "right": guiObject.alignRight,
+                                               "block": guiObject.alignBlock
+                                       }[value])
+                       except KeyError:
+                               print "halign must be either left, center, right or block!"
+               elif attrib == "flags":
+                       flags = value.split(',')
+                       for f in flags:

                                try:
                                try:

-                                       guiObject.setHAlign(
-                                               { "left": guiObject.alignLeft,
-                                                       "center": guiObject.alignCenter,
-                                                       "right": guiObject.alignRight,
-                                                       "block": guiObject.alignBlock
-                                               }[value])
+                                       fv = eWindow.__dict__[f]
+                                       guiObject.setFlag(fv)

                                except KeyError:
                                except KeyError:

-                                       print "halign must be either left, center, right or block!"
-                       elif attrib == "flags":
-                               flags = value.split(',')
-                               for f in flags:
-                                       try:
-                                               fv = eWindow.__dict__[f]
-                                               guiObject.setFlag(fv)
-                                       except KeyError:
-                                               print "illegal flag %s!" % f
-                       elif attrib == "backgroundColor":
-                               guiObject.setBackgroundColor(parseColor(value))
-                       elif attrib != 'name':
-                               print "unsupported attribute " + attrib + "=" + value
-               except AttributeError:
-                       print "widget %s (%s) doesn't support attribute %s!" % ("", guiObject.__class__.__name__, attrib)
+                                       print "illegal flag %s!" % f
+               elif attrib == "backgroundColor":
+                       guiObject.setBackgroundColor(parseColor(value))
+               elif attrib == "foregroundColor":
+                       guiObject.setForegroundColor(parseColor(value))
+               elif attrib == "selectionDisabled":
+                       guiObject.setSelectionEnable(0)
+               elif attrib == "transparent":
+                       guiObject.setTransparent(int(value))
+               elif attrib == "borderColor":
+                       guiObject.setBorderColor(parseColor(value))
+               elif attrib == "borderWidth":
+                       guiObject.setBorderWidth(int(value))
+               elif attrib == "scrollbarMode":
+                       guiObject.setScrollbarMode(
+                               { "showOnDemand": guiObject.showOnDemand,
+                                       "showAlways": guiObject.showAlways,
+                                       "showNever": guiObject.showNever
+                               }[value])
+               elif attrib == "enableWrapAround":
+                       guiObject.setWrapAround(True)
+               elif attrib == "pointer":
+                       (name, pos) = value.split(':')
+                       pos = parsePosition(pos)
+                       ptr = loadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, name))
+                       desktop.makeCompatiblePixmap(ptr.__deref__())
+                       guiObject.setPointer(ptr.__deref__(), pos)
+               elif attrib != 'name':
+                       print "unsupported attribute " + attrib + "=" + value
+       except int:
+# AttributeError:
+               print "widget %s (%s) doesn't support attribute %s!" % ("", guiObject.__class__.__name__, attrib)

 
 

-def loadSkin():
+def applyAllAttributes(guiObject, desktop, attributes):
+       for (attrib, value) in attributes:
+               applySingleAttribute(guiObject, desktop, attrib, value)
+
+def loadSkin(desktop):

        print "loading skin..."
        
        print "loading skin..."
        

-       def getPNG(x):
-               g = gPixmapPtr()
-               loadPNG(g, x)
-               g = g.grabRef()
-               return g
-       
-       skin = dom.childNodes[0]
+       skin = dom_skin.childNodes[0]

        assert skin.tagName == "skin", "root element in skin must be 'skin'!"
        
        for c in elementsWithTag(skin.childNodes, "colors"):
        assert skin.tagName == "skin", "root element in skin must be 'skin'!"
        
        for c in elementsWithTag(skin.childNodes, "colors"):


@@ -228,13 +177,20 @@ def loadSkin():
        for windowstyle in elementsWithTag(skin.childNodes, "windowstyle"):
                style = eWindowStyleSkinned()
                
        for windowstyle in elementsWithTag(skin.childNodes, "windowstyle"):
                style = eWindowStyleSkinned()
                

+               style.setTitleFont(gFont("Regular", 20));
+               style.setTitleOffset(eSize(20, 5));
+               

                for borderset in elementsWithTag(windowstyle.childNodes, "borderset"):
                        bsName = str(borderset.getAttribute("name"))
                        for pixmap in elementsWithTag(borderset.childNodes, "pixmap"):
                                bpName = str(pixmap.getAttribute("pos"))
                                filename = str(pixmap.getAttribute("filename"))
                                
                for borderset in elementsWithTag(windowstyle.childNodes, "borderset"):
                        bsName = str(borderset.getAttribute("name"))
                        for pixmap in elementsWithTag(borderset.childNodes, "pixmap"):
                                bpName = str(pixmap.getAttribute("pos"))
                                filename = str(pixmap.getAttribute("filename"))
                                

-                               style.setPixmap(eWindowStyleSkinned.__dict__[bsName], eWindowStyleSkinned.__dict__[bpName], getPNG(filename))
+                               png = loadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, filename))
+                               
+                               # adapt palette
+                               desktop.makeCompatiblePixmap(png.__deref__())
+                               style.setPixmap(eWindowStyleSkinned.__dict__[bsName], eWindowStyleSkinned.__dict__[bpName], png.__deref__())

 
                for color in elementsWithTag(windowstyle.childNodes, "color"):
                        type = str(color.getAttribute("name"))
 
                for color in elementsWithTag(windowstyle.childNodes, "color"):
                        type = str(color.getAttribute("name"))


@@ -249,20 +205,43 @@ def loadSkin():
                eWindowStyleManager.getInstance(x)
                x.setStyle(style)
 
                eWindowStyleManager.getInstance(x)
                x.setStyle(style)
 

-def applyGUIskin(screen, skin, name, desktop):
+def readSkin(screen, skin, name, desktop):

        myscreen = None
        
        # first, find the corresponding screen element
        myscreen = None
        
        # first, find the corresponding screen element

-       skin = dom.childNodes[0]
+       skin = dom_skin.childNodes[0] 
+       skin_default = dom_skin_default.childNodes[0]

        
        for x in elementsWithTag(skin.childNodes, "screen"):
                if x.getAttribute('name') == name:
                        myscreen = x
        
        for x in elementsWithTag(skin.childNodes, "screen"):
                if x.getAttribute('name') == name:
                        myscreen = x

-       del skin
+                       break
+       
+       # if not found, check default skin      
+       if myscreen is None:
+               for x in elementsWithTag(skin_default.childNodes, "screen"):
+                       if x.getAttribute('name') == name:
+                               myscreen = x
+                               break
+
+       del skin, skin_default
+       
+       # otherwise try embedded skin
+       myscreen = myscreen or getattr(screen, "parsedSkin", None)

        
        

-       assert myscreen != None, "no skin for screen '" + name + "' found!"
+       # try uncompiled embedded skin
+       if myscreen is None and getattr(screen, "skin", None):
+               myscreen = screen.parsedSkin = xml.dom.minidom.parseString(screen.skin).childNodes[0]
+       
+       assert myscreen is not None, "no skin for screen '" + name + "' found!"
+
+       screen.skinAttributes = [ ]
+       
+       skin_path_prefix = getattr(screen, "skin_path", None)
+
+       collectAttributes(screen.skinAttributes, myscreen, skin_path_prefix)

        
        

-       applyAttributes(screen.instance, myscreen, desktop)
+       screen.additionalWidgets = [ ]

        
        # now walk all widgets
        for widget in elementsWithTag(myscreen.childNodes, "widget"):
        
        # now walk all widgets
        for widget in elementsWithTag(myscreen.childNodes, "widget"):


@@ -273,20 +252,42 @@ def applyGUIskin(screen, skin, name, desktop):
                
                # get corresponding gui object
                try:
                
                # get corresponding gui object
                try:

-                       guiObject = screen[wname].instance
+                       attributes = screen[wname].skinAttributes = [ ]

                except:
                        raise str("component with name '" + wname + "' was not found in skin of screen '" + name + "'!")
                
                except:
                        raise str("component with name '" + wname + "' was not found in skin of screen '" + name + "'!")
                

-               applyAttributes(guiObject, widget, desktop)
+               collectAttributes(attributes, widget, skin_path_prefix)

 
        # now walk additional objects
        for widget in elementsWithTag(myscreen.childNodes, lambda x: x != "widget"):
 
        # now walk additional objects
        for widget in elementsWithTag(myscreen.childNodes, lambda x: x != "widget"):

+               if widget.tagName == "applet":
+                       codeText = mergeText(widget.childNodes).strip()
+                       type = widget.getAttribute('type')
+
+                       code = compile(codeText, "skin applet", "exec")
+                       
+                       if type == "onLayoutFinish":
+                               screen.onLayoutFinish.append(code)
+                       else:
+                               raise str("applet type '%s' unknown!" % type)
+                       
+                       continue
+               
+               class additionalWidget:
+                       pass
+               
+               w = additionalWidget()
+               

                if widget.tagName == "eLabel":
                if widget.tagName == "eLabel":

-                       guiObject = eLabel(screen.instance)
+                       w.widget = eLabel

                elif widget.tagName == "ePixmap":
                elif widget.tagName == "ePixmap":

-                       guiObject = ePixmap(screen.instance)
+                       w.widget = ePixmap

                else:
                        raise str("unsupported stuff : %s" % widget.tagName)
                
                else:
                        raise str("unsupported stuff : %s" % widget.tagName)
                

-               applyAttributes(guiObject, widget, desktop      )
-               guiObject.thisown = 0
+               w.skinAttributes = [ ]
+               collectAttributes(w.skinAttributes, widget, skin_path_prefix)
+               
+               # applyAttributes(guiObject, widget, desktop)
+               # guiObject.thisown = 0
+               screen.additionalWidgets.append(w)