git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix
[enigma2.git]
/
lib
/
python
/
Components
/
ConfigList.py
diff --git
a/lib/python/Components/ConfigList.py
b/lib/python/Components/ConfigList.py
index dc10045caa58af1487283680bf139143cde97650..5b959dc2baef4dfddebefa442aa8e498cbce1627 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
@@
-9,15
+9,18
@@
class ConfigList(HTMLComponent, GUIComponent, object):
GUIComponent.__init__(self)
self.l = eListboxPythonConfigContent()
self.l.setSeperation(100)
GUIComponent.__init__(self)
self.l = eListboxPythonConfigContent()
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)
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)
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 setHelpWindowSession(self, session):
assert self.help_window is None, "you can't move a help window to another session"
self.session = session
@@
-29,13
+32,13
@@
class ConfigList(HTMLComponent, GUIComponent, object):
def handleKey(self, key):
selection = self.getCurrent()
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])
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 getCurrent(self):
return self.l.getCurrentSelection()
@@
-70,10
+73,15
@@
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, list):
- self.__list = list
+ def setList(self, l):
+ self.timer.stop()
+ 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
@@
-101,7
+109,7
@@
class ConfigListScreen:
"9": self.keyNumberGlobal,
"0": self.keyNumberGlobal
}, -1) # to prevent left/right overriding the listbox
"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"] = ConfigList(list, session = session)
def keyOK(self):