X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/76ab06c06bdf77f0b0cecd225367862ef0de0d2f..10db7be1b01656e6c5dec4954841ea803b73b884:/lib/python/Components/ConfigList.py diff --git a/lib/python/Components/ConfigList.py b/lib/python/Components/ConfigList.py old mode 100644 new mode 100755 index a54d27b1..418a1b67 --- a/lib/python/Components/ConfigList.py +++ b/lib/python/Components/ConfigList.py @@ -1,7 +1,7 @@ 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 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, ConfigText, ConfigPassword +from Components.ActionMap import NumberActionMap, ActionMap from enigma import eListbox, eListboxPythonConfigContent, eRCInput, eTimer from Screens.MessageBox import MessageBox @@ -9,27 +9,22 @@ class ConfigList(HTMLComponent, GUIComponent, object): def __init__(self, list, session = None): GUIComponent.__init__(self) self.l = eListboxPythonConfigContent() - self.l.setSeperation(100) + self.l.setSeperation(200) self.timer = eTimer() 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) - 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 setHelpWindowSession(self, session): - assert self.help_window is None, "you can't move a help window to another session" - self.session = session + self.timer.callback.remove(self.timeout) def toggle(self): selection = self.getCurrent() @@ -41,8 +36,6 @@ class ConfigList(HTMLComponent, GUIComponent, object): 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) @@ -68,26 +61,24 @@ class ConfigList(HTMLComponent, GUIComponent, object): 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() + if self.current: + self.current[1].onDeselect(self.session) + self.current = self.getCurrent() + if self.current: + self.current[1].onSelect(self.session) - self.current = n for x in self.onSelectionChanged: x() def postWidgetCreate(self, instance): - instance.setContent(self.l) instance.selectionChanged.get().append(self.selectionChanged) + instance.setContent(self.l) def preWidgetRemove(self, instance): + if self.current: + self.current[1].onDeselect(self.session) instance.selectionChanged.get().remove(self.selectionChanged) + instance.setContent(None) def setList(self, l): self.timer.stop() @@ -119,13 +110,10 @@ class ConfigListScreen: { "gotAsciiCode": self.keyGotAscii, "ok": self.keyOK, - "accept": self.keyOK, "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, @@ -140,13 +128,52 @@ class ConfigListScreen: "9": self.keyNumberGlobal, "0": self.keyNumberGlobal }, -1) # to prevent left/right overriding the listbox + + self["VirtualKB"] = ActionMap(["VirtualKeyboardActions"], + { + "showVirtualKeyboard": self.KeyText, + }, -2) + self["VirtualKB"].setEnabled(False) self["config"] = ConfigList(list, session = session) + if on_change is not None: self.__changed = on_change else: self.__changed = lambda: None - + + if not self.handleInputHelpers in self["config"].onSelectionChanged: + self["config"].onSelectionChanged.append(self.handleInputHelpers) + + def handleInputHelpers(self): + if self["config"].getCurrent() is not None: + if isinstance(self["config"].getCurrent()[1], ConfigText) or isinstance(self["config"].getCurrent()[1], ConfigPassword): + if self.has_key("VKeyIcon"): + self["VirtualKB"].setEnabled(True) + self["VKeyIcon"].boolean = True + if self.has_key("HelpWindow"): + if self["config"].getCurrent()[1].help_window.instance is not None: + helpwindowpos = self["HelpWindow"].getPosition() + from enigma import ePoint + self["config"].getCurrent()[1].help_window.instance.move(ePoint(helpwindowpos[0],helpwindowpos[1])) + else: + if self.has_key("VKeyIcon"): + self["VirtualKB"].setEnabled(False) + self["VKeyIcon"].boolean = False + else: + if self.has_key("VKeyIcon"): + self["VirtualKB"].setEnabled(False) + self["VKeyIcon"].boolean = False + + def KeyText(self): + from Screens.VirtualKeyBoard import VirtualKeyBoard + self.session.openWithCallback(self.VirtualKeyBoardCallback, VirtualKeyBoard, title = self["config"].getCurrent()[0], text = self["config"].getCurrent()[1].getValue()) + + def VirtualKeyBoardCallback(self, callback = None): + if callback is not None and len(callback): + self["config"].getCurrent()[1].setValue(callback) + self["config"].invalidate(self["config"].getCurrent()) + def keyOK(self): self["config"].handleKey(KEY_OK) @@ -185,12 +212,15 @@ class ConfigListScreen: def keyNumberGlobal(self, number): self["config"].handleKey(KEY_0 + number) self.__changed() + + def saveAll(self): + for x in self["config"].list: + x[1].save() # 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.saveAll() self.close() def cancelConfirm(self, result):