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 remove/add partition interface for external applications not using autofs
[enigma2.git]
/
skin.py
diff --git
a/skin.py
b/skin.py
index 011110a293300b6f2c20d20d43b392fedb19c651..c8805f01d74b8703c97ab2f6f667826bded5db87 100644
(file)
--- a/
skin.py
+++ b/
skin.py
@@
-14,8
+14,6
@@
from Tools.Directories import resolveFilename, SCOPE_SKIN, SCOPE_SKIN_IMAGE, SCO
from Tools.Import import my_import
from Tools.LoadPixmap import LoadPixmap
from Tools.Import import my_import
from Tools.LoadPixmap import LoadPixmap
-from Tools.XMLTools import mergeText
-
colorNames = dict()
def dump(x, i=0):
colorNames = dict()
def dump(x, i=0):
@@
-474,13
+472,12
@@
def readSkin(screen, skin, names, desktop):
ctype = converter.get('type')
assert ctype, "'convert'-tag needs a 'type'-attribute"
#print "Converter:", ctype
ctype = converter.get('type')
assert ctype, "'convert'-tag needs a 'type'-attribute"
#print "Converter:", ctype
- #parms = mergeText(converter.childNodes).strip()
try:
parms = converter.text.strip()
except:
parms = ""
try:
parms = converter.text.strip()
except:
parms = ""
- #print "Params:",
ctype
- converter_class = my_import('.'.join(
["Components", "Converter", ctype]
)).__dict__.get(ctype)
+ #print "Params:",
parms
+ converter_class = my_import('.'.join(
("Components", "Converter", ctype)
)).__dict__.get(ctype)
c = None
c = None
@@
-497,7
+494,7
@@
def readSkin(screen, skin, names, desktop):
source = c
source = c
- renderer_class = my_import('.'.join(
["Components", "Renderer", wrender]
)).__dict__.get(wrender)
+ renderer_class = my_import('.'.join(
("Components", "Renderer", wrender)
)).__dict__.get(wrender)
renderer = renderer_class() # instantiate renderer
renderer = renderer_class() # instantiate renderer