Merge branch 'master' of /home/tmbinc/enigma2-git

[enigma2.git] / lib / python / Components / Converter / StringList.py

diff --git a/lib/python/Components/Converter/StringList.py b/lib/python/Components/Converter/StringList.py
index 31dbcd3c9ae1b21cb54dfd4ec5fec7339b7593dd..d0886620622e35bfbdcdd441635232fd0976309d 100644 (file)
--- a/lib/python/Components/Converter/StringList.py
+++ b/lib/python/Components/Converter/StringList.py
@@ -1,33 +1,48 @@
 from Converter import Converter
 from enigma import eListboxPythonStringContent
-
+from Components.Element import cached
 
 class StringList(Converter):
        """Turns a simple python list into a list which can be used in a listbox."""
-       def __init__(self, *args, **kwargs):
-               Converter.__init__(self)
+       def __init__(self, type):
+               Converter.__init__(self, type)
+               self.content = None
+
+       def changed(self, what):
+               if not self.content:
+                       self.content = eListboxPythonStringContent()
 
-       def changed(self):
-               self.content = eListboxPythonStringContent()
                if self.source:
                        self.content.setList(self.source.list)
-               self.downstream_elements.changed()
+               self.downstream_elements.changed(what)
 
        def selectionChanged(self, index):
-               self.upstream_elements.selectionChanged(index)
+               self.source.selectionChanged(index)
+
+       def setIndex(self, index):
                # update all non-master targets
+               print "changed selection in listbox!"
                for x in self.downstream_elements:
+                       print "downstream element", x
                        if x is not self.master:
+                               print "is not master, so update to index", index
                                x.index = index
 
+       def getIndex(self, index):
+               return None
+       
+       index = property(getIndex, setIndex)
+
+       @cached
        def getCurrent(self):
-               if self.source is None:
+               if self.source is None or self.index is None or self.index >= len(self.source.list):
                        return None
                return self.source.list[self.index]
 
        current = property(getCurrent)
 
        # pass through: getIndex / setIndex to master
+       @cached
        def getIndex(self):
                if self.master is None:
                        return None
@@ -36,5 +51,9 @@ class StringList(Converter):
        def setIndex(self, index):
                if self.master is not None:
                        self.master.index = index
-       
+
        index = property(getIndex, setIndex)
+
+       def entry_changed(self, index):
+               if self.content:
+                       self.content.invalidateEntry(index)