diff options
| author | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2008-04-17 22:59:41 +0000 |
|---|---|---|
| committer | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2008-04-17 22:59:41 +0000 |
| commit | 8b7069d739e2c5f61277c5fd45f80fa7792cb96a (patch) | |
| tree | ce5ecae2fce174b51b02755c56afd43c1ca23d13 | |
| parent | db2fbdae678d0f024e4dab8b4b87446f43d3c80b (diff) | |
| download | enigma2-8b7069d739e2c5f61277c5fd45f80fa7792cb96a.tar.gz enigma2-8b7069d739e2c5f61277c5fd45f80fa7792cb96a.zip | |
use SCOPE_CURRENT_SKIN
| -rw-r--r-- | skin.py | 10 |
1 files changed, 4 insertions, 6 deletions
@@ -10,7 +10,7 @@ from enigma import eSize, ePoint, gFont, eWindow, eLabel, ePixmap, eWindowStyleM from Components.config import ConfigSubsection, ConfigText, config from Components.Converter.Converter import Converter from Components.Sources.Source import Source, ObsoleteSource -from Tools.Directories import resolveFilename, SCOPE_SKIN, SCOPE_SKIN_IMAGE, SCOPE_FONTS, fileExists +from Tools.Directories import resolveFilename, SCOPE_SKIN, SCOPE_SKIN_IMAGE, SCOPE_FONTS, SCOPE_CURRENT_SKIN, fileExists from Tools.Import import my_import from Tools.LoadPixmap import LoadPixmap @@ -267,11 +267,9 @@ def loadSingleSkinData(desktop, dom_skin, path_prefix): is_replacement = font.get("replacement") != "" resolved_font = resolveFilename(SCOPE_FONTS, filename, path_prefix=path_prefix) if not fileExists(resolved_font): #when font is not available look at current skin path - pos = config.skin.primary_skin.value.rfind('/') - if pos != -1: - skin_path = resolveFilename(SCOPE_SKIN, config.skin.primary_skin.value[:pos+1]+filename, path_prefix=path_prefix) - if fileExists(skin_path): - resolved_font = skin_path + skin_path = resolveFilename(SCOPE_CURRENT_SKIN, filename) + if fileExists(skin_path): + resolved_font = skin_path addFont(resolved_font, name, scale, is_replacement) #print "Font: ", resolved_font, name, scale, is_replacement |