use number keys for predefined pip positions

[enigma2.git] / lib / python / Screens / PluginBrowser.py

diff --git a/lib/python/Screens/PluginBrowser.py b/lib/python/Screens/PluginBrowser.py
index 67aac07656906a6d853edc200a63990f24e52512..afc283d524301c4a99f630ab27e984f1cbc27f8a 100644 (file)
--- a/lib/python/Screens/PluginBrowser.py
+++ b/lib/python/Screens/PluginBrowser.py
@@ -1,6 +1,6 @@
 from Screen import Screen
 
-from enigma import eConsoleAppContainer
+from enigma import eConsoleAppContainer, loadPNG
 
 from Components.MenuList import MenuList
 from Components.ActionMap import ActionMap
@@ -11,12 +11,13 @@ from Components.Label import Label
 from Screens.MessageBox import MessageBox
 from Screens.Console import Console
 from Plugins.Plugin import PluginDescriptor
+from Tools.Directories import resolveFilename, SCOPE_PLUGINS, SCOPE_SKIN_IMAGE
 
 class PluginBrowser(Screen):
        def __init__(self, session):
                Screen.__init__(self, session)
                
-               self["red"] = Label(_("Delete"))
+               self["red"] = Label(_("Remove Plugins"))
                self["green"] = Label(_("Download Plugins"))
                
                self.list = []
@@ -49,25 +50,35 @@ class PluginBrowser(Screen):
                self["list"].l.setList(self.list)
 
        def delete(self):
-               pass
+               self.session.openWithCallback(self.updateList, PluginDownloadBrowser, PluginDownloadBrowser.REMOVE)
        
        def download(self):
-               self.session.open(PluginDownloadBrowser)
+               self.session.openWithCallback(self.updateList, PluginDownloadBrowser, PluginDownloadBrowser.DOWNLOAD)
 
 class PluginDownloadBrowser(Screen):
-       def __init__(self, session):
+       DOWNLOAD = 0
+       REMOVE = 1
+       
+       def __init__(self, session, type):
                Screen.__init__(self, session)
                
+               self.type = type
+               
                self.container = eConsoleAppContainer()
                self.container.appClosed.get().append(self.runFinished)
                self.container.dataAvail.get().append(self.dataAvail)
                self.onLayoutFinish.append(self.startRun)
+               self.onShown.append(self.setWindowTitle)
                
                self.list = []
                self["list"] = PluginList(self.list)
                self.pluginlist = []
+               self.expanded = []
                
-               self["text"] = Label(_("Downloading plugin information. Please wait..."))
+               if self.type == self.DOWNLOAD:
+                       self["text"] = Label(_("Downloading plugin information. Please wait..."))
+               elif self.type == self.REMOVE:
+                       self["text"] = Label(_("Getting plugin information. Please wait..."))
                
                self.run = 0
                                
@@ -78,21 +89,48 @@ class PluginDownloadBrowser(Screen):
                })
                
        def go(self):
-               print "plugin: installing:", self.pluginlist[self["list"].l.getCurrentSelectionIndex()]
-               self.session.openWithCallback(self.runInstall, MessageBox, _("Do you really want to download\nthe plugin \"" + self.pluginlist[self["list"].l.getCurrentSelectionIndex()][3] + "\"?"))
-               
+               if type(self["list"].l.getCurrentSelection()[0]) is str: # category
+                       if self["list"].l.getCurrentSelection()[0] in self.expanded:
+                               self.expanded.remove(self["list"].l.getCurrentSelection()[0])
+                       else:
+                               self.expanded.append(self["list"].l.getCurrentSelection()[0])
+                       self.updateList()
+               else:
+                       if self.type == self.DOWNLOAD:
+                               self.session.openWithCallback(self.runInstall, MessageBox, _("Do you really want to download\nthe plugin \"" + self["list"].l.getCurrentSelection()[0].name + "\"?"))
+                       elif self.type == self.REMOVE:
+                               self.session.openWithCallback(self.runInstall, MessageBox, _("Do you really want to REMOVE\nthe plugin \"" + self["list"].l.getCurrentSelection()[0].name + "\"?"))
+
        def runInstall(self, val):
                if val:
-                       self.session.open(Console, ["ipkg install " + self.pluginlist[self["list"].l.getCurrentSelectionIndex()][0]])
+                       if self.type == self.DOWNLOAD:
+                               self.session.openWithCallback(self.installFinished, Console, cmdlist = ["ipkg install " + "enigma2-plugin-" + self["list"].l.getCurrentSelection()[0].name])
+                       elif self.type == self.REMOVE:
+                               self.session.openWithCallback(self.installFinished, Console, cmdlist = ["ipkg remove " + "enigma2-plugin-" + self["list"].l.getCurrentSelection()[0].name])
+
+       def setWindowTitle(self):
+               if self.type == self.DOWNLOAD:
+                       self.setTitle(_("Downloadable new plugins"))
+               elif self.type == self.REMOVE:
+                       self.setTitle(_("Remove plugins"))
 
        def startRun(self):
                self["list"].instance.hide()
-               self.container.execute("ipkg update")
+               if self.type == self.DOWNLOAD:
+                       self.container.execute("ipkg update")
+               elif self.type == self.REMOVE:
+                       self.run = 1
+                       self.container.execute("ipkg list_installed enigma2-plugin-*")
+               
+       def installFinished(self):
+               plugins.readPluginList(resolveFilename(SCOPE_PLUGINS))
+               self.close()
                
        def runFinished(self, retval):
                if self.run == 0:
                        self.run = 1
-                       self.container.execute("ipkg list enigma2-plugin-*")
+                       if self.type == self.DOWNLOAD:
+                               self.container.execute("ipkg list enigma2-plugin-*")
                else:
                        if len(self.pluginlist) > 0:
                                self.updateList()
@@ -109,9 +147,27 @@ class PluginDownloadBrowser(Screen):
                                self.pluginlist.append(plugin)
        
        def updateList(self):
-               for x in self.pluginlist:
-                       plugin = PluginDescriptor(name = x[3], description = x[2])
-                       self.list.append(PluginEntryComponent(plugin))
+               self.list = []
+               expandableIcon = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "expandable-plugins.png"))
+               expandedIcon = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "expanded-plugins.png"))
+               verticallineIcon = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "verticalline-plugins.png"))
                
+               self.plugins = {}
+               for x in self.pluginlist:
+                       split = x[3].split('-')
+                       if len(split) < 2:
+                               continue
+                       if not self.plugins.has_key(split[0]):
+                               self.plugins[split[0]] = []
+                               
+                       self.plugins[split[0]].append((PluginDescriptor(name = x[3], description = x[2], icon = verticallineIcon), split[1]))
+                       
+               for x in self.plugins.keys():
+                       if x in self.expanded:
+                               self.list.append(PluginCategoryComponent(x, expandedIcon))
+                               for plugin in self.plugins[x]:
+                                       self.list.append(PluginDownloadComponent(plugin[0], plugin[1]))
+                       else:
+                               self.list.append(PluginCategoryComponent(x, expandableIcon))
                self["list"].l.setList(self.list)