From: Felix Domke Date: Mon, 10 Jul 2006 16:24:15 +0000 (+0000) Subject: add support for skin selector X-Git-Tag: 2.6.0~3198 X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/8e22df3af4a9ba076869de89f25b6f8adde29b49?hp=834bbf9162cfd90cd063e25aa45fc3c28fdee742 add support for skin selector --- diff --git a/skin.py b/skin.py index 5a6408f3..1aced44c 100644 --- a/skin.py +++ b/skin.py @@ -4,6 +4,8 @@ from xml.dom import EMPTY_NAMESPACE from Tools.Import import my_import import os +from Components.config import ConfigSubsection, configElement, configText, config + from Tools.XMLTools import elementsWithTag, mergeText colorNames = dict() @@ -44,7 +46,15 @@ def loadSkin(name): # so the first screen found will be used. # example: loadSkin("nemesis_greenline/skin.xml") -loadSkin('skin.xml') +config.skin = ConfigSubsection() +config.skin.primary_skin = configElement("config.skin.primary_skin", configText, "skin.xml", 0) + +try: + loadSkin(config.skin.primary_skin.value) +except SkinError, err: + print "SKIN ERROR:", err + print "defaulting to standard skin..." + loadSkin('skin.xml') loadSkin('skin_default.xml') def parsePosition(str): @@ -325,7 +335,7 @@ def readSkin(screen, skin, name, desktop): for converter in elementsWithTag(widget.childNodes, "convert"): ctype = converter.getAttribute('type') - assert ctype + assert ctype, "'convert'-tag needs a 'type'-attribute" converter_class = my_import('.'.join(["Components", "Converter", ctype])).__dict__.get(ctype) parms = mergeText(converter.childNodes).strip() c = converter_class(parms)