git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed comparison between signed and unsigned integer
[enigma2.git]
/
skin.py
diff --git
a/skin.py
b/skin.py
index 27fc7d5d4b461a08abe9e3a65d0ef32a48739d4c..58426c0f18f052332f78b1da24a7318bcde92ba6 100644
(file)
--- a/
skin.py
+++ b/
skin.py
@@
-14,13
+14,10
@@
def dump(x, i=0):
except:
None
except:
None
+from Tools.Directories import resolveFilename, SCOPE_SKIN
+
# read the 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()
dom = xml.dom.minidom.parseString(skinfile.read())
skinfile.close()
@@
-130,6
+127,12
@@
def applySingleAttribute(guiObject, desktop, attrib, value):
guiObject.setBorderColor(parseColor(value))
elif attrib == "borderWidth":
guiObject.setBorderWidth(int(value))
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 != 'name':
print "unsupported attribute " + attrib + "=" + value
except int:
elif attrib != 'name':
print "unsupported attribute " + attrib + "=" + value
except int:
@@
-159,7
+162,7
@@
def loadSkin(desktop):
for windowstyle in elementsWithTag(skin.childNodes, "windowstyle"):
style = eWindowStyleSkinned()
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"):
style.setTitleOffset(eSize(20, 5));
for borderset in elementsWithTag(windowstyle.childNodes, "borderset"):