add service position converter

[enigma2.git] / lib / python / Components / FileList.py

diff --git a/lib/python/Components/FileList.py b/lib/python/Components/FileList.py
index ce1f236f4246af6f019e27daaecec840769e7ecd..a0b01b2e76aaaab41ab9fb9a8733caa2c36cfd0f 100644 (file)
--- a/lib/python/Components/FileList.py
+++ b/lib/python/Components/FileList.py
@@ -32,12 +32,12 @@ EXTENSIONS = {
 
 def FileEntryComponent(name, absolute = None, isDir = False):
        res = [ (absolute, isDir) ]
-       res.append((eListboxPythonMultiContent.TYPE_TEXT, 35, 1, 200, 20, 0, RT_HALIGN_LEFT, name))
+       res.append((eListboxPythonMultiContent.TYPE_TEXT, 35, 1, 470, 20, 0, RT_HALIGN_LEFT, name))
        if isDir:
                png = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "extensions/directory.png"))
        else:
                extension = name.split('.')
-               extension = extension[-1]
+               extension = extension[-1].lower()
                if EXTENSIONS.has_key(extension):
                        png = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "extensions/" + EXTENSIONS[extension] + ".png"))
                else:
@@ -89,13 +89,15 @@ class FileList(MenuList, HTMLComponent, GUIComponent):
                                else:
                                        files.append(s)
                                print s.getName(), s.flags
+                       directories.sort()
+                       files.sort()
                else:
                        files = os.listdir(directory)
                        files.sort()
                        tmpfiles = files[:]
                        for x in tmpfiles:
                                if os.path.isdir(directory + x):
-                                       directories.append(x)
+                                       directories.append(directory + x + "/")
                                        files.remove(x)
                
                if directory != "/" and self.showDirectories and not self.isTop: