From: Stefan Pluecken <stefan.pluecken@multimedia-labs.de>
Date: Sun, 11 Dec 2005 02:59:31 +0000 (+0000)
Subject: use Tools.Directories to access the flag-images
X-Git-Tag: 2.6.0~4757
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/700f532b8d7fb96ec6af2ac54526f66a834623c3

use Tools.Directories to access the flag-images
---

diff --git a/lib/python/Components/LanguageList.py b/lib/python/Components/LanguageList.py
index 82b13eeb..8072121e 100644
--- a/lib/python/Components/LanguageList.py
+++ b/lib/python/Components/LanguageList.py
@@ -3,6 +3,8 @@ from GUIComponent import *
 
 from MenuList import MenuList
 
+from Tools.Directories import *
+
 from enigma import *
 
 RT_HALIGN_LEFT = 0
@@ -17,9 +19,9 @@ RT_VALIGN_BOTTOM = 16
 def LanguageEntryComponent(file, name):
 	res = [ None ]
 	res.append((70, 0, 400, 30, 0, RT_HALIGN_LEFT, name))
-	png = loadPNG("/usr/share/enigma2/countries/" + file + ".png")
+	png = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "/countries/" + file + ".png"))
 	if png == None:
-		png = loadPNG("/usr/share/enigma2/countries/missing.png")
+		png = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "/countries/missing.png"))
 	res.append((0, 5, 60, 40, png))
 	
 	return res
diff --git a/lib/python/Tools/Directories.py b/lib/python/Tools/Directories.py
index 1df24fcb..187d3edf 100644
--- a/lib/python/Tools/Directories.py
+++ b/lib/python/Tools/Directories.py
@@ -17,8 +17,8 @@ defaultPaths = {
 		SCOPE_FONTS: ("/usr/share/fonts/", PATH_DONTCREATE),
 		SCOPE_CONFIG: ("/etc/enigma2/", PATH_CREATE),
 
-		SCOPE_SKIN: ("/usr/share/tuxbox/enigma2/", PATH_DONTCREATE),
-		SCOPE_SKIN_IMAGE: ("/usr/share/tuxbox/enigma2/", PATH_DONTCREATE),
+		SCOPE_SKIN: ("/usr/share/enigma2/", PATH_DONTCREATE),
+		SCOPE_SKIN_IMAGE: ("/usr/share/enigma2/", PATH_DONTCREATE),
 		
 		SCOPE_USERETC: ("", PATH_DONTCREATE) # user home directory
 	}