X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/f46f0bbfd9d9cdcd667b79904ad9ee844e2f4ba0..7b56077dd54d70a237abf8bc8c53169f39a9575e:/skin.py
diff --git a/skin.py b/skin.py
index 9de0a722..aba7fbf6 100644
--- a/skin.py
+++ b/skin.py
@@ -2,6 +2,7 @@ from enigma import *
import xml.dom.minidom
from xml.dom import EMPTY_NAMESPACE
+from Tools.XMLTools import elementsWithTag, mergeText
colorNames = dict()
@@ -31,7 +32,7 @@ dom = xml.dom.minidom.parseString(
-
+
@@ -45,11 +46,12 @@ dom = xml.dom.minidom.parseString(
-
+ """ """
+
@@ -71,13 +73,16 @@ dom = xml.dom.minidom.parseString(
+
+
+
-
-
+
+
@@ -87,7 +92,7 @@ dom = xml.dom.minidom.parseString(
-
+
@@ -95,26 +100,47 @@ dom = xml.dom.minidom.parseString(
-
+
+
+
+
- """)
+
+
+
+
+
+
+
+
+
+
+
+
+ """)
def parsePosition(str):
x, y = str.split(',')
@@ -136,7 +162,7 @@ def parseColor(str):
raise ("color '%s' must be #aarrggbb or valid named color" % (str))
return gRGB(int(str[1:], 0x10))
-def applyAttributes(guiObject, node, desktop):
+def collectAttributes(skinAttributes, node):
# walk all attributes
for p in range(node.attributes.length):
a = node.attributes.item(p)
@@ -147,63 +173,72 @@ def applyAttributes(guiObject, node, desktop):
# TODO: localization? as in e1?
value = str(a.value)
- # and set attributes
- try:
- if attrib == 'position':
- guiObject.move(parsePosition(value))
- elif attrib == 'size':
- guiObject.resize(parseSize(value))
- elif attrib == 'title':
- guiObject.setTitle(value)
- elif attrib == 'text':
- guiObject.setText(value)
- elif attrib == 'font':
- guiObject.setFont(parseFont(value))
- elif attrib == "pixmap":
- ptr = gPixmapPtr()
- if loadPNG(ptr, value):
- raise "loading PNG failed!"
- x = ptr
- ptr = ptr.__deref__()
- print desktop
- desktop.makeCompatiblePixmap(ptr)
- guiObject.setPixmap(ptr)
-# guiObject.setPixmapFromFile(value)
- elif attrib == "valign":
- try:
- guiObject.setVAlign(
- { "top": guiObject.alignTop,
- "center": guiObject.alignCenter,
- "bottom": guiObject.alignBottom
- }[value])
- except KeyError:
- print "valign must be either top, center or bottom!"
- elif attrib == "halign":
+ skinAttributes.append((attrib, value))
+
+def applySingleAttribute(guiObject, desktop, attrib, value):
+ # and set attributes
+ try:
+ if attrib == 'position':
+ guiObject.move(parsePosition(value))
+ elif attrib == 'size':
+ guiObject.resize(parseSize(value))
+ elif attrib == 'title':
+ guiObject.setTitle(value)
+ elif attrib == 'text':
+ guiObject.setText(value)
+ elif attrib == 'font':
+ guiObject.setFont(parseFont(value))
+ elif attrib == "pixmap":
+ ptr = gPixmapPtr()
+ if loadPNG(ptr, value):
+ raise "loading PNG failed!"
+ x = ptr
+ ptr = ptr.__deref__()
+ desktop.makeCompatiblePixmap(ptr)
+ guiObject.setPixmap(ptr)
+ # guiObject.setPixmapFromFile(value)
+ elif attrib == "valign":
+ try:
+ guiObject.setVAlign(
+ { "top": guiObject.alignTop,
+ "center": guiObject.alignCenter,
+ "bottom": guiObject.alignBottom
+ }[value])
+ except KeyError:
+ print "valign must be either top, center or bottom!"
+ elif attrib == "halign":
+ try:
+ guiObject.setHAlign(
+ { "left": guiObject.alignLeft,
+ "center": guiObject.alignCenter,
+ "right": guiObject.alignRight,
+ "block": guiObject.alignBlock
+ }[value])
+ except KeyError:
+ print "halign must be either left, center, right or block!"
+ elif attrib == "flags":
+ flags = value.split(',')
+ for f in flags:
try:
- guiObject.setHAlign(
- { "left": guiObject.alignLeft,
- "center": guiObject.alignCenter,
- "right": guiObject.alignRight,
- "block": guiObject.alignBlock
- }[value])
+ fv = eWindow.__dict__[f]
+ guiObject.setFlag(fv)
except KeyError:
- print "halign must be either left, center, right or block!"
- elif attrib == "flags":
- flags = value.split(',')
- for f in flags:
- try:
- fv = eWindow.__dict__[f]
- guiObject.setFlag(fv)
- except KeyError:
- print "illegal flag %s!" % f
- elif attrib == "backgroundColor":
- guiObject.setBackgroundColor(parseColor(value))
- elif attrib != 'name':
- print "unsupported attribute " + attrib + "=" + value
- except AttributeError:
- print "widget %s (%s) doesn't support attribute %s!" % ("", guiObject.__class__.__name__, attrib)
+ print "illegal flag %s!" % f
+ elif attrib == "backgroundColor":
+ guiObject.setBackgroundColor(parseColor(value))
+ elif attrib == "foregroundColor":
+ guiObject.setForegroundColor(parseColor(value))
+ elif attrib != 'name':
+ print "unsupported attribute " + attrib + "=" + value
+ except int:
+# AttributeError:
+ print "widget %s (%s) doesn't support attribute %s!" % ("", guiObject.__class__.__name__, attrib)
-def loadSkin():
+def applyAllAttributes(guiObject, desktop, attributes):
+ for (attrib, value) in attributes:
+ applySingleAttribute(guiObject, desktop, attrib, value)
+
+def loadSkin(desktop):
print "loading skin..."
def getPNG(x):
@@ -234,7 +269,11 @@ def loadSkin():
bpName = str(pixmap.getAttribute("pos"))
filename = str(pixmap.getAttribute("filename"))
- style.setPixmap(eWindowStyleSkinned.__dict__[bsName], eWindowStyleSkinned.__dict__[bpName], getPNG(filename))
+ png = getPNG(filename)
+
+ # adapt palette
+ desktop.makeCompatiblePixmap(png)
+ style.setPixmap(eWindowStyleSkinned.__dict__[bsName], eWindowStyleSkinned.__dict__[bpName], png)
for color in elementsWithTag(windowstyle.childNodes, "color"):
type = str(color.getAttribute("name"))
@@ -249,7 +288,7 @@ def loadSkin():
eWindowStyleManager.getInstance(x)
x.setStyle(style)
-def applyGUIskin(screen, skin, name, desktop):
+def readSkin(screen, skin, name, desktop):
myscreen = None
# first, find the corresponding screen element
@@ -261,8 +300,11 @@ def applyGUIskin(screen, skin, name, desktop):
del skin
assert myscreen != None, "no skin for screen '" + name + "' found!"
+
+ screen.skinAttributes = [ ]
+ collectAttributes(screen.skinAttributes, myscreen)
- applyAttributes(screen.instance, myscreen, desktop)
+ screen.additionalWidgets = [ ]
# now walk all widgets
for widget in elementsWithTag(myscreen.childNodes, "widget"):
@@ -273,20 +315,43 @@ def applyGUIskin(screen, skin, name, desktop):
# get corresponding gui object
try:
- guiObject = screen[wname].instance
+ attributes = screen[wname].skinAttributes = [ ]
except:
raise str("component with name '" + wname + "' was not found in skin of screen '" + name + "'!")
- applyAttributes(guiObject, widget, desktop)
+ collectAttributes(attributes, widget)
# now walk additional objects
for widget in elementsWithTag(myscreen.childNodes, lambda x: x != "widget"):
+ if widget.tagName == "applet":
+ codeText = mergeText(widget.childNodes).strip()
+ type = widget.getAttribute('type')
+
+ code = compile(codeText, "skin applet", "exec")
+
+ if type == "onLayoutFinish":
+ screen.onLayoutFinish.append(code)
+ else:
+ raise str("applet type '%s' unknown!" % type)
+
+ continue
+
+ class additionalWidget:
+ pass
+
+ w = additionalWidget()
+
if widget.tagName == "eLabel":
- guiObject = eLabel(screen.instance)
+ w.widget = eLabel
elif widget.tagName == "ePixmap":
- guiObject = ePixmap(screen.instance)
+ w.widget = ePixmap
else:
raise str("unsupported stuff : %s" % widget.tagName)
- applyAttributes(guiObject, widget, desktop )
- guiObject.thisown = 0
+ w.skinAttributes = [ ]
+ collectAttributes(w.skinAttributes, widget)
+
+ # applyAttributes(guiObject, widget, desktop)
+ # guiObject.thisown = 0
+ print screen.additionalWidgets
+ screen.additionalWidgets.append(w)