projects
/
vuplus_dvbapp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
FactoryTest : fix Front test,ok key and add MSG in RS232test
[vuplus_dvbapp]
/
skin.py
diff --git
a/skin.py
b/skin.py
index
a20f3eb
..
19da203
100755
(executable)
--- a/
skin.py
+++ b/
skin.py
@@
-284,8
+284,8
@@
def loadSingleSkinData(desktop, skin, path_prefix):
else:
bpp = 32
#print "Resolution:", xres,yres,bpp
else:
bpp = 32
#print "Resolution:", xres,yres,bpp
- from enigma import g
FB
DC
- g
FB
DC.getInstance().setResolution(xres, yres)
+ from enigma import g
Main
DC
+ g
Main
DC.getInstance().setResolution(xres, yres)
desktop.resize(eSize(xres, yres))
if bpp != 32:
# load palette (not yet implemented)
desktop.resize(eSize(xres, yres))
if bpp != 32:
# load palette (not yet implemented)
@@
-402,10
+402,10
@@
def lookupScreen(name, style_id):
# first, find the corresponding screen element
for x in skin.findall("screen"):
if x.attrib.get('name', '') == name:
# first, find the corresponding screen element
for x in skin.findall("screen"):
if x.attrib.get('name', '') == name:
- screen_style_id = x.attrib.get('id',
None
)
- if screen_style_id
is None
and name.find('ummary') > 0:
- screen_style_id =
1
- if
screen_style_id is None
or int(screen_style_id) == style_id:
+ screen_style_id = x.attrib.get('id',
'-1'
)
+ if screen_style_id
== '-1'
and name.find('ummary') > 0:
+ screen_style_id =
'1'
+ if
(style_id != 2 and int(screen_style_id) == -1)
or int(screen_style_id) == style_id:
return x, path
return None, None
return x, path
return None, None
@@
-440,9
+440,10
@@
def readSkin(screen, skin, names, desktop):
skin_tuple = (skin_tuple,)
for sskin in skin_tuple:
parsedSkin = xml.etree.cElementTree.fromstring(sskin)
skin_tuple = (skin_tuple,)
for sskin in skin_tuple:
parsedSkin = xml.etree.cElementTree.fromstring(sskin)
- screen_style_id = parsedSkin.attrib.get('id',
None
)
- if
style_id != 2 or screen_style_id is None
or int(screen_style_id) == style_id:
+ screen_style_id = parsedSkin.attrib.get('id',
'-1'
)
+ if
(style_id != 2 and int(screen_style_id) == -1)
or int(screen_style_id) == style_id:
myscreen = screen.parsedSkin = parsedSkin
myscreen = screen.parsedSkin = parsedSkin
+ break
#assert myscreen is not None, "no skin for screen '" + repr(names) + "' found!"
if myscreen is None:
#assert myscreen is not None, "no skin for screen '" + repr(names) + "' found!"
if myscreen is None: