X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/ea7332a8be73de0f01bed063a46082cdb10858a9..8ffec89a2f2027c2cb263e99b5a45170ffaf6667:/skin.py diff --git a/skin.py b/skin.py index a1ce50b3..fc4721dd 100644 --- a/skin.py +++ b/skin.py @@ -1,8 +1,15 @@ -from enigma import * import xml.dom.minidom from xml.dom import EMPTY_NAMESPACE +from os import path + +from enigma import eSize, ePoint, gFont, eWindow, eLabel, ePixmap, eWindowStyleManager, \ + loadPNG, addFont, gRGB, eWindowStyleSkinned + +from Components.config import ConfigSubsection, ConfigText, config +from Components.Element import Element +from Components.Converter.Converter import Converter +from Tools.Directories import resolveFilename, SCOPE_SKIN, SCOPE_SKIN_IMAGE, SCOPE_FONTS from Tools.Import import my_import -import os from Tools.XMLTools import elementsWithTag, mergeText @@ -16,15 +23,20 @@ def dump(x, i=0): except: None -from Tools.Directories import resolveFilename, SCOPE_SKIN, SCOPE_SKIN_IMAGE, SCOPE_FONTS +class SkinError(Exception): + def __init__(self, message): + self.message = message + + def __str__(self): + return self.message dom_skins = [ ] def loadSkin(name): # read the skin filename = resolveFilename(SCOPE_SKIN, name) - path = os.path.dirname(filename) + "/" - dom_skins.append((path, xml.dom.minidom.parse(filename))) + mpath = path.dirname(filename) + "/" + dom_skins.append((mpath, xml.dom.minidom.parse(filename))) # we do our best to always select the "right" value # skins are loaded in order of priority: skin with @@ -37,7 +49,15 @@ def loadSkin(name): # so the first screen found will be used. # example: loadSkin("nemesis_greenline/skin.xml") -loadSkin('skin.xml') +config.skin = ConfigSubsection() +config.skin.primary_skin = ConfigText(default = "skin.xml") + +try: + loadSkin(config.skin.primary_skin.value) +except (SkinError, IOError, AssertionError), err: + print "SKIN ERROR:", err + print "defaulting to standard skin..." + loadSkin('skin.xml') loadSkin('skin_default.xml') def parsePosition(str): @@ -70,7 +90,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: @@ -92,7 +112,7 @@ def applySingleAttribute(guiObject, desktop, attrib, value): elif attrib == 'title': guiObject.setTitle(_(value)) elif attrib == 'text': - guiObject.setText(value) + guiObject.setText(_(value)) elif attrib == 'font': guiObject.setFont(parseFont(value)) elif attrib == 'zPosition': @@ -165,16 +185,18 @@ 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)) + elif attrib == 'noWrap': + guiObject.setNoWrap(1) else: - print "unsupported attribute " + attrib + "=" + value + raise "unsupported attribute " + attrib + "=" + value except int: # AttributeError: print "widget %s (%s) doesn't support attribute %s!" % ("", guiObject.__class__.__name__, attrib) @@ -209,6 +231,7 @@ def loadSingleSkinData(desktop, dom_skin, path_prefix): for windowstyle in elementsWithTag(skin.childNodes, "windowstyle"): style = eWindowStyleSkinned() + id = int(windowstyle.getAttribute("id") or "0") # defaults font = gFont("Regular", 20) @@ -242,9 +265,8 @@ def loadSingleSkinData(desktop, dom_skin, path_prefix): except: raise ("Unknown color %s" % (type)) - x = eWindowStyleManagerPtr() - eWindowStyleManager.getInstance(x) - x.setStyle(style) + x = eWindowStyleManager.getInstance() + x.setStyle(id, style) def loadSkinData(desktop): skins = dom_skins[:] @@ -262,6 +284,7 @@ def lookupScreen(name): return None, None def readSkin(screen, skin, name, desktop): + myscreen, path = lookupScreen(name) # otherwise try embedded skin @@ -282,6 +305,8 @@ def readSkin(screen, skin, name, desktop): screen.additionalWidgets = [ ] screen.renderer = [ ] + visited_components = set() + # now walk all widgets for widget in elementsWithTag(myscreen.childNodes, "widget"): # ok, we either have 1:1-mapped widgets ('old style'), or 1:n-mapped @@ -290,37 +315,54 @@ def readSkin(screen, skin, name, desktop): wname = widget.getAttribute('name') wsource = widget.getAttribute('source') + if wname is None and wsource is None: print "widget has no name and no source!" continue if wname: + visited_components.add(wname) + # get corresponding 'gui' object try: attributes = screen[wname].skinAttributes = [ ] except: - raise str("component with name '" + wname + "' was not found in skin of screen '" + name + "'!") + raise SkinError("component with name '" + wname + "' was not found in skin of screen '" + name + "'!") # assert screen[wname] is not Source - + # and collect attributes for this collectAttributes(attributes, widget, skin_path_prefix, ignore=['name']) elif wsource: # get corresponding source source = screen.get(wsource) if source is None: - raise str("source '" + wsource + "' was not found in screen '" + name + "'!") + raise SkinError("source '" + wsource + "' was not found in screen '" + name + "'!") wrender = widget.getAttribute('render') + if not wrender: + raise SkinError("you must define a renderer with render= for source '%s'" % (wsource)) + for converter in elementsWithTag(widget.childNodes, "convert"): ctype = converter.getAttribute('type') - assert ctype - converter_class = my_import('.'.join(["Components", "Converter", ctype])).__dict__.get(ctype) + assert ctype, "'convert'-tag needs a 'type'-attribute" parms = mergeText(converter.childNodes).strip() - c = converter_class(parms) + converter_class = my_import('.'.join(["Components", "Converter", ctype])).__dict__.get(ctype) - c.connect(source) + c = None + + for i in source.downstream_elements: + if isinstance(i, converter_class) and i.converter_arguments == parms: + c = i + + if c is None: + print "allocating new converter!" + c = converter_class(parms) + c.connect(source) + else: + print "reused conveter!" + source = c renderer_class = my_import('.'.join(["Components", "Renderer", wrender])).__dict__.get(wrender) @@ -333,6 +375,11 @@ def readSkin(screen, skin, name, desktop): screen.renderer.append(renderer) + from Components.GUIComponent import GUIComponent + nonvisited_components = [x for x in set(screen.keys()) - visited_components if isinstance(x, GUIComponent)] + + assert not nonvisited_components, "the following components in %s don't have a skin entry: %s" % (name, ', '.join(nonvisited_components)) + # now walk additional objects for widget in elementsWithTag(myscreen.childNodes, lambda x: x != "widget"): if widget.tagName == "applet": @@ -344,7 +391,7 @@ def readSkin(screen, skin, name, desktop): if type == "onLayoutFinish": screen.onLayoutFinish.append(code) else: - raise str("applet type '%s' unknown!" % type) + raise SkinError("applet type '%s' unknown!" % type) continue @@ -358,10 +405,10 @@ def readSkin(screen, skin, name, desktop): elif widget.tagName == "ePixmap": w.widget = ePixmap else: - raise str("unsupported stuff : %s" % widget.tagName) + raise SkinError("unsupported stuff : %s" % widget.tagName) w.skinAttributes = [ ] - collectAttributes(w.skinAttributes, widget, skin_path_prefix) + collectAttributes(w.skinAttributes, widget, skin_path_prefix, ignore=['name']) # applyAttributes(guiObject, widget, desktop) # guiObject.thisown = 0