minimum backward seek is 16X

[enigma2.git] / skin.py

diff --git a/skin.py b/skin.py
index c6d0678a142691d0419e9d3467389964458aa161..922b3d7e71af9986e64f4c9988344cd2636bc6e2 100644 (file)
--- a/skin.py
+++ b/skin.py
@@ -14,13 +14,10 @@ def dump(x, i=0):
        except:
                None
 
+from Tools.Directories import resolveFilename, SCOPE_SKIN
+
 # read the skin
-try:
-       # first we search in the current path
-       skinfile = file('data/skin.xml', 'r')
-except:
-       # if not found in the current path, we use the global datadir-path
-       skinfile = file('/usr/share/enigma2/skin.xml', 'r')
+skinfile = file(resolveFilename(SCOPE_SKIN, 'skin.xml'), 'r')
 dom = xml.dom.minidom.parseString(skinfile.read())
 skinfile.close()
 
@@ -136,6 +133,8 @@ def applySingleAttribute(guiObject, desktop, attrib, value):
                                        "showAlways": guiObject.showAlways,
                                        "showNever": guiObject.showNever
                                }[value])
+               elif attrib == "enableWrapAround":
+                       guiObject.setWrapAround(True)
                elif attrib != 'name':
                        print "unsupported attribute " + attrib + "=" + value
        except int:
@@ -206,7 +205,6 @@ def readSkin(screen, skin, name, desktop):
        
        if myscreen is None:
                # try embedded skin
-               print screen.__dict__
                if "parsedSkin" in screen.__dict__:
                        myscreen = screen.parsedSkin
                elif "skin" in screen.__dict__: