From d5cacc98a3f6f21cb03e29bf5dac733c710cc49d Mon Sep 17 00:00:00 2001
From: Stefan Pluecken <stefan.pluecken@multimedia-labs.de>
Date: Tue, 28 Feb 2006 09:21:57 +0000
Subject: [PATCH] use categories to categorize the plugins

---
 data/expandable-plugins.png           | Bin 0 -> 882 bytes
 data/expanded-plugins.png             | Bin 0 -> 884 bytes
 lib/python/Components/MultiContent.py |   5 +++
 lib/python/Components/PluginList.py   |  26 ++++++++++++--
 lib/python/Plugins/Plugin.py          |   7 ++--
 lib/python/Screens/PluginBrowser.py   |  48 +++++++++++++++++++-------
 6 files changed, 70 insertions(+), 16 deletions(-)
 create mode 100644 data/expandable-plugins.png
 create mode 100644 data/expanded-plugins.png

diff --git a/data/expandable-plugins.png b/data/expandable-plugins.png
new file mode 100644
index 0000000000000000000000000000000000000000..2076d555430794ac6881cf4c12d4691af8beb8c7
GIT binary patch
literal 882
zcmW-fy=zoa5XEOBAu$p}Y=RgGet?w(C&3^h(d@drYQmaqp<OiDAr^_EPsCO%qMcez
zu(L2&2v+_HHdBkBRf@D0B4RcE?z`~bWA4nHIp@rK*;{Ilj~yEmk@0S)xy<(x&-u{<
zyf2*XOp6R{_ipxEnUUpqre$iTl#7TA&#(;5kdpLB_jF6wbSbqKX`W_jnkJ=HBh^za
zRZ|6|lt}RuOVJbpuz?1PW~!ykDaRu$LL;P%C2|k9a1EEjf~0wvg=v@+Qq-!4TBwE!
z9BB>l5DU=|rotL9NW&6Z<QNP#&|uLlMNo-3=C1Bi^f8vm%uU^-$b|(-HCJ^N)I*9|
z7jsb;<lzT2>BbK9Ljr}c1`N`$q!b<u1{-Lwq&Qd7#2ht~VkG()OQdQl_=;RukTg*f
ze8g!CfEVQ$jasb44`|Yj9dJT03SkWxr0IkfJQxf%&{9@Zs!0=bgpFY&`WQ>3{3!L`
zP~_GNW}{`F^^yvy+V`^F+RDPQcBgE+7F;OT8p`r(T17!U323m`66T?aQF}-J{NvN8
zmX}s!e*Zhy(zth{-IVR&$qvE6hn+i*MGhS;PeXRzO>j9<br)MB--eEl&du~*{5{3h
zWYxM|Ej-xV9Bfsx@Mv(i8mvz}y<cri^*07n?e1dl*ZP?)3NLn>SNff=YpWB(>y2w~
z<jL&Yz3V4u*1lN(_wN4d55607AD>NcoLKzvey2UV@_8`b8{fG#e^}(z<)OWEb3adm
OBHh+f^V8MU=l=myC4=7p

literal 0
HcmV?d00001

diff --git a/data/expanded-plugins.png b/data/expanded-plugins.png
new file mode 100644
index 0000000000000000000000000000000000000000..ec355feeccce34876a7ae7dcc929eaaf2c351ed6
GIT binary patch
literal 884
zcmW-fu}hU<6vofBq%<6&1~UbhpfNmJ4Gx+2dhewaGY1<2EAPPuHR?vRHW>{;E*)tw
zgdm8v{)V7VZAn8kI7CZCLqpTs?|d(O-^Y2+InQ~X=X{Un=b8ikL;WH$&~DWi_)hYS
z9X`PO-09XCk)F-@%ZrUtqU7;XtQ0Lp@*<*ym#`9ALNe)5+>2XrEiPGWQOt{3F)b$9
zs!`O7T2U=3AQg!sUc`!M5dyG*28(8@CFkVv2#e4N$+1N4;TEppk}OD?hgq10Ns^*g
zJ=8)qRNzQ!h=*8+hA<V@fI%9T&?3iRuz?1PW=TOAbIe`cCG|0u$jnXMB;~?_q?)U`
z3hE(6t&6#+3-a&-nsj3a`XPZrSOW%WSW*fP27?VWSdz|VnwX<zl18GBu|%q-g0IMh
z1xXV%!AG3N0C-W3(Wu2r{D3Ci*a0U5qY&1BL7Glz!GpnI11-6ttR_v&5jKXA=wmFA
z@}pFLL&~id%tmvc)sm7_<$JETvNAbV?&P*B!AZH&kjt-VrGjb_&|tA8%tI5S_K*Jk
z$EVg^n7b+$ethLxYBw)6>$2H9(jw@))4Fy~<jApnYO?)ekjq2e_H5(OUe9pf!Lg5f
zQ{TB7={A<S(;I7Ro%OCv-|gJ!c2-6o-0rT9F0OV)o9)^8-z%rqDV%KArxsi9Z!Hh@
zuGD6p$^D6~{SQ|@?QS<Gw%(lBI6M4h^7;7FSHJS=_0Gecq4D!4myW;tJTtM|BY&>f
UzCD@!`4SvyH|FYZFD^g&59Bt7!T<mO

literal 0
HcmV?d00001

diff --git a/lib/python/Components/MultiContent.py b/lib/python/Components/MultiContent.py
index 691152b4..06ecde96 100644
--- a/lib/python/Components/MultiContent.py
+++ b/lib/python/Components/MultiContent.py
@@ -19,3 +19,8 @@ def MultiContentEntryText(pos = (0, 0), size = (0, 0), font = 0, flags = RT_HALI
 
 def MultiContentEntryPixmap(pos = (0, 0), size = (0, 0), png = None):
 	return (eListboxPythonMultiContent.TYPE_PIXMAP, pos[0], pos[1], size[0], size[1], png)
+
+def MultiContentEntryPixmapAlphaTest(pos = (0, 0), size = (0, 0), png = None):
+	return (eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, pos[0], pos[1], size[0], size[1], png)
+
+	
\ No newline at end of file
diff --git a/lib/python/Components/PluginList.py b/lib/python/Components/PluginList.py
index 22682033..d458ce45 100644
--- a/lib/python/Components/PluginList.py
+++ b/lib/python/Components/PluginList.py
@@ -4,7 +4,7 @@ from GUIComponent import *
 from MenuList import MenuList
 
 from Tools.Directories import resolveFilename, SCOPE_SKIN_IMAGE
-from Components.MultiContent import RT_HALIGN_LEFT, MultiContentEntryText, MultiContentEntryPixmap
+from Components.MultiContent import RT_HALIGN_LEFT, MultiContentEntryText, MultiContentEntryPixmapAlphaTest
 
 from enigma import *
 
@@ -18,7 +18,29 @@ def PluginEntryComponent(plugin):
 		png = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "/plugin.png"))
 	else:
 		png = plugin.icon
-	res.append(MultiContentEntryPixmap(pos=(10, 5), size=(60, 40), png = png))
+	res.append(MultiContentEntryPixmapAlphaTest(pos=(10, 5), size=(60, 40), png = png))
+	
+	return res
+
+def PluginCategoryComponent(name, png):
+	res = [ name ]
+	
+	res.append(MultiContentEntryText(pos=(80, 5), size=(300, 25), font=0, text=name))
+	res.append(MultiContentEntryPixmapAlphaTest(pos=(0, 0), size=(60, 50), png = png))
+	
+	return res
+
+def PluginDownloadComponent(plugin, name):
+	res = [ plugin ]
+	
+	res.append(MultiContentEntryText(pos=(80, 5), size=(300, 25), font=0, text=name))
+	res.append(MultiContentEntryText(pos=(80, 26), size=(300, 17), font=1, text=plugin.description))
+
+	if plugin.icon is None:
+		png = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "/plugin.png"))
+	else:
+		png = plugin.icon
+	res.append(MultiContentEntryPixmapAlphaTest(pos=(0, 0), size=(60, 50), png = png))
 	
 	return res
 
diff --git a/lib/python/Plugins/Plugin.py b/lib/python/Plugins/Plugin.py
index 4b5b7e2a..3db70397 100644
--- a/lib/python/Plugins/Plugin.py
+++ b/lib/python/Plugins/Plugin.py
@@ -34,8 +34,11 @@ class PluginDescriptor:
 			self.where = [ where ]
 		self.description = description
 
-		self.iconstr = icon
-		self.icon = None
+		if type(icon) is str or icon is None:
+			self.iconstr = icon
+			self.icon = None
+		else:
+			self.icon = icon
 
 		self.__call__ = fnc
 
diff --git a/lib/python/Screens/PluginBrowser.py b/lib/python/Screens/PluginBrowser.py
index e9b009ae..41b3f32e 100644
--- 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,7 +11,7 @@ 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
+from Tools.Directories import resolveFilename, SCOPE_PLUGINS, SCOPE_SKIN_IMAGE
 
 class PluginBrowser(Screen):
 	def __init__(self, session):
@@ -73,6 +73,7 @@ class PluginDownloadBrowser(Screen):
 		self.list = []
 		self["list"] = PluginList(self.list)
 		self.pluginlist = []
+		self.expanded = []
 		
 		if self.type == self.DOWNLOAD:
 			self["text"] = Label(_("Downloading plugin information. Please wait..."))
@@ -88,18 +89,24 @@ class PluginDownloadBrowser(Screen):
 		})
 		
 	def go(self):
-		print "plugin: installing:", self.pluginlist[self["list"].l.getCurrentSelectionIndex()]
-		if self.type == self.DOWNLOAD:
-			self.session.openWithCallback(self.runInstall, MessageBox, _("Do you really want to download\nthe plugin \"" + self.pluginlist[self["list"].l.getCurrentSelectionIndex()][3] + "\"?"))
-		elif self.type == self.REMOVE:
-			self.session.openWithCallback(self.runInstall, MessageBox, _("Do you really want to REMOVE\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:
 			if self.type == self.DOWNLOAD:
-				self.session.openWithCallback(self.installFinished, Console, ["ipkg install " + self.pluginlist[self["list"].l.getCurrentSelectionIndex()][0]])
+				self.session.openWithCallback(self.installFinished, Console, ["ipkg install " + "enigma2-plugin-" + self["list"].l.getCurrentSelection()[0].name])
 			elif self.type == self.REMOVE:
-				self.session.openWithCallback(self.installFinished, Console, ["ipkg remove " + self.pluginlist[self["list"].l.getCurrentSelectionIndex()][0]])
+				self.session.openWithCallback(self.installFinished, Console, ["ipkg remove " + "enigma2-plugin-" + self["list"].l.getCurrentSelection()[0].name])
 
 	def setTitle(self):
 		if self.type == self.DOWNLOAD:
@@ -141,9 +148,26 @@ class PluginDownloadBrowser(Screen):
 	
 	def updateList(self):
 		self.list = []
-		for x in self.pluginlist:
-			plugin = PluginDescriptor(name = x[3], description = x[2])
-			self.list.append(PluginEntryComponent(plugin))
+		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)
 
-- 
2.30.2