From 4f46a90d789f28eb0ca156caeb2bb55136d8ac85 Mon Sep 17 00:00:00 2001
From: Stefan Pluecken <stefan.pluecken@multimedia-labs.de>
Date: Wed, 11 Jan 2006 15:35:15 +0000
Subject: [PATCH] show plugin description in plugin list

---
 lib/python/Components/PluginComponent.py   |  6 +++---
 lib/python/Components/PluginList.py        |  7 ++++---
 lib/python/Plugins/tuxboxplugins/plugin.py | 14 ++++++++------
 lib/python/Plugins/update/plugin.py        |  2 +-
 lib/python/Screens/PluginBrowser.py        |  2 +-
 5 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/lib/python/Components/PluginComponent.py b/lib/python/Components/PluginComponent.py
index 960043d6..e0cc90a4 100644
--- a/lib/python/Components/PluginComponent.py
+++ b/lib/python/Components/PluginComponent.py
@@ -40,10 +40,10 @@ class PluginComponent:
 							pass
 	
 						for y in range(len(plugins)):
-							if len(plugins[y]) < 4:
-								list.append((path + picturepaths[y], plugins[y][0] , x, plugins[y][1], plugins[y][2], None))
+							if len(plugins[y]) < 5:
+								list.append((path + picturepaths[y], plugins[y][0] , x, plugins[y][2], plugins[y][3], None, plugins[y][1]))
 							else:
-								list.append((path + picturepaths[y], plugins[y][0] , x, plugins[y][1], plugins[y][2], plugins[y][3]))
+								list.append((path + picturepaths[y], plugins[y][0] , x, plugins[y][2], plugins[y][3], plugins[y][4], plugins[y][1]))
 						if runAutostartPlugins:
 							try: plugin.autostart()
 							except:	pass
diff --git a/lib/python/Components/PluginList.py b/lib/python/Components/PluginList.py
index f456ac46..93edf5ba 100644
--- a/lib/python/Components/PluginList.py
+++ b/lib/python/Components/PluginList.py
@@ -16,9 +16,10 @@ RT_VALIGN_TOP = 0
 RT_VALIGN_CENTER = 8
 RT_VALIGN_BOTTOM = 16
 
-def PluginEntryComponent(picture, name):
+def PluginEntryComponent(picture, name, desc = "Plugin"):
 	res = [ None ]
-	res.append((eListboxPythonMultiContent.TYPE_TEXT, 80, 10, 200, 50, 0, RT_HALIGN_LEFT , name))
+	res.append((eListboxPythonMultiContent.TYPE_TEXT, 80, 5, 200, 25, 0, RT_HALIGN_LEFT , name))
+	res.append((eListboxPythonMultiContent.TYPE_TEXT, 80, 26, 200, 17, 1, RT_HALIGN_LEFT , desc))
 	png = loadPNG(picture)
 	if png == None:
 		png = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "/plugin.png"))
@@ -34,7 +35,7 @@ class PluginList(HTMLComponent, GUIComponent, MenuList):
 		self.list = list
 		self.l.setList(list)
 		self.l.setFont(0, gFont("Regular", 20))
-		self.l.setFont(1, gFont("Regular", 10))
+		self.l.setFont(1, gFont("Regular", 14))
 	
 	def GUIcreate(self, parent):
 		self.instance = eListbox(parent)
diff --git a/lib/python/Plugins/tuxboxplugins/plugin.py b/lib/python/Plugins/tuxboxplugins/plugin.py
index 65f7a863..b2b3efd9 100644
--- a/lib/python/Plugins/tuxboxplugins/plugin.py
+++ b/lib/python/Plugins/tuxboxplugins/plugin.py
@@ -13,20 +13,22 @@ def getPlugins():
 	for x in dir:
 		try:
 			if x[-3:] == "cfg":
-				pluginlist.append((getPluginParams(x)["name"], "function", "main", x))
+				params = getPluginParams(x)
+				pluginlist.append((params["name"], params["desc"], "function", "main", x))
 		except:
 			pass
 	return pluginlist
 
 def getPluginParams(file):
-	file = open("/usr/lib/tuxbox/plugins/" + file, "r")
-	lines = file.readlines()
-	file.close()
 	params = {}
-	for x in lines:
+	file = open("/usr/lib/tuxbox/plugins/" + file, "r")
+	for x in file.readlines():
 		split = x.split("=")
 		params[split[0]] = split[1]
+	file.close()
+
 	return params
 
 def main(session, args):
-	print "Running plugin with number", args
\ No newline at end of file
+	print "Running plugin " + args[:-4] + ".so with config file", args
+	print getPluginParams(args)
\ No newline at end of file
diff --git a/lib/python/Plugins/update/plugin.py b/lib/python/Plugins/update/plugin.py
index 8fa21cb3..7942821c 100644
--- a/lib/python/Plugins/update/plugin.py
+++ b/lib/python/Plugins/update/plugin.py
@@ -60,7 +60,7 @@ def getPicturePaths():
 	return ["update.png"]
 
 def getPlugins():
-	return [("Softwareupdate", "screen", "Example")]
+	return [("Softwareupdate", "Updates your receiver's software", "screen", "Example")]
 	
 def getMenuRegistrationList():
 	list = []
diff --git a/lib/python/Screens/PluginBrowser.py b/lib/python/Screens/PluginBrowser.py
index c03aa910..6d3ce66a 100644
--- a/lib/python/Screens/PluginBrowser.py
+++ b/lib/python/Screens/PluginBrowser.py
@@ -35,7 +35,7 @@ class PluginBrowser(Screen):
 		self.list = []
 		self.pluginlist = plugins.getPluginList()
 		for x in self.pluginlist:
-			self.list.append(PluginEntryComponent(x[0], x[1]))
+			self.list.append(PluginEntryComponent(x[0], x[1], x[6]))
 		
 		self["list"].l.setList(self.list)
 
-- 
2.30.2