X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/8c2a83d6b2a60b2bd408ccdc6d5afd6da506912f..4a5818c82c71caa97447d4f91bd418a68c0bf174:/lib/python/Screens/PluginBrowser.py

diff --git a/lib/python/Screens/PluginBrowser.py b/lib/python/Screens/PluginBrowser.py
index 3b4ff116..cd17e2e0 100644
--- a/lib/python/Screens/PluginBrowser.py
+++ b/lib/python/Screens/PluginBrowser.py
@@ -51,11 +51,9 @@ class PluginBrowser(Screen):
 		plugin(session=self.session)
 		
 	def updateList(self):
-		self.list = [ ]
 		self.pluginlist = plugins.getPlugins(PluginDescriptor.WHERE_PLUGINMENU)
-		for plugin in self.pluginlist:
-			self.list.append(PluginEntryComponent(plugin))
-		
+		self.list = [PluginEntryComponent(plugin) for plugin in self.pluginlist]
+
 		self["list"].l.setList(self.list)
 
 	def delete(self):
@@ -74,8 +72,8 @@ class PluginDownloadBrowser(Screen):
 		self.type = type
 		
 		self.container = eConsoleAppContainer()
-		self.container.appClosed.get().append(self.runFinished)
-		self.container.dataAvail.get().append(self.dataAvail)
+		self.container.appClosed.append(self.runFinished)
+		self.container.dataAvail.append(self.dataAvail)
 		self.onLayoutFinish.append(self.startRun)
 		self.onShown.append(self.setWindowTitle)
 		
@@ -106,17 +104,18 @@ class PluginDownloadBrowser(Screen):
 		if sel is None:
 			return
 
-		if type(sel[0]) is str: # category
-			if sel[0] in self.expanded:
-				self.expanded.remove(sel[0])
+		sel = sel[0]
+		if isinstance(sel, str): # category
+			if sel in self.expanded:
+				self.expanded.remove(sel)
 			else:
-				self.expanded.append(sel[0])
+				self.expanded.append(sel)
 			self.updateList()
 		else:
 			if self.type == self.DOWNLOAD:
-				self.session.openWithCallback(self.runInstall, MessageBox, _("Do you really want to download\nthe plugin \"" + sel[0].name + "\"?"))
+				self.session.openWithCallback(self.runInstall, MessageBox, _("Do you really want to download\nthe plugin \"%s\"?") % sel.name)
 			elif self.type == self.REMOVE:
-				self.session.openWithCallback(self.runInstall, MessageBox, _("Do you really want to REMOVE\nthe plugin \"" + sel[0].name + "\"?"))
+				self.session.openWithCallback(self.runInstall, MessageBox, _("Do you really want to REMOVE\nthe plugin \"%s\"?") % sel.name)
 
 	def runInstall(self, val):
 		if val:
@@ -141,8 +140,8 @@ class PluginDownloadBrowser(Screen):
 		
 	def installFinished(self):
 		plugins.readPluginList(resolveFilename(SCOPE_PLUGINS))
-		self.container.appClosed.get().remove(self.runFinished)
-		self.container.dataAvail.get().remove(self.dataAvail)
+		self.container.appClosed.remove(self.runFinished)
+		self.container.dataAvail.remove(self.dataAvail)
 		self.close()
 
 	def runFinished(self, retval):
@@ -186,10 +185,10 @@ class PluginDownloadBrowser(Screen):
 						self.pluginlist.append(plugin)
 	
 	def updateList(self):
-		self.list = []
-		expandableIcon = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "expandable-plugins.png"))
-		expandedIcon = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "expanded-plugins.png"))
-		verticallineIcon = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "verticalline-plugins.png"))
+		list = []
+		expandableIcon = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/expandable-plugins.png"))
+		expandedIcon = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/expanded-plugins.png"))
+		verticallineIcon = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/verticalline-plugins.png"))
 		
 		self.plugins = {}
 		for x in self.pluginlist:
@@ -203,10 +202,10 @@ class PluginDownloadBrowser(Screen):
 			
 		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]))
+				list.append(PluginCategoryComponent(x, expandedIcon))
+				list.extend([PluginDownloadComponent(plugin[0], plugin[1]) for plugin in self.plugins[x]])
 			else:
-				self.list.append(PluginCategoryComponent(x, expandableIcon))
-		self["list"].l.setList(self.list)
+				list.append(PluginCategoryComponent(x, expandableIcon))
+		self.list = list
+		self["list"].l.setList(list)