fix service type

[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 b7336457e388c9bdb2c9a661fd6fa235b9681ed4..12389813f35f14c09523fbadc895a227d4d5ec24 100644 (file)
--- a/lib/python/Plugins/Extensions/FileManager/plugin.py
+++ b/lib/python/Plugins/Extensions/FileManager/plugin.py
@@ -1,28 +1,21 @@
-from enigma import *
 from Screens.Screen import Screen
-from Screens.MessageBox import MessageBox
 from Components.ActionMap import NumberActionMap
-from Components.Label import Label
-from Components.Input import Input
-from Components.GUIComponent import *
 from Components.Pixmap import Pixmap
-from Components.FileList import FileEntryComponent, FileList
+from Components.FileList import FileList
 from Plugins.Plugin import PluginDescriptor
 
-import os
-
 class FileManager(Screen):
        skin = """
                <screen position="100,100" size="550,400" title="Test" >
                        <!--widget name="text" position="0,0" size="550,25" font="Regular;20" /-->
                        <widget name="list" position="10,0" size="190,250" scrollbarMode="showOnDemand" />
-                       <widget name="pixmap" position="200,0" size="190,250" />
+                       <widget name="pixmap" position="200,0" size="190,250" alphatest="on" />
                </screen>"""
        def __init__(self, session, args = None):
                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 +45,19 @@ 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():
-       return PluginDescriptor(name="File-Manager", description="Let's you view/edit files in your Dreambox", where = PluginDescriptor.WHERE_PLUGINMENU, fnc=main)
+def Plugins(**kwargs):
+       return [PluginDescriptor(name="File-Manager", description="Lets you view/edit files in your Dreambox", where = PluginDescriptor.WHERE_PLUGINMENU, fnc=main),
+                       PluginDescriptor(name="File-Manager", description="Lets you view/edit files in your Dreambox", where = PluginDescriptor.WHERE_EXTENSIONSMENU, fnc=main)]