X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/9c97024858a8888b7fc3679f32222090622c2948..f78de26900d5d14c363984ff3c21952f4093a9a7:/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 05a19fc2..d2b19719 100644
--- 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,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="Let's you view/edit files in your Dreambox", where = PluginDescriptor.WHERE_PLUGINMENU, fnc=main),
+			PluginDescriptor(name="File-Manager", description="Let's you view/edit files in your Dreambox", where = PluginDescriptor.WHERE_EXTENSIONSMENU, fnc=main)]