revert last changes, don't drop "selectionChanged"

diff --git a/lib/python/Components/HelpMenuList.py b/lib/python/Components/HelpMenuList.py
index e6f8539167cc93eb0d20e494fc19d037a6d5b993..c8ff3795ffedae7fa86ebdd21566010e0d5fa31f 100644 (file)
--- a/lib/python/Components/HelpMenuList.py
+++ b/lib/python/Components/HelpMenuList.py
@@ -52,8 +52,13 @@ class HelpMenuList(GUIComponent):
                self.instance = eListbox(parent)
                self.instance.setContent(self.l)
                self.instance.setItemHeight(42)
                self.instance = eListbox(parent)
                self.instance.setContent(self.l)
                self.instance.setItemHeight(42)

+               self.instance.selectionChanged.get().append(self.selectionChanged)

                
        def GUIdelete(self):
                self.instance.setContent(None)
                
        def GUIdelete(self):
                self.instance.setContent(None)

+               self.instance.selectionChanged.get().remove(self.selectionChanged)

                self.instance = None
 
                self.instance = None
 

+       def selectionChanged(self):
+               for x in self.onSelChanged:
+                       x()

diff --git a/lib/python/Screens/HelpMenu.py b/lib/python/Screens/HelpMenu.py
index c19233e270da2a6d15ed2b7315e088443731b681..e947ac914c2c1e6f0eaa1af75e9e53d526d371a1 100644 (file)
--- a/lib/python/Screens/HelpMenu.py
+++ b/lib/python/Screens/HelpMenu.py
@@ -18,6 +18,7 @@ class HelpMenu(Screen):
                self.onSelChanged = [ ]
                
                self["list"] = HelpMenuList(list, self.close)
                self.onSelChanged = [ ]
                
                self["list"] = HelpMenuList(list, self.close)

+               self["list"].onSelChanged.append(self.SelectionChanged)

                
                self["rc"] = Pixmap()
                self["arrowup"] = MovingPixmap()
                
                self["rc"] = Pixmap()
                self["arrowup"] = MovingPixmap()


@@ -26,17 +27,7 @@ class HelpMenu(Screen):
                {
                        "ok": self["list"].ok,
                        "back": self.close,
                {
                        "ok": self["list"].ok,
                        "back": self.close,

-                       "up": self.up,
-                       "down": self.down

                }, -1)
                }, -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()

                
        def SelectionChanged(self):
                selection = self["list"].getCurrent()[3]
                
        def SelectionChanged(self):
                selection = self["list"].getCurrent()[3]


@@ -59,4 +50,3 @@ class HelpableScreen:
                if len(args):
                        (actionmap, context, action) = args
                        actionmap.action(context, action)
                if len(args):
                        (actionmap, context, action) = args
                        actionmap.action(context, action)

-