use Tools.Directories to access the flag-images

diff --git a/lib/python/Components/LanguageList.py b/lib/python/Components/LanguageList.py
index 82b13eeb64008c176e07b6b56829e7e36386f7a6..8072121ea0650f8ec70518594d7124026d235c17 100644 (file)
--- a/lib/python/Components/LanguageList.py
+++ b/lib/python/Components/LanguageList.py
@@ -3,6 +3,8 @@ from GUIComponent import *
 
 from MenuList import MenuList
 
 
 from MenuList import MenuList
 

+from Tools.Directories import *
+

 from enigma import *
 
 RT_HALIGN_LEFT = 0
 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))
 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:
        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
        res.append((0, 5, 60, 40, png))
        
        return res

diff --git a/lib/python/Tools/Directories.py b/lib/python/Tools/Directories.py
index 1df24fcb08f16077a8795f9c4f3001fab5d184d8..187d3edf7d93b2567c9cf82a3b3f8cd39160f62a 100644 (file)
--- 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_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
        }
                
                SCOPE_USERETC: ("", PATH_DONTCREATE) # user home directory
        }