git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed compile errors with g++ 4.3 and replaced some c headers by their
[enigma2.git]
/
skin.py
diff --git
a/skin.py
b/skin.py
index 011110a293300b6f2c20d20d43b392fedb19c651..6baf6b71df836215a2b33558066287fbfab484b0 100644
(file)
--- a/
skin.py
+++ b/
skin.py
@@
-10,12
+10,10
@@
from enigma import eSize, ePoint, gFont, eWindow, eLabel, ePixmap, eWindowStyleM
from Components.config import ConfigSubsection, ConfigText, config
from Components.Converter.Converter import Converter
from Components.Sources.Source import Source, ObsoleteSource
from Components.config import ConfigSubsection, ConfigText, config
from Components.Converter.Converter import Converter
from Components.Sources.Source import Source, ObsoleteSource
-from Tools.Directories import resolveFilename, SCOPE_SKIN, SCOPE_SKIN_IMAGE, SCOPE_FONTS, SCOPE_CURRENT_SKIN, fileExists
+from Tools.Directories import resolveFilename, SCOPE_SKIN, SCOPE_SKIN_IMAGE, SCOPE_FONTS, SCOPE_CURRENT_SKIN,
SCOPE_CONFIG,
fileExists
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):
@@
-35,9
+33,9
@@
class SkinError(Exception):
dom_skins = [ ]
dom_skins = [ ]
-def loadSkin(name):
+def loadSkin(name
, scope = SCOPE_SKIN
):
# read the skin
# read the skin
- filename = resolveFilename(
SCOPE_SKIN
, name)
+ filename = resolveFilename(
scope
, name)
mpath = path.dirname(filename) + "/"
dom_skins.append((mpath, xml.etree.cElementTree.parse(filename).getroot()))
mpath = path.dirname(filename) + "/"
dom_skins.append((mpath, xml.etree.cElementTree.parse(filename).getroot()))
@@
-56,6
+54,11
@@
config.skin = ConfigSubsection()
config.skin.primary_skin = ConfigText(default = "skin.xml")
profile("LoadSkin")
config.skin.primary_skin = ConfigText(default = "skin.xml")
profile("LoadSkin")
+try:
+ loadSkin('skin_user.xml', SCOPE_CONFIG)
+except (SkinError, IOError, AssertionError), err:
+ print "not loading user skin: ", err
+
try:
loadSkin(config.skin.primary_skin.value)
except (SkinError, IOError, AssertionError), err:
try:
loadSkin(config.skin.primary_skin.value)
except (SkinError, IOError, AssertionError), err:
@@
-474,13
+477,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
+499,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