do not show inaccessible devices in deviceselection

[enigma2.git] / skin.py

diff --git a/skin.py b/skin.py
index dd10790580300f74a7f656aae06d2dc814e0441b..c8805f01d74b8703c97ab2f6f667826bded5db87 100644 (file)
--- a/skin.py
+++ b/skin.py
@@ -14,8 +14,6 @@ from Tools.Directories import resolveFilename, SCOPE_SKIN, SCOPE_SKIN_IMAGE, SCO
 from Tools.Import import my_import
 from Tools.LoadPixmap import LoadPixmap
 
-from Tools.XMLTools import mergeText
-
 colorNames = dict()
 
 def dump(x, i=0):
@@ -31,7 +29,7 @@ class SkinError(Exception):
                self.message = message
 
        def __str__(self):
-               return self.message
+               return "{%s}: %s" % (config.skin.primary_skin, self.message)
 
 dom_skins = [ ]
 
@@ -147,11 +145,11 @@ def applySingleAttribute(guiObject, desktop, attrib, value, scale = ((1,1),(1,1)
                        try:
                                guiObject.setOrientation(*
                                        { "orVertical": (guiObject.orVertical, False),
-                                               "orTopToBottom": (guiObject.olVertical, False),
+                                               "orTopToBottom": (guiObject.orVertical, False),
                                                "orBottomToTop": (guiObject.orVertical, True),
                                                "orHorizontal": (guiObject.orHorizontal, False),
                                                "orLeftToRight": (guiObject.orHorizontal, False),
-                                               "orRightToRight": (guiObject.orHorizontal, True),
+                                               "orRightToLeft": (guiObject.orHorizontal, True),
                                        }[value])
                        except KeyError:
                                print "oprientation must be either orVertical or orHorizontal!"
@@ -274,7 +272,7 @@ def loadSingleSkinData(desktop, skin, path_prefix):
                                colorNames[name] = parseColor(color)
                                #print "Color:", name, color
                        else:
-                               raise ("need color and name, got %s %s" % (name, color))
+                               raise SkinError("need color and name, got %s %s" % (name, color))
 
        for c in skin.findall("fonts"):
                for font in c.findall("font"):
@@ -335,7 +333,7 @@ def loadSingleSkinData(desktop, skin, path_prefix):
                        try:
                                style.setColor(eWindowStyleSkinned.__dict__["col" + type], color)
                        except:
-                               raise ("Unknown color %s" % (type))
+                               raise SkinError("Unknown color %s" % (type))
                                #pass
 
                        #print "  color:", type, color
@@ -474,13 +472,12 @@ def readSkin(screen, skin, names, desktop):
                                ctype = converter.get('type')
                                assert ctype, "'convert'-tag needs a 'type'-attribute"
                                #print "Converter:", ctype
-                               #parms = mergeText(converter.childNodes).strip()
                                try:
                                        parms = converter.text.strip()
                                except:
                                        parms = ""
-                               #print "Params:", ctype
-                               converter_class = my_import('.'.join(["Components", "Converter", ctype])).__dict__.get(ctype)
+                               #print "Params:", parms
+                               converter_class = my_import('.'.join(("Components", "Converter", ctype))).__dict__.get(ctype)
 
                                c = None
 
@@ -497,7 +494,7 @@ def readSkin(screen, skin, names, desktop):
 
                                source = c
 
-                       renderer_class = my_import('.'.join(["Components", "Renderer", wrender])).__dict__.get(wrender)
+                       renderer_class = my_import('.'.join(("Components", "Renderer", wrender))).__dict__.get(wrender)
 
                        renderer = renderer_class() # instantiate renderer