git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove faulty debug print
[enigma2.git]
/
skin.py
diff --git
a/skin.py
b/skin.py
index 3497cc115f12d517a4c68857ea06c14e5f25bd72..a4d43f24af90606188c6b1b7ee8ebe379dc89ee9 100644
(file)
--- a/
skin.py
+++ b/
skin.py
@@
-14,13
+14,11
@@
def dump(x, i=0):
except:
None
except:
None
-from Tools.Directories import resolveFilename, SCOPE_SKIN
+from Tools.Directories import resolveFilename, SCOPE_SKIN
, SCOPE_SKIN_IMAGE
# read the skin
# read the skin
-skinfile = file(resolveFilename(SCOPE_SKIN, 'skin.xml'), 'r')
-dom = xml.dom.minidom.parseString(skinfile.read())
-skinfile.close()
-
+dom_skin = xml.dom.minidom.parse(resolveFilename(SCOPE_SKIN, 'skin.xml'))
+dom_skin_default = xml.dom.minidom.parse(resolveFilename(SCOPE_SKIN, 'skin_default.xml'))
def parsePosition(str):
x, y = str.split(',')
def parsePosition(str):
x, y = str.split(',')
@@
-71,7
+69,7
@@
def applySingleAttribute(guiObject, desktop, attrib, value):
elif attrib == 'zPosition':
guiObject.setZPosition(int(value))
elif attrib == "pixmap":
elif attrib == 'zPosition':
guiObject.setZPosition(int(value))
elif attrib == "pixmap":
- ptr = loadPNG(
value
)
+ ptr = loadPNG(
resolveFilename(SCOPE_SKIN_IMAGE, value)
)
# that __deref__ still scares me!
desktop.makeCompatiblePixmap(ptr.__deref__())
guiObject.setPixmap(ptr.__deref__())
# that __deref__ still scares me!
desktop.makeCompatiblePixmap(ptr.__deref__())
guiObject.setPixmap(ptr.__deref__())
@@
-139,7
+137,7
@@
def applySingleAttribute(guiObject, desktop, attrib, value):
elif attrib == "pointer":
(name, pos) = value.split(':')
pos = parsePosition(pos)
elif attrib == "pointer":
(name, pos) = value.split(':')
pos = parsePosition(pos)
- ptr = loadPNG(
name
)
+ ptr = loadPNG(
resolveFilename(SCOPE_SKIN_IMAGE, name)
)
desktop.makeCompatiblePixmap(ptr.__deref__())
guiObject.setPointer(ptr.__deref__(), pos)
elif attrib != 'name':
desktop.makeCompatiblePixmap(ptr.__deref__())
guiObject.setPointer(ptr.__deref__(), pos)
elif attrib != 'name':
@@
-155,7
+153,7
@@
def applyAllAttributes(guiObject, desktop, attributes):
def loadSkin(desktop):
print "loading skin..."
def loadSkin(desktop):
print "loading skin..."
- skin = dom.childNodes[0]
+ skin = dom
_skin
.childNodes[0]
assert skin.tagName == "skin", "root element in skin must be 'skin'!"
for c in elementsWithTag(skin.childNodes, "colors"):
assert skin.tagName == "skin", "root element in skin must be 'skin'!"
for c in elementsWithTag(skin.childNodes, "colors"):
@@
-180,7
+178,7
@@
def loadSkin(desktop):
bpName = str(pixmap.getAttribute("pos"))
filename = str(pixmap.getAttribute("filename"))
bpName = str(pixmap.getAttribute("pos"))
filename = str(pixmap.getAttribute("filename"))
- png = loadPNG(
filename
)
+ png = loadPNG(
resolveFilename(SCOPE_SKIN_IMAGE, filename)
)
# adapt palette
desktop.makeCompatiblePixmap(png.__deref__())
# adapt palette
desktop.makeCompatiblePixmap(png.__deref__())
@@
-203,14
+201,24
@@
def readSkin(screen, skin, name, desktop):
myscreen = None
# first, find the corresponding screen element
myscreen = None
# first, find the corresponding screen element
- skin = dom.childNodes[0]
+ skin = dom_skin.childNodes[0]
+ skin_default = dom_skin_default.childNodes[0]
for x in elementsWithTag(skin.childNodes, "screen"):
if x.getAttribute('name') == name:
myscreen = x
for x in elementsWithTag(skin.childNodes, "screen"):
if x.getAttribute('name') == name:
myscreen = x
- del skin
+ break
+
+ # if not found, check default skin
+ if myscreen is None:
+ for x in elementsWithTag(skin_default.childNodes, "screen"):
+ if x.getAttribute('name') == name:
+ myscreen = x
+ break
+
+ del skin, skin_default
- # try embedded skin
+ #
otherwise
try embedded skin
myscreen = myscreen or getattr(screen, "parsedSkin", None)
# try uncompiled embedded skin
myscreen = myscreen or getattr(screen, "parsedSkin", None)
# try uncompiled embedded skin