fix comment, add 16:9 letterbox

[enigma2.git] / skin.py

diff --git a/skin.py b/skin.py
index a1ce50b3a533438c0c645c1f892f591a41c95e3d..5a6408f3dd6ffef61237d93b907afb707a833ac1 100644 (file)
--- a/skin.py
+++ b/skin.py
@@ -18,6 +18,13 @@ def dump(x, i=0):
 
 from Tools.Directories import resolveFilename, SCOPE_SKIN, SCOPE_SKIN_IMAGE, SCOPE_FONTS
 
+class SkinError(Exception):
+       def __init__(self, message):
+               self.message = message
+
+       def __str__(self):
+               return self.message
+
 dom_skins = [ ]
 
 def loadSkin(name):
@@ -174,7 +181,7 @@ def applySingleAttribute(guiObject, desktop, attrib, value):
                elif attrib == 'shadowOffset':
                        guiObject.setShadowOffset(parsePosition(value))
                else:
-                       print "unsupported attribute " + attrib + "=" + value
+                       raise "unsupported attribute " + attrib + "=" + value
        except int:
 # AttributeError:
                print "widget %s (%s) doesn't support attribute %s!" % ("", guiObject.__class__.__name__, attrib)
@@ -299,7 +306,7 @@ def readSkin(screen, skin, name, desktop):
                        try:
                                attributes = screen[wname].skinAttributes = [ ]
                        except:
-                               raise str("component with name '" + wname + "' was not found in skin of screen '" + name + "'!")
+                               raise SkinError("component with name '" + wname + "' was not found in skin of screen '" + name + "'!")
 
 #                      assert screen[wname] is not Source
                
@@ -309,10 +316,13 @@ def readSkin(screen, skin, name, desktop):
                        # get corresponding source
                        source = screen.get(wsource)
                        if source is None:
-                               raise str("source '" + wsource + "' was not found in screen '" + name + "'!")
+                               raise SkinError("source '" + wsource + "' was not found in screen '" + name + "'!")
                        
                        wrender = widget.getAttribute('render')
                        
+                       if not wrender:
+                               raise SkinError("you must define a renderer with render= for source '%s'" % (wsource))
+                       
                        for converter in elementsWithTag(widget.childNodes, "convert"):
                                ctype = converter.getAttribute('type')
                                assert ctype
@@ -344,7 +354,7 @@ def readSkin(screen, skin, name, desktop):
                        if type == "onLayoutFinish":
                                screen.onLayoutFinish.append(code)
                        else:
-                               raise str("applet type '%s' unknown!" % type)
+                               raise SkinError("applet type '%s' unknown!" % type)
                        
                        continue
                
@@ -358,10 +368,10 @@ def readSkin(screen, skin, name, desktop):
                elif widget.tagName == "ePixmap":
                        w.widget = ePixmap
                else:
-                       raise str("unsupported stuff : %s" % widget.tagName)
+                       raise SkinError("unsupported stuff : %s" % widget.tagName)
                
                w.skinAttributes = [ ]
-               collectAttributes(w.skinAttributes, widget, skin_path_prefix)
+               collectAttributes(w.skinAttributes, widget, skin_path_prefix, ignore=['name'])
                
                # applyAttributes(guiObject, widget, desktop)
                # guiObject.thisown = 0