support for 'level'-attribute in menu.xml

[enigma2.git] / skin.py

diff --git a/skin.py b/skin.py
index 3c4b9e1f9f809709d1ac9a2fda39687f5adf5672..e5c4837155b31c726dfb97891e6c283ed23070bc 100644 (file)
--- a/skin.py
+++ b/skin.py
@@ -14,9 +14,6 @@ from Tools.XMLTools import elementsWithTag, mergeText
 
 colorNames = dict()
 
-def queryColor(colorName):
-       return colorNames.get(colorName)
-
 def dump(x, i=0):
        print " " * i + str(x)
        try:
@@ -79,7 +76,7 @@ def parseColor(str):
                try:
                        return colorNames[str]
                except:
-                       raise ("color '%s' must be #aarrggbb or valid named color" % (str))
+                       raise SkinError("color '%s' must be #aarrggbb or valid named color" % (str))
        return gRGB(int(str[1:], 0x10))
 
 def collectAttributes(skinAttributes, node, skin_path_prefix=None, ignore=[]):
@@ -101,7 +98,7 @@ def collectAttributes(skinAttributes, node, skin_path_prefix=None, ignore=[]):
 def loadPixmap(path):
        ptr = loadPNG(path)
        if ptr is None:
-               raise "pixmap file %s not found!" % (path)
+               raise SkinError("pixmap file %s not found!" % (path))
        return ptr
 
 def applySingleAttribute(guiObject, desktop, attrib, value):
@@ -202,7 +199,7 @@ def applySingleAttribute(guiObject, desktop, attrib, value):
                elif attrib == 'noWrap':
                        guiObject.setNoWrap(1)
                else:
-                       raise "unsupported attribute " + attrib + "=" + value
+                       raise SkinError("unsupported attribute " + attrib + "=" + value)
        except int:
 # AttributeError:
                print "widget %s (%s) doesn't support attribute %s!" % ("", guiObject.__class__.__name__, attrib)
@@ -289,12 +286,14 @@ def lookupScreen(name):
                                return x, path
        return None, None
 
-def readSkin(screen, skin, name, desktop):
-       if not isinstance(name, list):
-               name = [name]
+def readSkin(screen, skin, names, desktop):
+       if not isinstance(names, list):
+               names = [names]
+
+       name = "<embedded-in-'%s'>" % screen.__class__.__name__
 
        # try all skins, first existing one have priority
-       for n in name:
+       for n in names:
                myscreen, path = lookupScreen(n)
                if myscreen is not None:
                        # use this name for debug output
@@ -308,7 +307,7 @@ def readSkin(screen, skin, name, desktop):
        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 '" + repr(name) + "' found!"
+       assert myscreen is not None, "no skin for screen '" + repr(names) + "' found!"
 
        screen.skinAttributes = [ ]