git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make some methods public
[enigma2.git]
/
skin.py
diff --git
a/skin.py
b/skin.py
index 8789e877cac291941b2a140f8d60effe0dc05d23..a7824f918b011a358fcd727490ad22a9344d59ab 100644
(file)
--- a/
skin.py
+++ b/
skin.py
@@
-237,7
+237,7
@@
def loadSingleSkinData(desktop, skin, path_prefix):
id = 0
if id == 0: # framebuffer
for res in c.findall("resolution"):
id = 0
if id == 0: # framebuffer
for res in c.findall("resolution"):
- get_attr =
c
.attrib.get
+ get_attr =
res
.attrib.get
xres = get_attr("xres")
if xres:
xres = int(xres)
xres = get_attr("xres")
if xres:
xres = int(xres)
@@
-256,6
+256,7
@@
def loadSingleSkinData(desktop, skin, path_prefix):
#print "Resolution:", xres,yres,bpp
from enigma import gFBDC
gFBDC.getInstance().setResolution(xres, yres)
#print "Resolution:", xres,yres,bpp
from enigma import gFBDC
gFBDC.getInstance().setResolution(xres, yres)
+ desktop.resize(eSize(xres, yres))
if bpp != 32:
# load palette (not yet implemented)
pass
if bpp != 32:
# load palette (not yet implemented)
pass
@@
-370,7
+371,8
@@
def readSkin(screen, skin, names, desktop):
break
# otherwise try embedded skin
break
# otherwise try embedded skin
- myscreen = myscreen or getattr(screen, "parsedSkin", None)
+ if myscreen is None:
+ myscreen = getattr(screen, "parsedSkin", None)
# try uncompiled embedded skin
if myscreen is None and getattr(screen, "skin", None):
# try uncompiled embedded skin
if myscreen is None and getattr(screen, "skin", None):