X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/fb9f72903bf23e2b9a63e882398c12dbb6d495f0..348cf0e4d7fa1e615635984c9325fc0e8fa4e72b:/lib/python/Screens/InputBox.py

diff --git a/lib/python/Screens/InputBox.py b/lib/python/Screens/InputBox.py
index 43b8a8b8..7dd7b127 100644
--- a/lib/python/Screens/InputBox.py
+++ b/lib/python/Screens/InputBox.py
@@ -8,12 +8,14 @@ from Tools.BoundFunction import boundFunction
 from time import time
 
 class InputBox(Screen):
-	def __init__(self, session, title = "", windowTitle = _("Input"), **kwargs):
+	def __init__(self, session, title = "", windowTitle = _("Input"), useableChars = None, **kwargs):
 		Screen.__init__(self, session)
 
 		self["text"] = Label(title)
 		self["input"] = Input(**kwargs)
 		self.onShown.append(boundFunction(self.setTitle, windowTitle))
+		if useableChars is not None:
+			self["input"].setUseableChars(useableChars)
 
 		self["actions"] = NumberActionMap(["WizardActions", "InputBoxActions", "InputAsciiActions", "KeyboardInputActions"], 
 		{
@@ -39,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())
@@ -59,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):
@@ -140,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):