X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FComponents%2FHelpMenuList.py;h=66139dfbcafcfefa207007396b013fdf7c9ec80f;hp=25c9b8b6bcbb397ad085eb62690f530a7d1b8349;hb=cccb35a4aeef1ba919411b35553902c86f57b856;hpb=b0bdeff2a2042c42b6370b166de0474c3431570b

diff --git a/lib/python/Components/HelpMenuList.py b/lib/python/Components/HelpMenuList.py
old mode 100644
new mode 100755
index 25c9b8b..66139df
--- a/lib/python/Components/HelpMenuList.py
+++ b/lib/python/Components/HelpMenuList.py
@@ -1,24 +1,22 @@
 from GUIComponent import GUIComponent
 
 from enigma import eListboxPythonMultiContent, eListbox, gFont
-
 from Tools.KeyBindings import queryKeyBinding, getKeyDescription
 #getKeyPositions
 
 # [ ( actionmap, context, [(action, help), (action, help), ...] ), (actionmap, ... ), ... ]
 
 class HelpMenuList(GUIComponent):
-	def __init__(self, list, callback):
+	def __init__(self, helplist, callback):
 		GUIComponent.__init__(self)
 		self.onSelChanged = [ ]
 		self.l = eListboxPythonMultiContent()
 		self.callback = callback
+		self.extendedHelp = False
 
 		l = [ ]
-		for (actionmap, context, actions) in list:
+		for (actionmap, context, actions) in helplist:
 			for (action, help) in actions:
-				entry = [ ]
-
 				buttons = queryKeyBinding(context, action)
 
 				# do not display entries which are not accessible from keys
@@ -36,17 +34,28 @@ class HelpMenuList(GUIComponent):
 				if flags & 8: # for long keypresses, prepend l_ into the key name.
 					name = (name[0], "long")
 					
-				print "name:", name
-
-				entry.append( (actionmap, context, action, name ) )
-				entry.append( (eListboxPythonMultiContent.TYPE_TEXT, 0, 0, 400, 28, 0, 0, help) )
-
+				entry = [ (actionmap, context, action, name ) ]
+
+				if isinstance(help, list):
+					self.extendedHelp = True
+					print "extendedHelpEntry found"
+					entry.extend((
+						(eListboxPythonMultiContent.TYPE_TEXT, 0, 0, 400, 26, 0, 0, help[0]),
+						(eListboxPythonMultiContent.TYPE_TEXT, 0, 28, 400, 20, 1, 0, help[1])
+					))
+				else:
+					entry.append( (eListboxPythonMultiContent.TYPE_TEXT, 0, 0, 400, 28, 0, 0, help) )
+					
 				l.append(entry)
 
 		self.l.setList(l)
-
-		self.l.setFont(0, gFont("Regular", 24))
-		self.l.setItemHeight(38)
+		if self.extendedHelp is True:
+			self.l.setFont(0, gFont("Regular", 24))
+			self.l.setFont(1, gFont("Regular", 18))
+			self.l.setItemHeight(50)
+		else:
+			self.l.setFont(0, gFont("Regular", 24))
+			self.l.setItemHeight(38)
 
 	def ok(self):
 		# a list entry has a "private" tuple as first entry...