git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add 'getEnigmaVersionString'main/enigma.cpp
[enigma2.git]
/
skin.py
diff --git
a/skin.py
b/skin.py
index 3c4b9e1f9f809709d1ac9a2fda39687f5adf5672..fc0360c54888a09f1a7713856c5a8c0208d38a91 100644
(file)
--- a/
skin.py
+++ b/
skin.py
@@
-14,9
+14,6
@@
from Tools.XMLTools import elementsWithTag, mergeText
colorNames = dict()
colorNames = dict()
-def queryColor(colorName):
- return colorNames.get(colorName)
-
def dump(x, i=0):
print " " * i + str(x)
try:
def dump(x, i=0):
print " " * i + str(x)
try:
@@
-289,12
+286,14
@@
def lookupScreen(name):
return x, path
return None, None
return x, path
return None, None
-def readSkin(screen, skin, name, desktop):
- if not isinstance(name, list):
- name = [name]
+def readSkin(screen, skin, names, desktop):
+ if not isinstance(names, list):
+ names = [names]
+
+ name = "<embedded-in-'%s'>" % screen.__class__.__name__
# try all skins, first existing one have priority
# try all skins, first existing one have priority
- for n in name:
+ for n in name
s
:
myscreen, path = lookupScreen(n)
if myscreen is not None:
# use this name for debug output
myscreen, path = lookupScreen(n)
if myscreen is not None:
# use this name for debug output
@@
-308,7
+307,7
@@
def readSkin(screen, skin, name, desktop):
if myscreen is None and getattr(screen, "skin", None):
myscreen = screen.parsedSkin = xml.dom.minidom.parseString(screen.skin).childNodes[0]
if myscreen is None and getattr(screen, "skin", None):
myscreen = screen.parsedSkin = xml.dom.minidom.parseString(screen.skin).childNodes[0]
- assert myscreen is not None, "no skin for screen '" + repr(name) + "' found!"
+ assert myscreen is not None, "no skin for screen '" + repr(name
s
) + "' found!"
screen.skinAttributes = [ ]
screen.skinAttributes = [ ]