Merge commit 'origin/translations' into experimental

[enigma2.git] / lib / python / Screens / HelpMenu.py

diff --git a/lib/python/Screens/HelpMenu.py b/lib/python/Screens/HelpMenu.py
index c19233e270da2a6d15ed2b7315e088443731b681..305e35555ad549d33bf4dadf970aac51df7d2142 100644 (file)
--- a/lib/python/Screens/HelpMenu.py
+++ b/lib/python/Screens/HelpMenu.py
@@ -1,51 +1,49 @@
 from Screen import Screen
-
-from Components.Pixmap import *
-from Components.Pixmap import Pixmap
-from Components.Pixmap import MovingPixmap
+from Components.Pixmap import Pixmap, MovingPixmap
 from Components.Label import Label
-from Components.Slider import Slider
 from Components.ActionMap import ActionMap
 from Components.HelpMenuList import HelpMenuList
-import string
-from xml.sax import make_parser
-from xml.sax.handler import ContentHandler
-from Components.MenuList import MenuList
+from Screens.Rc import Rc
 
-class HelpMenu(Screen):
+class HelpMenu(Screen, Rc):
        def __init__(self, session, list):
                Screen.__init__(self, session)
                self.onSelChanged = [ ]
-               
                self["list"] = HelpMenuList(list, self.close)
-               
-               self["rc"] = Pixmap()
-               self["arrowup"] = MovingPixmap()
+               self["list"].onSelChanged.append(self.SelectionChanged)
+               Rc.__init__(self)
+               self["long_key"] = Label("")
 
                self["actions"] = ActionMap(["WizardActions"], 
                {
                        "ok": self["list"].ok,
                        "back": self.close,
-                       "up": self.up,
-                       "down": self.down
                }, -1)
-       
-       def up(self):
-               self["list"].instance.moveSelection(self["list"].instance.moveUp)
-               self.SelectionChanged()
-               
-       def down(self):
-               self["list"].instance.moveSelection(self["list"].instance.moveDown)
-               self.SelectionChanged()
-               
+
+               self.onLayoutFinish.append(self.SelectionChanged)
+
        def SelectionChanged(self):
-               selection = self["list"].getCurrent()[3]
-               if selection is None:
-                       self["arrowup"].instance.hide()
-               else:
-                       self["arrowup"].moveTo(selection[1], selection[2], 1)
-                       self["arrowup"].startMoving()
-                       self["arrowup"].instance.show()
+               self.clearSelectedKeys()
+               selection = self["list"].getCurrent()
+               if selection:
+                       selection = selection[3]
+               #arrow = self["arrowup"]
+               print "selection:", selection
+
+               longText = ""
+               if selection and len(selection) > 1:
+                       if selection[1] == "SHIFT":
+                               self.selectKey("SHIFT")
+                       elif selection[1] == "long":
+                               longText = _("Long Keypress")
+               self["long_key"].setText(longText)
+
+               self.selectKey(selection[0])
+               #if selection is None:
+               print "select arrow"
+               #       arrow.moveTo(selection[1], selection[2], 1)
+               #       arrow.startMoving()
+               #       arrow.show()
 
 class HelpableScreen:
        def __init__(self):
@@ -53,10 +51,11 @@ class HelpableScreen:
                        {
                                "displayHelp": self.showHelp,
                        })
+
        def showHelp(self):
                self.session.openWithCallback(self.callHelpAction, HelpMenu, self.helpList)
+
        def callHelpAction(self, *args):
-               if len(args):
+               if args:
                        (actionmap, context, action) = args
                        actionmap.action(context, action)
-