fix

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

diff --git a/lib/python/Components/ConfigList.py b/lib/python/Components/ConfigList.py
index 196381b09fc6e607465243145aeebf61e3cdde24..5b959dc2baef4dfddebefa442aa8e498cbce1627 100644 (file)
--- a/lib/python/Components/ConfigList.py
+++ b/lib/python/Components/ConfigList.py
@@ -1,16 +1,30 @@
 from HTMLComponent import *
 from GUIComponent import *
-from config import *
+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
 
-from enigma import eListbox, eListboxPythonConfigContent
-
-class ConfigList(HTMLComponent, GUIComponent):
-       def __init__(self, list):
+class ConfigList(HTMLComponent, GUIComponent, object):
+       def __init__(self, list, session = None):
                GUIComponent.__init__(self)
                self.l = eListboxPythonConfigContent()
-               self.l.setList(list)
                self.l.setSeperation(100)
-       
+               self.timer = eTimer()
+               self.timer.timeout.get().append(self.timeout)
+               self.list = list
+               self.onSelectionChanged = [ ]
+               self.current = None
+               self.help_window = None
+               self.setHelpWindowSession(session)
+
+       def execEnd(self):
+               self.timer = eTimer()
+               self.timer.timeout.get().append(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
+
        def toggle(self):
                selection = self.getCurrent()
                selection[1].toggle()
@@ -18,20 +32,97 @@ class ConfigList(HTMLComponent, GUIComponent):
 
        def handleKey(self, key):
                selection = self.getCurrent()
-               selection[1].handleKey(key)
-               self.invalidateCurrent()
-       
+               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)
+
        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))
+
+       GUI_WIDGET = eListbox
        
-       def GUIcreate(self, parent):
-               self.instance = eListbox(parent)
-               self.instance.setContent(self.l)
+       def selectionChanged(self):
+               n = self.getCurrent()
+               
+               if self.help_window:
+                       self.session.deleteDialog(self.help_window)
+               
+               nh = n and n[1].helpWindow()
+               if nh is not None and self.session is not None:
+                       self.help_window = self.session.instantiateDialog(*nh)
+                       self.help_window.show()
+
+               self.current = n
+               for x in self.onSelectionChanged:
+                       x()
+
+       def postWidgetCreate(self, instance):
+               instance.setContent(self.l)
+               instance.selectionChanged.get().append(self.selectionChanged)
        
-       def GUIdelete(self):
-               self.instance.setContent(None)
-               self.instance = None
+       def preWidgetRemove(self, instance):
+               instance.selectionChanged.get().remove(self.selectionChanged)
+       
+       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
+
+       list = property(getList, setList)
+
+       def timeout(self):
+               self.handleKey(KEY_TIMEOUT)
+
+class ConfigListScreen:
+       def __init__(self, list, session = None):
+               self["config_actions"] = NumberActionMap(["SetupActions", "TextInputActions"],
+               {
+                       "ok": self.keyOK,
+                       "left": self.keyLeft,
+                       "right": self.keyRight,
+                       "delete": self.keyDelete,
+                       "1": self.keyNumberGlobal,
+                       "2": self.keyNumberGlobal,
+                       "3": self.keyNumberGlobal,
+                       "4": self.keyNumberGlobal,
+                       "5": self.keyNumberGlobal,
+                       "6": self.keyNumberGlobal,
+                       "7": self.keyNumberGlobal,
+                       "8": self.keyNumberGlobal,
+                       "9": self.keyNumberGlobal,
+                       "0": self.keyNumberGlobal
+               }, -1) # to prevent left/right overriding the listbox
+               
+               self["config"] = ConfigList(list, session = session)
+
+       def keyOK(self):
+               self["config"].handleKey(KEY_OK)
+
+       def keyLeft(self):
+               self["config"].handleKey(KEY_LEFT)
+
+       def keyRight(self):
+               self["config"].handleKey(KEY_RIGHT)
+
+       def keyDelete(self):
+               self["config"].handleKey(KEY_DELETE)
 
+       def keyNumberGlobal(self, number):
+               self["config"].handleKey(KEY_0 + number)