fix 'ok' in FileManager for files a bit

[enigma2.git] / lib / python / Plugins / Extensions / FileManager / plugin.py

diff --git a/lib/python/Plugins/Extensions/FileManager/plugin.py b/lib/python/Plugins/Extensions/FileManager/plugin.py
index 05a19fc2cac3165fd63ab4cd4a1d60083bcc6af4..11f75a2b0847856d4440522deab93f73b74d114b 100644 (file)
--- a/lib/python/Plugins/Extensions/FileManager/plugin.py
+++ b/lib/python/Plugins/Extensions/FileManager/plugin.py
@@ -22,7 +22,7 @@ class FileManager(Screen):
                self.skin = FileManager.skin
                Screen.__init__(self, session)
 
-               self["list"] = FileList("/", matchingPattern = "^.*\.(png|avi|mp3|mpeg|ts)")
+               self["list"] = FileList("/", matchingPattern = "^.*\.(png|avi|mp3|mpeg|ts)", useServiceRef = True)
                self["pixmap"] = Pixmap()
                
                #self["text"] = Input("1234", maxSize=True, type=Input.NUMBER)
@@ -52,18 +52,18 @@ class FileManager(Screen):
                self["text"].right()
        
        def ok(self):
-               selection = self["list"].getSelection()
-               if selection[1] == True: # isDir
-                       self["list"].changeDir(selection[0])
+               
+               if self["list"].canDescent(): # isDir
+                       self["list"].descent()
                else:
-                       self["pixmap"].instance.setPixmapFromFile(selection[0])
+                       self["pixmap"].instance.setPixmapFromFile(self["list"].getFilename())
        
        def keyNumberGlobal(self, number):
                print "pressed", number
                self["text"].number(number)
 
-def main(session):
+def main(session, **kwargs):
        session.open(FileManager)
 
-def Plugins():
+def Plugins(**kwargs):
        return PluginDescriptor(name="File-Manager", description="Let's you view/edit files in your Dreambox", where = PluginDescriptor.WHERE_PLUGINMENU, fnc=main)