add some extension-icons

diff --git a/data/extensions/movie.png b/data/extensions/movie.png
new file mode 100644 (file)
index 0000000..532c232
Binary files /dev/null and b/data/extensions/movie.png differ

diff --git a/data/extensions/music.png b/data/extensions/music.png
new file mode 100644 (file)
index 0000000..0f630eb
Binary files /dev/null and b/data/extensions/music.png differ

diff --git a/data/extensions/picture.png b/data/extensions/picture.png
new file mode 100644 (file)
index 0000000..9eb05a5
Binary files /dev/null and b/data/extensions/picture.png differ

diff --git a/lib/python/Components/FileList.py b/lib/python/Components/FileList.py
index 66270e6..31ffc98 100644 (file)
--- a/lib/python/Components/FileList.py
+++ b/lib/python/Components/FileList.py
@@ -17,6 +17,18 @@ RT_VALIGN_TOP = 0
 RT_VALIGN_CENTER = 8
 RT_VALIGN_BOTTOM = 16
 
+EXTENSIONS = {
+               "mp3": "music",
+               "wav": "music",
+               "jpg": "picture",
+               "jpeg": "picture",
+               "png": "picture",
+               "ts": "movie",
+               "avi": "movie",
+               "mpg": "movie",
+               "mpeg": "movie",
+       }
+
 def FileEntryComponent(name, absolute, isDir = False):
        res = [ (absolute, isDir) ]
        res.append((eListboxPythonMultiContent.TYPE_TEXT, 35, 1, 200, 20, 0, RT_HALIGN_LEFT ,name))
@@ -24,7 +36,8 @@ def FileEntryComponent(name, absolute, isDir = False):
                png = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "/extensions/directory.png"))
        else:
                # FIXME: detect file extensions correctly
-               png = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "/extensions/" + name[-3:] + ".png"))
+               if EXTENSIONS.has_key(name[-3:]):
+                       png = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "/extensions/" + EXTENSIONS[name[-3:]] + ".png"))
        if png is not None:
                res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, 10, 2, 20, 20, png))
        

diff --git a/lib/python/Plugins/test/plugin.py b/lib/python/Plugins/test/plugin.py
index 668515f..18e8188 100644 (file)
--- a/lib/python/Plugins/test/plugin.py
+++ b/lib/python/Plugins/test/plugin.py
@@ -22,7 +22,7 @@ class Test(Screen):
                self.skin = Test.skin
                Screen.__init__(self, session)
 
-               self["list"] = FileList("/", matchingPattern = "^.*\.png")
+               self["list"] = FileList("/", matchingPattern = "^.*\.(png|avi|mp3)")
                self["pixmap"] = Pixmap()
                
                #self["text"] = Input("1234", maxSize=True, type=Input.NUMBER)