From fb764c8e53e17bc3e1e806e946956f3e70792020 Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Thu, 20 Jan 2011 00:59:45 +0100 Subject: make switching of keyboard modes more consistent --- lib/python/Screens/InputBox.py | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'lib/python/Screens/InputBox.py') 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): -- cgit v1.2.3