text edit patch #5 by Anders Holst

[vuplus_dvbapp] / lib / python / Screens / InputBox.py

diff --git a/lib/python/Screens/InputBox.py b/lib/python/Screens/InputBox.py
index bb8b63d..16fadf3 100644 (file)
--- a/lib/python/Screens/InputBox.py
+++ b/lib/python/Screens/InputBox.py
@@ -1,15 +1,12 @@
-from enigma import *
+from enigma import eRCInput, getPrevAsciiCode

 from Screens.Screen import Screen
 from Screens.MessageBox import MessageBox
 from Components.ActionMap import NumberActionMap
 from Components.Label import Label
 from Components.Input import Input
 from Screens.Screen import Screen
 from Screens.MessageBox import MessageBox
 from Components.ActionMap import NumberActionMap
 from Components.Label import Label
 from Components.Input import Input

-from Components.GUIComponent import *

 from Tools.BoundFunction import boundFunction
 from time import time
 
 from Tools.BoundFunction import boundFunction
 from time import time
 

-import os
-

 class InputBox(Screen):
        def __init__(self, session, title = "", windowTitle = _("Input"), **kwargs):
                Screen.__init__(self, session)
 class InputBox(Screen):
        def __init__(self, session, title = "", windowTitle = _("Input"), **kwargs):
                Screen.__init__(self, session)


@@ -25,16 +22,12 @@ class InputBox(Screen):
                        "back": self.cancel,
                        "left": self.keyLeft,
                        "right": self.keyRight,
                        "back": self.cancel,
                        "left": self.keyLeft,
                        "right": self.keyRight,

-                       "delete": self.keyDelete,
-                       "moveLeft": self.keyLeft,
-                       "moveRight": self.keyRight,
-                       "moveHome": self.keyHome,
-                       "moveEnd": self.keyEnd,
+                       "home": self.keyHome,
+                       "end": self.keyEnd,

                        "deleteForward": self.keyDelete,
                        "deleteBackward": self.keyBackspace,
                        "tab": self.keyTab,
                        "toggleOverwrite": self.keyInsert,
                        "deleteForward": self.keyDelete,
                        "deleteBackward": self.keyBackspace,
                        "tab": self.keyTab,
                        "toggleOverwrite": self.keyInsert,

-                       "accept": self.go,

                        "1": self.keyNumberGlobal,
                        "2": self.keyNumberGlobal,
                        "3": self.keyNumberGlobal,
                        "1": self.keyNumberGlobal,
                        "2": self.keyNumberGlobal,
                        "3": self.keyNumberGlobal,


@@ -46,8 +39,9 @@ class InputBox(Screen):
                        "9": self.keyNumberGlobal,
                        "0": self.keyNumberGlobal
                }, -1)
                        "9": self.keyNumberGlobal,
                        "0": self.keyNumberGlobal
                }, -1)

-               rcinput = eRCInput.getInstance()
-               rcinput.setKeyboardMode(rcinput.kmAscii)
+               if self["input"].type == Input.TEXT:
+                       rcinput = eRCInput.getInstance()
+                       rcinput.setKeyboardMode(rcinput.kmAscii)

 
        def gotAsciiCode(self):
                self["input"].handleAscii(getPrevAsciiCode())
 
        def gotAsciiCode(self):
                self["input"].handleAscii(getPrevAsciiCode())


@@ -91,7 +85,7 @@ class InputBox(Screen):
 
 class PinInput(InputBox):
        def __init__(self, session, service = "", triesEntry = None, pinList = [], *args, **kwargs):
 
 class PinInput(InputBox):
        def __init__(self, session, service = "", triesEntry = None, pinList = [], *args, **kwargs):

-               InputBox.__init__(self, session = session, text="9876", maxSize=True, type=Input.PIN, *args, **kwargs)
+               InputBox.__init__(self, session = session, text="    ", maxSize=True, type=Input.PIN, *args, **kwargs)

                
                self.waitTime = 15
                
                
                self.waitTime = 15
                


@@ -112,6 +106,13 @@ class PinInput(InputBox):
                self["tries"] = Label("")
                self.onShown.append(self.showTries)
 
                self["tries"] = Label("")
                self.onShown.append(self.showTries)
 

+       def gotAsciiCode(self):
+               if self["input"].currPos == len(self["input"]) - 1:
+                       InputBox.gotAsciiCode(self)
+                       self.go()
+               else:
+                       InputBox.gotAsciiCode(self)
+

        def keyNumberGlobal(self, number):
                if self["input"].currPos == len(self["input"]) - 1:
                        InputBox.keyNumberGlobal(self, number)
        def keyNumberGlobal(self, number):
                if self["input"].currPos == len(self["input"]) - 1:
                        InputBox.keyNumberGlobal(self, number)


@@ -120,7 +121,7 @@ class PinInput(InputBox):
                        InputBox.keyNumberGlobal(self, number)
                
        def checkPin(self, pin):
                        InputBox.keyNumberGlobal(self, number)
                
        def checkPin(self, pin):

-               if pin is not None and int(pin) in self.pinList:
+               if pin is not None and pin.find(" ") == -1 and int(pin) in self.pinList:

                        return True
                return False
                
                        return True
                return False
                


@@ -139,18 +140,22 @@ 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):

-               rcinput = eRCInput.getInstance()
-               rcinput.setKeyboardMode(rcinput.kmNone)

                self.closePinCancel()
                
        def getTries(self):
                self.closePinCancel()
                
        def getTries(self):


@@ -165,4 +170,4 @@ class PinInput(InputBox):
                self.triesEntry.tries.save()
                                
        def showTries(self):
                self.triesEntry.tries.save()
                                
        def showTries(self):

-               self["tries"].setText(_("Tries left:") + " " + str(self.getTries()))
\ No newline at end of file
+               self["tries"].setText(_("Tries left:") + " " + str(self.getTries()))