avswitch: reset video mode only when it has changed

[enigma2.git] / skin.py

diff --git a/skin.py b/skin.py
index 520780e6c2aef4d3e5fc5673af71d25ae664cd71..e7c84c424bf1badad3db0671a0dda6d859fb4162 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()
 
@@ -126,6 +123,18 @@ def applySingleAttribute(guiObject, desktop, attrib, value):
                        guiObject.setSelectionEnable(0)
                elif attrib == "transparent":
                        guiObject.setTransparent(int(value))
+               elif attrib == "borderColor":
+                       guiObject.setBorderColor(parseColor(value))
+               elif attrib == "borderWidth":
+                       guiObject.setBorderWidth(int(value))
+               elif attrib == "scrollbarMode":
+                       guiObject.setScrollbarMode(
+                               { "showOnDemand": guiObject.showOnDemand,
+                                       "showAlways": guiObject.showAlways,
+                                       "showNever": guiObject.showNever
+                               }[value])
+               elif attrib == "enableWrapAround":
+                       guiObject.setWrapAround(True)
                elif attrib != 'name':
                        print "unsupported attribute " + attrib + "=" + value
        except int:
@@ -155,7 +164,7 @@ def loadSkin(desktop):
        for windowstyle in elementsWithTag(skin.childNodes, "windowstyle"):
                style = eWindowStyleSkinned()
                
-               style.setTitleFont(gFont("Arial", 20));
+               style.setTitleFont(gFont("Regular", 20));
                style.setTitleOffset(eSize(20, 5));
                
                for borderset in elementsWithTag(windowstyle.childNodes, "borderset"):