git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
verify that ConfigList entries are ConfigElements
[enigma2.git]
/
lib
/
python
/
Components
/
ConfigList.py
diff --git
a/lib/python/Components/ConfigList.py
b/lib/python/Components/ConfigList.py
index 883a1ea4c7959ed06f1cf7b744fcfc0a5bb4b195..c93b10f703e5ac4f2491daad2002875277dd9a0f 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 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
from Components.ActionMap import NumberActionMap
from enigma import eListbox, eListboxPythonConfigContent, eTimer
@@
-70,10
+70,14
@@
class ConfigList(HTMLComponent, GUIComponent, object):
def preWidgetRemove(self, instance):
instance.selectionChanged.get().remove(self.selectionChanged)
def preWidgetRemove(self, instance):
instance.selectionChanged.get().remove(self.selectionChanged)
- def setList(self, l
ist
):
- self.__list = l
ist
+ def setList(self, l):
+ self.__list = l
self.l.setList(self.__list)
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
def getList(self):
return self.__list
@@
-100,8
+104,8
@@
class ConfigListScreen:
"8": self.keyNumberGlobal,
"9": self.keyNumberGlobal,
"0": self.keyNumberGlobal
"8": self.keyNumberGlobal,
"9": self.keyNumberGlobal,
"0": self.keyNumberGlobal
- },
5)
-
+ },
-1) # to prevent left/right overriding the listbox
+
self["config"] = ConfigList(list, session = session)
def keyOK(self):
self["config"] = ConfigList(list, session = session)
def keyOK(self):