git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
getConfigListEntry now supports more than two arguments
[enigma2.git]
/
lib
/
python
/
Components
/
ConfigList.py
diff --git
a/lib/python/Components/ConfigList.py
b/lib/python/Components/ConfigList.py
index c93b10f703e5ac4f2491daad2002875277dd9a0f..2de075c62f07044cda85e6ea2869658505b6cca9 100644
(file)
--- a/
lib/python/Components/ConfigList.py
+++ b/
lib/python/Components/ConfigList.py
@@
-9,15
+9,19
@@
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.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)
-
- self.timer = eTimer()
+
+ def execBegin(self):
self.timer.timeout.get().append(self.timeout)
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
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
+33,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()
@@
-71,6
+75,7
@@
class ConfigList(HTMLComponent, GUIComponent, object):
instance.selectionChanged.get().remove(self.selectionChanged)
def setList(self, l):
instance.selectionChanged.get().remove(self.selectionChanged)
def setList(self, l):
+ self.timer.stop()
self.__list = l
self.l.setList(self.__list)
self.__list = l
self.l.setList(self.__list)
@@
-87,7
+92,7
@@
class ConfigList(HTMLComponent, GUIComponent, object):
self.handleKey(KEY_TIMEOUT)
class ConfigListScreen:
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,
self["config_actions"] = NumberActionMap(["SetupActions", "TextInputActions"],
{
"ok": self.keyOK,
@@
-107,18
+112,27
@@
class ConfigListScreen:
}, -1) # to prevent left/right overriding the listbox
self["config"] = ConfigList(list, session = session)
}, -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)
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)
def keyRight(self):
self["config"].handleKey(KEY_RIGHT)
+ self.__changed()
def keyDelete(self):
self["config"].handleKey(KEY_DELETE)
def keyDelete(self):
self["config"].handleKey(KEY_DELETE)
+ self.__changed()
def keyNumberGlobal(self, number):
self["config"].handleKey(KEY_0 + number)
def keyNumberGlobal(self, number):
self["config"].handleKey(KEY_0 + number)
+ self.__changed()
+