diff options
| author | Mladen Horvat <acid-burn@opendreambox.org> | 2011-04-13 16:17:43 +0200 |
|---|---|---|
| committer | Mladen Horvat <acid-burn@opendreambox.org> | 2011-04-13 16:17:43 +0200 |
| commit | 8a21c8eebc037850431ac627061e46e48e93a0ec (patch) | |
| tree | 16ea09f5e26546a98106bbf044575894037aa6e5 /lib/python/Screens/InputBox.py | |
| parent | c3c412e8765520205b7cf8413ddf8abca74f1bc3 (diff) | |
| parent | 348cf0e4d7fa1e615635984c9325fc0e8fa4e72b (diff) | |
| download | enigma2-8a21c8eebc037850431ac627061e46e48e93a0ec.tar.gz enigma2-8a21c8eebc037850431ac627061e46e48e93a0ec.zip | |
Merge branch 'master' of git.opendreambox.org:/git/enigma2 into acid-burn/network_changes_next
Diffstat (limited to 'lib/python/Screens/InputBox.py')
| -rw-r--r-- | lib/python/Screens/InputBox.py | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/lib/python/Screens/InputBox.py b/lib/python/Screens/InputBox.py index 61ce356a..7dd7b127 100644 --- a/lib/python/Screens/InputBox.py +++ b/lib/python/Screens/InputBox.py @@ -41,9 +41,11 @@ class InputBox(Screen): "9": self.keyNumberGlobal, "0": self.keyNumberGlobal }, -1) + if self["input"].type == Input.TEXT: - rcinput = eRCInput.getInstance() - rcinput.setKeyboardMode(rcinput.kmAscii) + self.onExecBegin.append(self.setKeyboardModeAscii) + else: + self.onExecBegin.append(self.setKeyboardModeNone) def gotAsciiCode(self): self["input"].handleAscii(getPrevAsciiCode()) @@ -61,13 +63,9 @@ class InputBox(Screen): self["input"].delete() def go(self): - rcinput = eRCInput.getInstance() - rcinput.setKeyboardMode(rcinput.kmNone) self.close(self["input"].getText()) def cancel(self): - rcinput = eRCInput.getInstance() - rcinput.setKeyboardMode(rcinput.kmNone) self.close(None) def keyHome(self): @@ -142,19 +140,13 @@ class PinInput(InputBox): pass def closePinWrong(self, *args): - rcinput = eRCInput.getInstance() - rcinput.setKeyboardMode(rcinput.kmNone) print "args:", args self.close(False) def closePinCorrect(self, *args): - rcinput = eRCInput.getInstance() - rcinput.setKeyboardMode(rcinput.kmNone) self.close(True) def closePinCancel(self, *args): - rcinput = eRCInput.getInstance() - rcinput.setKeyboardMode(rcinput.kmNone) self.close(None) def cancel(self): |