X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FComponents%2FHelpMenuList.py;h=619de5bd7882134a9d484f823fc57cd1d0d78264;hp=04815c8d92573df9097e863c3ad821fd5f77e5c6;hb=d856c9375cce4aeb6589f44dc5cb13d6d284f67b;hpb=1be69784396f194419adda53331d5fee02ea062b

diff --git a/lib/python/Components/HelpMenuList.py b/lib/python/Components/HelpMenuList.py
index 04815c8..619de5b 100755
--- a/lib/python/Components/HelpMenuList.py
+++ b/lib/python/Components/HelpMenuList.py
@@ -2,12 +2,13 @@ from GUIComponent import GUIComponent
 
 from enigma import eListboxPythonMultiContent, eListbox, gFont
 from Tools.KeyBindings import queryKeyBinding, getKeyDescription
+import skin
 #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()
@@ -15,10 +16,8 @@ class HelpMenuList(GUIComponent):
 		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
@@ -33,29 +32,41 @@ class HelpMenuList(GUIComponent):
 					if name is not None:
 						break
 
+				if name is None:
+					continue
+
 				if flags & 8: # for long keypresses, prepend l_ into the key name.
 					name = (name[0], "long")
 					
-				entry.append( (actionmap, context, action, name ) )
-					
-				if type(help).__name__== 'list':
+				entry = [ (actionmap, context, action, name ) ]
+
+				if isinstance(help, list):
 					self.extendedHelp = True
 					print "extendedHelpEntry found"
-					entry.append( (eListboxPythonMultiContent.TYPE_TEXT, 0, 0, 400, 26, 0, 0, help[0]) )
-					entry.append( (eListboxPythonMultiContent.TYPE_TEXT, 0, 28, 400, 20, 1, 0, help[1]) )
+					x, y, w, h = skin.parameters.get("HelpMenuListExtHlp0",(0, 0, 400, 26))
+					x1, y1, w1, h1 = skin.parameters.get("HelpMenuListExtHlp1",(0, 28, 400, 20))
+					entry.extend((
+						(eListboxPythonMultiContent.TYPE_TEXT, x, y, w, h, 0, 0, help[0]),
+						(eListboxPythonMultiContent.TYPE_TEXT, x1, y1, w1, h1, 1, 0, help[1])
+					))
 				else:
-					entry.append( (eListboxPythonMultiContent.TYPE_TEXT, 0, 0, 400, 28, 0, 0, help) )
+					x, y, w, h = skin.parameters.get("HelpMenuListHlp",(0, 0, 400, 28))
+					entry.append( (eListboxPythonMultiContent.TYPE_TEXT, x, y, w, h, 0, 0, help) )
 					
 				l.append(entry)
 
 		self.l.setList(l)
 		if self.extendedHelp is True:
-			self.l.setFont(0, gFont("Regular", 24))
-			self.l.setFont(1, gFont("Regular", 18))
-			self.l.setItemHeight(50)
+
+			font = skin.fonts.get("HelpMenuListExt0", ("Regular", 24, 50))
+			self.l.setFont(0, gFont(font[0], font[1]))
+			self.l.setItemHeight(font[2])
+			font = skin.fonts.get("HelpMenuListExt1", ("Regular", 18))
+			self.l.setFont(1, gFont(font[0], font[1]))
 		else:
-			self.l.setFont(0, gFont("Regular", 24))
-			self.l.setItemHeight(38)
+			font = skin.fonts.get("HelpMenuList", ("Regular", 24, 38))
+			self.l.setFont(0, gFont(font[0], font[1]))
+			self.l.setItemHeight(font[2])
 
 	def ok(self):
 		# a list entry has a "private" tuple as first entry...