X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/408672189d8e0714aaa52e91cd7e3906b78f4044..e3a6f808e43832cefc57e9a6025c9aad09212516:/skin.py

diff --git a/skin.py b/skin.py
index c8805f01..6baf6b71 100644
--- a/skin.py
+++ b/skin.py
@@ -10,7 +10,7 @@ from enigma import eSize, ePoint, gFont, eWindow, eLabel, ePixmap, eWindowStyleM
 from Components.config import ConfigSubsection, ConfigText, config
 from Components.Converter.Converter import Converter
 from Components.Sources.Source import Source, ObsoleteSource
-from Tools.Directories import resolveFilename, SCOPE_SKIN, SCOPE_SKIN_IMAGE, SCOPE_FONTS, SCOPE_CURRENT_SKIN, fileExists
+from Tools.Directories import resolveFilename, SCOPE_SKIN, SCOPE_SKIN_IMAGE, SCOPE_FONTS, SCOPE_CURRENT_SKIN, SCOPE_CONFIG, fileExists
 from Tools.Import import my_import
 from Tools.LoadPixmap import LoadPixmap
 
@@ -33,9 +33,9 @@ class SkinError(Exception):
 
 dom_skins = [ ]
 
-def loadSkin(name):
+def loadSkin(name, scope = SCOPE_SKIN):
 	# read the skin
-	filename = resolveFilename(SCOPE_SKIN, name)
+	filename = resolveFilename(scope, name)
 	mpath = path.dirname(filename) + "/"
 	dom_skins.append((mpath, xml.etree.cElementTree.parse(filename).getroot()))
 
@@ -54,6 +54,11 @@ config.skin = ConfigSubsection()
 config.skin.primary_skin = ConfigText(default = "skin.xml")
 
 profile("LoadSkin")
+try:
+	loadSkin('skin_user.xml', SCOPE_CONFIG)
+except (SkinError, IOError, AssertionError), err:
+	print "not loading user skin: ", err
+
 try:
 	loadSkin(config.skin.primary_skin.value)
 except (SkinError, IOError, AssertionError), err: