add support for skin selector

diff --git a/skin.py b/skin.py
index 5a6408f3dd6ffef61237d93b907afb707a833ac1..1aced44c16320df33b6ec764ee2f9a10c71ebc97 100644 (file)
--- 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 Tools.Import import my_import
 import os
 

+from Components.config import ConfigSubsection, configElement, configText, config
+

 from Tools.XMLTools import elementsWithTag, mergeText
 
 colorNames = dict()
 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")
 # 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):
 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')
                        
                        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)
                                converter_class = my_import('.'.join(["Components", "Converter", ctype])).__dict__.get(ctype)
                                parms = mergeText(converter.childNodes).strip()
                                c = converter_class(parms)