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 'layers' (in buffered mode, which is not working at the moment).
[enigma2.git]
/
lib
/
python
/
Components
/
ConfigList.py
diff --git
a/lib/python/Components/ConfigList.py
b/lib/python/Components/ConfigList.py
index 5b959dc2baef4dfddebefa442aa8e498cbce1627..a54d27b1fbe750bf2721f5a2e1525decf45d3558 100644
(file)
--- a/
lib/python/Components/ConfigList.py
+++ b/
lib/python/Components/ConfigList.py
@@
-1,8
+1,9
@@
-from HTMLComponent import
*
-from GUIComponent import
*
-from config import KEY_LEFT, KEY_RIGHT, KEY_
0, KEY_DELETE, KEY_OK, KEY_TIMEOUT
, ConfigElement
+from HTMLComponent import
HTMLComponent
+from GUIComponent import
GUIComponent
+from config import KEY_LEFT, KEY_RIGHT, KEY_
HOME, KEY_END, KEY_0, KEY_DELETE, KEY_BACKSPACE, KEY_OK, KEY_TOGGLEOW, KEY_ASCII, KEY_TIMEOUT, KEY_NUMBERS
, ConfigElement
from Components.ActionMap import NumberActionMap
from Components.ActionMap import NumberActionMap
-from enigma import eListbox, eListboxPythonConfigContent, eTimer
+from enigma import eListbox, eListboxPythonConfigContent, eRCInput, eTimer
+from Screens.MessageBox import MessageBox
class ConfigList(HTMLComponent, GUIComponent, object):
def __init__(self, list, session = None):
class ConfigList(HTMLComponent, GUIComponent, object):
def __init__(self, list, session = None):
@@
-10,17
+11,22
@@
class ConfigList(HTMLComponent, GUIComponent, object):
self.l = eListboxPythonConfigContent()
self.l.setSeperation(100)
self.timer = eTimer()
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()
+ def execBegin(self):
+ rcinput = eRCInput.getInstance()
+ rcinput.setKeyboardMode(rcinput.kmAscii)
self.timer.timeout.get().append(self.timeout)
self.timer.timeout.get().append(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 setHelpWindowSession(self, session):
assert self.help_window is None, "you can't move a help window to another session"
self.session = session
@@
-37,17
+43,27
@@
class ConfigList(HTMLComponent, GUIComponent, object):
self.invalidateCurrent()
if self.help_window:
self.help_window.update(selection[1])
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]
:
+ if key
in KEY_NUMBERS
:
self.timer.start(1000, 1)
def getCurrent(self):
return self.l.getCurrentSelection()
self.timer.start(1000, 1)
def getCurrent(self):
return self.l.getCurrentSelection()
+ def getCurrentIndex(self):
+ return self.l.getCurrentSelectionIndex()
+
+ def setCurrentIndex(self, index):
+ if self.instance is not None:
+ self.instance.moveSelectionTo(index)
+
def invalidateCurrent(self):
self.l.invalidateEntry(self.l.getCurrentSelectionIndex())
def invalidateCurrent(self):
self.l.invalidateEntry(self.l.getCurrentSelectionIndex())
-
+
def invalidate(self, entry):
def invalidate(self, entry):
- self.l.invalidateEntry(self.__list.index(entry))
+ # when the entry to invalidate does not exist, just ignore the request.
+ # this eases up conditional setup screens a lot.
+ if entry in self.__list:
+ self.l.invalidateEntry(self.__list.index(entry))
GUI_WIDGET = eListbox
GUI_WIDGET = eListbox
@@
-90,14
+106,29
@@
class ConfigList(HTMLComponent, GUIComponent, object):
def timeout(self):
self.handleKey(KEY_TIMEOUT)
def timeout(self):
self.handleKey(KEY_TIMEOUT)
+ def isChanged(self):
+ is_changed = False
+ for x in self.list:
+ is_changed |= x[1].isChanged()
+
+ return is_changed
+
class ConfigListScreen:
class ConfigListScreen:
- def __init__(self, list, session = None):
- self["config_actions"] = NumberActionMap(["SetupActions", "
Text
InputActions"],
+ def __init__(self, list, session = None
, on_change = None
):
+ self["config_actions"] = NumberActionMap(["SetupActions", "
InputAsciiActions", "Keyboard
InputActions"],
{
{
+ "gotAsciiCode": self.keyGotAscii,
"ok": self.keyOK,
"ok": self.keyOK,
+ "accept": self.keyOK,
"left": self.keyLeft,
"right": self.keyRight,
"left": self.keyLeft,
"right": self.keyRight,
- "delete": self.keyDelete,
+ "moveLeft": self.keyLeft,
+ "moveRight": self.keyRight,
+ "moveHome": self.keyHome,
+ "moveEnd": self.keyEnd,
+ "deleteForward": self.keyDelete,
+ "deleteBackward": self.keyBackspace,
+ "toggleOverwrite": self.keyToggleOW,
"1": self.keyNumberGlobal,
"2": self.keyNumberGlobal,
"3": self.keyNumberGlobal,
"1": self.keyNumberGlobal,
"2": self.keyNumberGlobal,
"3": self.keyNumberGlobal,
@@
-111,18
+142,67
@@
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 keyHome(self):
+ self["config"].handleKey(KEY_HOME)
+ self.__changed()
+
+ def keyEnd(self):
+ self["config"].handleKey(KEY_END)
+ self.__changed()
def keyDelete(self):
self["config"].handleKey(KEY_DELETE)
def keyDelete(self):
self["config"].handleKey(KEY_DELETE)
+ self.__changed()
+
+ def keyBackspace(self):
+ self["config"].handleKey(KEY_BACKSPACE)
+ self.__changed()
+
+ def keyToggleOW(self):
+ self["config"].handleKey(KEY_TOGGLEOW)
+ self.__changed()
+
+ def keyGotAscii(self):
+ self["config"].handleKey(KEY_ASCII)
+ self.__changed()
def keyNumberGlobal(self, number):
self["config"].handleKey(KEY_0 + number)
def keyNumberGlobal(self, number):
self["config"].handleKey(KEY_0 + number)
+ self.__changed()
+
+ # keySave and keyCancel are just provided in case you need them.
+ # you have to call them by yourself.
+ def keySave(self):
+ for x in self["config"].list:
+ x[1].save()
+ self.close()
+
+ def cancelConfirm(self, result):
+ if not result:
+ return
+
+ for x in self["config"].list:
+ x[1].cancel()
+ self.close()
+
+ def keyCancel(self):
+ if self["config"].isChanged():
+ self.session.openWithCallback(self.cancelConfirm, MessageBox, _("Really close without saving settings?"))
+ else:
+ self.close()