aboutsummaryrefslogtreecommitdiff
path: root/skin.py
diff options
context:
space:
mode:
authorFelix Domke <tmbinc@elitedvb.net>2009-02-16 01:01:57 +0100
committerFelix Domke <tmbinc@elitedvb.net>2009-02-16 01:01:57 +0100
commite3a6f808e43832cefc57e9a6025c9aad09212516 (patch)
treef9c38700ed3d1b38fa6dfb9692d94e6f5f7e8729 /skin.py
parent3e46901a0472e305c311d8d1faa499fed24b7ed8 (diff)
downloadenigma2-e3a6f808e43832cefc57e9a6025c9aad09212516.tar.gz
enigma2-e3a6f808e43832cefc57e9a6025c9aad09212516.zip
experimental: add possibility to add user skins in /etc/enigma2/skin_user.xml
Diffstat (limited to 'skin.py')
-rw-r--r--skin.py11
1 files changed, 8 insertions, 3 deletions
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()))
@@ -55,6 +55,11 @@ 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:
print "SKIN ERROR:", err