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
class SkinError(Exception):
def __init__(self, message):
- self.message = message
+ self.msg = message
def __str__(self):
- return "{%s}: %s" % (config.skin.primary_skin, self.message)
+ return "{%s}: %s" % (config.skin.primary_skin, self.msg)
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()))
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:
attrib = a[0]
value = a[1]
- if attrib in ["pixmap", "pointer", "seek_pointer", "backgroundPixmap", "selectionPixmap"]:
+ if attrib in ("pixmap", "pointer", "seek_pointer", "backgroundPixmap", "selectionPixmap"):
value = resolveFilename(SCOPE_SKIN_IMAGE, value, path_prefix=skin_path_prefix)
if attrib not in ignore:
guiObject.setFont(parseFont(value, scale))
elif attrib == 'zPosition':
guiObject.setZPosition(int(value))
- elif attrib in ["pixmap", "backgroundPixmap", "selectionPixmap"]:
+ elif attrib in ("pixmap", "backgroundPixmap", "selectionPixmap"):
ptr = loadPixmap(value, desktop) # this should already have been filename-resolved.
if attrib == "pixmap":
guiObject.setPixmap(ptr)