refs bug #429

[enigma2.git] / lib / python / Components / Renderer / Listbox.py

diff --git a/lib/python/Components/Renderer/Listbox.py b/lib/python/Components/Renderer/Listbox.py
index 4ccc0a40da8d95ba7cd31812e6838f0bc0120c78..640121e1ff97a7ac92cb6ece3e26ed1602dfd3b8 100644 (file)
--- a/lib/python/Components/Renderer/Listbox.py
+++ b/lib/python/Components/Renderer/Listbox.py
@@ -1,10 +1,7 @@
-from Components.VariableText import VariableText
 from Renderer import Renderer
-from Tools.Event import Event
-
 from enigma import eListbox
 
-# the listbox renderer is the listbox, but no listbox content
+# the listbox renderer is the listbox, but no listbox content.
 # the content will be provided by the source (or converter).
 
 # the source should emit the 'changed' signal whenever
@@ -42,11 +39,15 @@ class Listbox(Renderer, object):
                self.wrap_around = self.wrap_around # trigger
                self.selection_enabled = self.selection_enabled # trigger
 
+       def preWidgetRemove(self, instance):
+               instance.setContent(None)
+               instance.selectionChanged.get().remove(self.selectionChanged)
+
        def setWrapAround(self, wrap_around):
                self.__wrap_around = wrap_around
                if self.instance is not None:
                        self.instance.setWrapAround(self.__wrap_around)
-       
+
        wrap_around = property(lambda self: self.__wrap_around, setWrapAround)
 
        def selectionChanged(self):
@@ -54,16 +55,16 @@ class Listbox(Renderer, object):
 
        def getIndex(self):
                if self.instance is None:
-                       return None
+                       return 0
                return self.instance.getCurrentIndex()
-               
+
        def moveToIndex(self, index):
                if self.instance is None:
                        return
                self.instance.moveSelectionTo(index)
 
        index = property(getIndex, moveToIndex)
-       
+
        def move(self, direction):
                if self.instance is not None:
                        self.instance.moveSelection(direction)
@@ -76,4 +77,12 @@ class Listbox(Renderer, object):
        selection_enabled = property(lambda self: self.__selection_enabled, setSelectionEnabled)
 
        def changed(self, what):
+               if hasattr(self.source, "selectionEnabled"):
+                       self.selection_enabled = self.source.selectionEnabled
+               if len(what) > 1 and isinstance(what[1], str) and what[1] == "style":
+                       return
                self.content = self.source.content
+
+       def entry_changed(self, index):
+               if self.instance is not None:
+                       self.instance.entryChanged(index)