diff options
| author | Andreas Oberritter <obi@opendreambox.org> | 2011-01-20 00:59:45 +0100 |
|---|---|---|
| committer | Andreas Oberritter <obi@opendreambox.org> | 2011-03-29 15:48:37 +0200 |
| commit | fb764c8e53e17bc3e1e806e946956f3e70792020 (patch) | |
| tree | c874fe43480680f5eb7eb98e5fa4201f53d1f7a8 /lib/python/Screens/InputBox.py | |
| parent | 2c5e4d6c412c1988b32cb7dbede988bc9dfb815d (diff) | |
| download | enigma2-fb764c8e53e17bc3e1e806e946956f3e70792020.tar.gz enigma2-fb764c8e53e17bc3e1e806e946956f3e70792020.zip | |
make switching of keyboard modes more consistent
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..914ab2b8 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.onShow.append(self.setKeyboardModeAscii); + else: + self.onShow.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): |