projects
/
vuplus_dvbapp
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3e46901
)
experimental: add possibility to add user skins in /etc/enigma2/skin_user.xml
author
Felix Domke
<tmbinc@elitedvb.net>
Mon, 16 Feb 2009 00:01:57 +0000
(
01:01
+0100)
committer
Felix Domke
<tmbinc@elitedvb.net>
Mon, 16 Feb 2009 00:01:57 +0000
(
01:01
+0100)
skin.py
patch
|
blob
|
history
diff --git
a/skin.py
b/skin.py
index
c8805f0
..
6baf6b7
100644
(file)
--- a/
skin.py
+++ b/
skin.py
@@
-10,7
+10,7
@@
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
@@
-33,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()))
@@
-55,6
+55,11
@@
config.skin.primary_skin = ConfigText(default = "skin.xml")
profile("LoadSkin")
try:
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:
print "SKIN ERROR:", err
loadSkin(config.skin.primary_skin.value)
except (SkinError, IOError, AssertionError), err:
print "SKIN ERROR:", err