ignore requests to invalidate non-existing entries

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

diff --git a/lib/python/Components/ConfigList.py b/lib/python/Components/ConfigList.py
index dc10045caa58af1487283680bf139143cde97650..4dd401f9475a0e0c5b3da27f6f82add44a5d330e 100644 (file)
--- a/lib/python/Components/ConfigList.py
+++ b/lib/python/Components/ConfigList.py
@@ -1,6 +1,6 @@
 from HTMLComponent import *
 from GUIComponent import *
-from config import KEY_LEFT, KEY_RIGHT, KEY_0, KEY_DELETE, KEY_OK, KEY_TIMEOUT
+from config import KEY_LEFT, KEY_RIGHT, KEY_0, KEY_DELETE, KEY_OK, KEY_TIMEOUT, ConfigElement
 from Components.ActionMap import NumberActionMap
 from enigma import eListbox, eListboxPythonConfigContent, eTimer
 
@@ -9,15 +9,19 @@ class ConfigList(HTMLComponent, GUIComponent, object):
                GUIComponent.__init__(self)
                self.l = eListboxPythonConfigContent()
                self.l.setSeperation(100)
+               self.timer = eTimer()
                self.list = list
                self.onSelectionChanged = [ ]
                self.current = None
                self.help_window = None
                self.setHelpWindowSession(session)
-               
-               self.timer = eTimer()
+
+       def execBegin(self):
                self.timer.timeout.get().append(self.timeout)
-       
+
+       def execEnd(self):
+               self.timer.timeout.get().remove(self.timeout)
+
        def setHelpWindowSession(self, session):
                assert self.help_window is None, "you can't move a help window to another session"
                self.session = session
@@ -29,22 +33,25 @@ class ConfigList(HTMLComponent, GUIComponent, object):
 
        def handleKey(self, key):
                selection = self.getCurrent()
-               if selection[1].enabled:
+               if selection and selection[1].enabled:
                        selection[1].handleKey(key)
                        self.invalidateCurrent()
                        if self.help_window:
                                self.help_window.update(selection[1])
-               if key not in [KEY_TIMEOUT, KEY_LEFT, KEY_RIGHT, KEY_DELETE, KEY_OK]:
-                       self.timer.start(1000, 1)
+                       if key not in [KEY_TIMEOUT, KEY_LEFT, KEY_RIGHT, KEY_DELETE, KEY_OK]:
+                               self.timer.start(1000, 1)
 
        def getCurrent(self):
                return self.l.getCurrentSelection()
        
        def invalidateCurrent(self):
                self.l.invalidateEntry(self.l.getCurrentSelectionIndex())
-               
+
        def invalidate(self, entry):
-               self.l.invalidateEntry(self.__list.index(entry))
+               # when the entry to invalidate does not exist, just ignore the request.
+               # this eases up conditional setup screens a lot.
+               if entry in self.__list:
+                       self.l.invalidateEntry(self.__list.index(entry))
 
        GUI_WIDGET = eListbox
        
@@ -70,10 +77,15 @@ class ConfigList(HTMLComponent, GUIComponent, object):
        def preWidgetRemove(self, instance):
                instance.selectionChanged.get().remove(self.selectionChanged)
        
-       def setList(self, list):
-               self.__list = list
+       def setList(self, l):
+               self.timer.stop()
+               self.__list = l
                self.l.setList(self.__list)
 
+               if l is not None:
+                       for x in l:
+                               assert isinstance(x[1], ConfigElement), "entry in ConfigList " + str(x[1]) + " must be a ConfigElement"
+
        def getList(self):
                return self.__list
 
@@ -83,7 +95,7 @@ class ConfigList(HTMLComponent, GUIComponent, object):
                self.handleKey(KEY_TIMEOUT)
 
 class ConfigListScreen:
-       def __init__(self, list, session = None):
+       def __init__(self, list, session = None, on_change = None):
                self["config_actions"] = NumberActionMap(["SetupActions", "TextInputActions"],
                {
                        "ok": self.keyOK,
@@ -101,20 +113,29 @@ class ConfigListScreen:
                        "9": self.keyNumberGlobal,
                        "0": self.keyNumberGlobal
                }, -1) # to prevent left/right overriding the listbox
-
+               
                self["config"] = ConfigList(list, session = session)
+               if on_change is not None:
+                       self.__changed = on_change
+               else:
+                       self.__changed = lambda: None
 
        def keyOK(self):
                self["config"].handleKey(KEY_OK)
 
        def keyLeft(self):
                self["config"].handleKey(KEY_LEFT)
+               self.__changed()
 
        def keyRight(self):
                self["config"].handleKey(KEY_RIGHT)
+               self.__changed()
 
        def keyDelete(self):
                self["config"].handleKey(KEY_DELETE)
+               self.__changed()
 
        def keyNumberGlobal(self, number):
                self["config"].handleKey(KEY_0 + number)
+               self.__changed()
+