fix inverted setting (meaning was inverted too)

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

diff --git a/lib/python/Components/HelpMenuList.py b/lib/python/Components/HelpMenuList.py
index 34eb4119449f59c252e5f0f1a985a4bacf97b166..c7035cb9c0242fa64c997fc9292a2926ed73e14f 100644 (file)
--- a/lib/python/Components/HelpMenuList.py
+++ b/lib/python/Components/HelpMenuList.py
@@ -2,6 +2,8 @@ from GUIComponent import *
 
 from enigma import eListboxPythonMultiContent, eListbox, gFont
 
+from Tools.KeyBindings import queryKeyBinding, getKeyDescription
+
 # [ ( actionmap, context, [(action, help), (action, help), ...] ), (actionmap, ... ), ... ]
 
 class HelpMenuList(GUIComponent):
@@ -13,24 +15,37 @@ class HelpMenuList(GUIComponent):
                
                l = [ ]
                for (actionmap, context, actions) in list:
-                       
-                       print "actionmap:"  + str(actionmap)
-                       print "context: " + str(context)
-                       print "actions: " + str(actions)
-                       
                        for (action, help) in actions:
                                entry = [ ]
                                
                                entry.append( (actionmap, context, action) )
-                               entry.append( (0, 36, 200, 20, 1, 0, "you can also press a secret button") )
-                               entry.append( (0, 0, 200, 36, 0, 0, help) )
+                               buttons = queryKeyBinding(context, action)
+                               buttonstring = ""
+       
+                               first = True
+                               for n in buttons:
+                                       name = getKeyDescription(n)
+                                       if name is None:
+                                               continue
+
+                                       if not first:
+                                               buttonstring += ", or "
+
+                                       first = False
+                                       buttonstring += name
+
+                               if not first:
+                                       buttonstring = "You can also press " + buttonstring + "."
+
+                               entry.append( (eListboxPythonMultiContent.TYPE_TEXT, 0, 0, 200, 36, 0, 0, help) )
+                               entry.append( (eListboxPythonMultiContent.TYPE_TEXT, 0, 40, 200, 20, 1, 0, buttonstring) )
                                
                                l.append(entry)
                
                self.l.setList(l)
                
-               self.l.setFont(0, gFont("Arial", 36))
-               self.l.setFont(1, gFont("Arial", 18))
+               self.l.setFont(0, gFont("Regular", 36))
+               self.l.setFont(1, gFont("Regular", 18))
        
        def GUIcreate(self, parent):
                self.instance = eListbox(parent)