git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add support for cyclic garbage collection to eTimer and eSocketNotifier
[enigma2.git]
/
lib
/
python
/
Components
/
ConfigList.py
diff --git
a/lib/python/Components/ConfigList.py
b/lib/python/Components/ConfigList.py
index a54d27b1fbe750bf2721f5a2e1525decf45d3558..d1b295baedff92dceff541a19474f26e0f4aca25 100644
(file)
--- a/
lib/python/Components/ConfigList.py
+++ b/
lib/python/Components/ConfigList.py
@@
-14,23
+14,18
@@
class ConfigList(HTMLComponent, GUIComponent, object):
self.list = list
self.onSelectionChanged = [ ]
self.current = None
self.list = list
self.onSelectionChanged = [ ]
self.current = None
- self.help_window = None
- self.setHelpWindowSession(session)
+ self.session = session
def execBegin(self):
rcinput = eRCInput.getInstance()
rcinput.setKeyboardMode(rcinput.kmAscii)
def execBegin(self):
rcinput = eRCInput.getInstance()
rcinput.setKeyboardMode(rcinput.kmAscii)
- self.timer.
timeout.get()
.append(self.timeout)
+ self.timer.
callback
.append(self.timeout)
def execEnd(self):
rcinput = eRCInput.getInstance()
rcinput.setKeyboardMode(rcinput.kmNone)
self.timer.timeout.get().remove(self.timeout)
def execEnd(self):
rcinput = eRCInput.getInstance()
rcinput.setKeyboardMode(rcinput.kmNone)
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 toggle(self):
selection = self.getCurrent()
selection[1].toggle()
def toggle(self):
selection = self.getCurrent()
selection[1].toggle()
@@
-41,8
+36,6
@@
class ConfigList(HTMLComponent, GUIComponent, object):
if selection and selection[1].enabled:
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 in KEY_NUMBERS:
self.timer.start(1000, 1)
if key in KEY_NUMBERS:
self.timer.start(1000, 1)
@@
-68,25
+61,21
@@
class ConfigList(HTMLComponent, GUIComponent, object):
GUI_WIDGET = eListbox
def selectionChanged(self):
GUI_WIDGET = eListbox
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
+ if self.current:
+ self.current[1].onDeselect(self.session)
+ self.current = self.getCurrent()
+ if self.current:
+ self.current[1].onSelect(self.session)
for x in self.onSelectionChanged:
x()
def postWidgetCreate(self, instance):
for x in self.onSelectionChanged:
x()
def postWidgetCreate(self, instance):
- instance.setContent(self.l)
instance.selectionChanged.get().append(self.selectionChanged)
instance.selectionChanged.get().append(self.selectionChanged)
+ instance.setContent(self.l)
def preWidgetRemove(self, instance):
def preWidgetRemove(self, instance):
+ if self.current:
+ self.current[1].onDeselect(self.session)
instance.selectionChanged.get().remove(self.selectionChanged)
def setList(self, l):
instance.selectionChanged.get().remove(self.selectionChanged)
def setList(self, l):
@@
-119,13
+108,10
@@
class ConfigListScreen:
{
"gotAsciiCode": self.keyGotAscii,
"ok": self.keyOK,
{
"gotAsciiCode": self.keyGotAscii,
"ok": self.keyOK,
- "accept": self.keyOK,
"left": self.keyLeft,
"right": self.keyRight,
"left": self.keyLeft,
"right": self.keyRight,
- "moveLeft": self.keyLeft,
- "moveRight": self.keyRight,
- "moveHome": self.keyHome,
- "moveEnd": self.keyEnd,
+ "home": self.keyHome,
+ "end": self.keyEnd,
"deleteForward": self.keyDelete,
"deleteBackward": self.keyBackspace,
"toggleOverwrite": self.keyToggleOW,
"deleteForward": self.keyDelete,
"deleteBackward": self.keyBackspace,
"toggleOverwrite": self.keyToggleOW,