add missing files for previous commit

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

diff --git a/lib/python/Components/FileList.py b/lib/python/Components/FileList.py
index d726b833a86c42786bd0345a052c436ce13ce9f2..0d8245c29320b5708bbc826ab14274345b021f17 100644 (file)
--- a/lib/python/Components/FileList.py
+++ b/lib/python/Components/FileList.py
@@ -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()
@@ -95,7 +95,7 @@ class FileList(HTMLComponent, GUIComponent, MenuList):
                        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 +134,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)