git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make switching of keyboard modes more consistent
[enigma2.git]
/
lib
/
python
/
Screens
/
InputBox.py
diff --git
a/lib/python/Screens/InputBox.py
b/lib/python/Screens/InputBox.py
index 61ce356aa724aa32cee7a8acabe7a80805d74137..914ab2b83ff31ceb8dc9b17f0b930d5ac8e5fe07 100644
(file)
--- 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)
"9": self.keyNumberGlobal,
"0": self.keyNumberGlobal
}, -1)
+
if self["input"].type == Input.TEXT:
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())
def gotAsciiCode(self):
self["input"].handleAscii(getPrevAsciiCode())
@@
-61,13
+63,9
@@
class InputBox(Screen):
self["input"].delete()
def go(self):
self["input"].delete()
def go(self):
- rcinput = eRCInput.getInstance()
- rcinput.setKeyboardMode(rcinput.kmNone)
self.close(self["input"].getText())
def cancel(self):
self.close(self["input"].getText())
def cancel(self):
- rcinput = eRCInput.getInstance()
- rcinput.setKeyboardMode(rcinput.kmNone)
self.close(None)
def keyHome(self):
self.close(None)
def keyHome(self):
@@
-142,19
+140,13
@@
class PinInput(InputBox):
pass
def closePinWrong(self, *args):
pass
def closePinWrong(self, *args):
- rcinput = eRCInput.getInstance()
- rcinput.setKeyboardMode(rcinput.kmNone)
print "args:", args
self.close(False)
def closePinCorrect(self, *args):
print "args:", args
self.close(False)
def closePinCorrect(self, *args):
- rcinput = eRCInput.getInstance()
- rcinput.setKeyboardMode(rcinput.kmNone)
self.close(True)
def closePinCancel(self, *args):
self.close(True)
def closePinCancel(self, *args):
- rcinput = eRCInput.getInstance()
- rcinput.setKeyboardMode(rcinput.kmNone)
self.close(None)
def cancel(self):
self.close(None)
def cancel(self):