X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=skin.py;h=9c18fda6bfaa3a57c8006a9deecb06a5eaf6a199;hb=8f7dbc5ddb0e674364866b0e41ba42b55c6db8bf;hp=c95d049dd4974ed4f466e506de65b39707c9b965;hpb=ab2ae6bd08a0ef13fc7462d51fc3a9ab15509b17;p=vuplus_dvbapp diff --git a/skin.py b/skin.py index c95d049..9c18fda 100644 --- a/skin.py +++ b/skin.py @@ -4,7 +4,7 @@ from xml.dom import EMPTY_NAMESPACE from Tools.Import import my_import import os -from Components.config import ConfigSubsection, configElement, configText, config +from Components.config import ConfigSubsection, ConfigText, config from Components.Element import Element from Components.Converter.Converter import Converter @@ -49,7 +49,7 @@ def loadSkin(name): # example: loadSkin("nemesis_greenline/skin.xml") config.skin = ConfigSubsection() -config.skin.primary_skin = configElement("config.skin.primary_skin", configText, "skin.xml", 0) +config.skin.primary_skin = ConfigText(default = "skin.xml") try: loadSkin(config.skin.primary_skin.value) @@ -89,7 +89,7 @@ def collectAttributes(skinAttributes, node, skin_path_prefix=None, ignore=[]): # TODO: localization? as in e1? value = a.value.encode("utf-8") - if attrib in ["pixmap", "pointer"]: + if attrib in ["pixmap", "pointer", "seek_pointer"]: value = resolveFilename(SCOPE_SKIN_IMAGE, value, path_prefix=skin_path_prefix) if attrib not in ignore: @@ -184,12 +184,12 @@ def applySingleAttribute(guiObject, desktop, attrib, value): }[value]) elif attrib == "enableWrapAround": guiObject.setWrapAround(True) - elif attrib == "pointer": + elif attrib == "pointer" or attrib == "seek_pointer": (name, pos) = value.split(':') pos = parsePosition(pos) ptr = loadPixmap(name) desktop.makeCompatiblePixmap(ptr.__deref__()) - guiObject.setPointer(ptr.__deref__(), pos) + guiObject.setPointer({"pointer": 0, "seek_pointer": 1}[attrib], ptr.__deref__(), pos) elif attrib == 'shadowOffset': guiObject.setShadowOffset(parsePosition(value)) else: