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 typo
[enigma2.git]
/
lib
/
python
/
Components
/
ConfigList.py
diff --git
a/lib/python/Components/ConfigList.py
b/lib/python/Components/ConfigList.py
index 8b880fba2728bcda81e89f7df2910f63f38c782d..a54d27b1fbe750bf2721f5a2e1525decf45d3558 100644
(file)
--- a/
lib/python/Components/ConfigList.py
+++ b/
lib/python/Components/ConfigList.py
@@
-1,8
+1,8
@@
-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, e
RCInput, e
Timer
from Screens.MessageBox import MessageBox
class ConfigList(HTMLComponent, GUIComponent, object):
from Screens.MessageBox import MessageBox
class ConfigList(HTMLComponent, GUIComponent, object):
@@
-18,9
+18,13
@@
class ConfigList(HTMLComponent, GUIComponent, object):
self.setHelpWindowSession(session)
def execBegin(self):
self.setHelpWindowSession(session)
def execBegin(self):
+ rcinput = eRCInput.getInstance()
+ rcinput.setKeyboardMode(rcinput.kmAscii)
self.timer.timeout.get().append(self.timeout)
def execEnd(self):
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):
self.timer.timeout.get().remove(self.timeout)
def setHelpWindowSession(self, session):
@@
-39,12
+43,19
@@
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())
@@
-104,12
+115,20
@@
class ConfigList(HTMLComponent, GUIComponent, object):
class ConfigListScreen:
def __init__(self, list, session = None, on_change = None):
class ConfigListScreen:
def __init__(self, list, session = None, on_change = None):
- self["config_actions"] = NumberActionMap(["SetupActions", "
Text
InputActions"],
+ 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,
@@
-139,10
+158,30
@@
class ConfigListScreen:
self["config"].handleKey(KEY_RIGHT)
self.__changed()
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)
self.__changed()
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)
self.__changed()
def keyNumberGlobal(self, number):
self["config"].handleKey(KEY_0 + number)
self.__changed()