sort files and directories in FileList

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

diff --git a/lib/python/Components/FileList.py b/lib/python/Components/FileList.py
index d726b833a86c42786bd0345a052c436ce13ce9f2..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:
@@ -47,7 +47,7 @@ def FileEntryComponent(name, absolute = None, isDir = False):
        
        return res
 
-class FileList(HTMLComponent, GUIComponent, MenuList):
+class FileList(MenuList, HTMLComponent, GUIComponent):
        def __init__(self, directory, showDirectories = True, showFiles = True, matchingPattern = None, useServiceRef = False, isTop = False):
                GUIComponent.__init__(self)
                self.l = eListboxPythonMultiContent()
@@ -89,13 +89,15 @@ class FileList(HTMLComponent, GUIComponent, MenuList):
                                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:
@@ -134,8 +136,9 @@ class FileList(HTMLComponent, GUIComponent, MenuList):
 
        def getServiceRef(self):
                return self.getSelection()[0]
-                               
-       def GUIcreate(self, parent):
-               self.instance = eListbox(parent)
-               self.instance.setContent(self.l)
-               self.instance.setItemHeight(23)
+
+       GUI_WIDGET = eListbox
+
+       def postWidgetCreate(self, instance):
+               instance.setContent(self.l)
+               instance.setItemHeight(23)