Merge branch 'master' into experimental

[enigma2.git] / lib / python / Components / HelpMenuList.py

diff --git a/lib/python/Components/HelpMenuList.py b/lib/python/Components/HelpMenuList.py
index 04815c8d92573df9097e863c3ad821fd5f77e5c6..66139dfbcafcfefa207007396b013fdf7c9ec80f 100755 (executable)
--- a/lib/python/Components/HelpMenuList.py
+++ b/lib/python/Components/HelpMenuList.py
@@ -7,7 +7,7 @@ from Tools.KeyBindings import queryKeyBinding, getKeyDescription
 # [ ( 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 +15,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
@@ -36,13 +34,15 @@ class HelpMenuList(GUIComponent):
                                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]) )
+                                       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) )