git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
replace old screwed stone skin with Screwed Stone II (thx to nemesis)
[enigma2.git]
/
skin.py
diff --git
a/skin.py
b/skin.py
index 3b448127c59a038dc72a2fb93583c0aa74123342..13d56cf1b4ac1c29d76fa5444dc2447085e48f08 100644
(file)
--- a/
skin.py
+++ b/
skin.py
@@
-286,9
+286,15
@@
def lookupScreen(name):
return None, None
def readSkin(screen, skin, name, desktop):
return None, None
def readSkin(screen, skin, name, desktop):
-
- myscreen, path = lookupScreen(name)
-
+ if not isinstance(name, list):
+ name = [name]
+
+ # try all skins, first existing one have priority
+ for n in name:
+ myscreen, path = lookupScreen(n)
+ if myscreen is not None:
+ break
+
# otherwise try embedded skin
myscreen = myscreen or getattr(screen, "parsedSkin", None)
# otherwise try embedded skin
myscreen = myscreen or getattr(screen, "parsedSkin", None)
@@
-296,7
+302,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 '" +
name
+ "' found!"
+ assert myscreen is not None, "no skin for screen '" +
repr(name)
+ "' found!"
screen.skinAttributes = [ ]
screen.skinAttributes = [ ]