X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/08fca93e7f2a37a452399d08c5c84b969b7e52af..2cc6286f24b7cde25c468b2b4a817e5fa7a9cceb:/lib/python/Components/FileList.py

diff --git a/lib/python/Components/FileList.py b/lib/python/Components/FileList.py
index d726b833..a0b01b2e 100644
--- 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)