git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MenuList -> List
[enigma2.git]
/
skin.py
diff --git
a/skin.py
b/skin.py
index 21839435ab844007b95e7dd074ca1dfeedbceedc..cb433269a584459d0c8d1a5ad719ca32211bd9ef 100644
(file)
--- a/
skin.py
+++ b/
skin.py
@@
-54,7
+54,7
@@
config.skin.primary_skin = ConfigText(default = "skin.xml")
try:
loadSkin(config.skin.primary_skin.value)
try:
loadSkin(config.skin.primary_skin.value)
-except (SkinError, IOError), err:
+except (SkinError, IOError
, AssertionError
), err:
print "SKIN ERROR:", err
print "defaulting to standard skin..."
loadSkin('skin.xml')
print "SKIN ERROR:", err
print "defaulting to standard skin..."
loadSkin('skin.xml')
@@
-119,9
+119,8
@@
def applySingleAttribute(guiObject, desktop, attrib, value):
guiObject.setZPosition(int(value))
elif attrib == "pixmap":
ptr = loadPixmap(value) # this should already have been filename-resolved.
guiObject.setZPosition(int(value))
elif attrib == "pixmap":
ptr = loadPixmap(value) # this should already have been filename-resolved.
- # that __deref__ still scares me!
- desktop.makeCompatiblePixmap(ptr.__deref__())
- guiObject.setPixmap(ptr.__deref__())
+ desktop.makeCompatiblePixmap(ptr)
+ guiObject.setPixmap(ptr)
# guiObject.setPixmapFromFile(value)
elif attrib == "alphatest": # used by ePixmap
guiObject.setAlphatest(
# guiObject.setPixmapFromFile(value)
elif attrib == "alphatest": # used by ePixmap
guiObject.setAlphatest(
@@
-189,8
+188,8
@@
def applySingleAttribute(guiObject, desktop, attrib, value):
(name, pos) = value.split(':')
pos = parsePosition(pos)
ptr = loadPixmap(name)
(name, pos) = value.split(':')
pos = parsePosition(pos)
ptr = loadPixmap(name)
- desktop.makeCompatiblePixmap(ptr
.__deref__()
)
- guiObject.setPointer({"pointer": 0, "seek_pointer": 1}[attrib], ptr
.__deref__()
, pos)
+ desktop.makeCompatiblePixmap(ptr)
+ guiObject.setPointer({"pointer": 0, "seek_pointer": 1}[attrib], ptr, pos)
elif attrib == 'shadowOffset':
guiObject.setShadowOffset(parsePosition(value))
elif attrib == 'noWrap':
elif attrib == 'shadowOffset':
guiObject.setShadowOffset(parsePosition(value))
elif attrib == 'noWrap':
@@
-253,8
+252,8
@@
def loadSingleSkinData(desktop, dom_skin, path_prefix):
png = loadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, filename, path_prefix=path_prefix))
# adapt palette
png = loadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, filename, path_prefix=path_prefix))
# adapt palette
- desktop.makeCompatiblePixmap(png
.__deref__()
)
- style.setPixmap(eWindowStyleSkinned.__dict__[bsName], eWindowStyleSkinned.__dict__[bpName], png
.__deref__()
)
+ desktop.makeCompatiblePixmap(png)
+ style.setPixmap(eWindowStyleSkinned.__dict__[bsName], eWindowStyleSkinned.__dict__[bpName], png)
for color in elementsWithTag(windowstyle.childNodes, "color"):
type = str(color.getAttribute("name"))
for color in elementsWithTag(windowstyle.childNodes, "color"):
type = str(color.getAttribute("name"))