fix off-by-one error on the progress and fix vars in ToolExistsPrecondition

[enigma2.git] / lib / python / Tools / NumericalTextInput.py

diff --git a/lib/python/Tools/NumericalTextInput.py b/lib/python/Tools/NumericalTextInput.py
index 7c61d263439920334e2f1698b64fcef5135633aa..696b8e209b9c910d6f3eed22e025044555aae6e0 100644 (file)
--- a/lib/python/Tools/NumericalTextInput.py
+++ b/lib/python/Tools/NumericalTextInput.py
@@ -1,4 +1,4 @@
-# -*- coding: latin-1 -*-
+# -*- coding: iso-8859-1 -*-
 from enigma import eTimer
 from Components.Language import language
 
@@ -31,6 +31,17 @@ class NumericalTextInput:
                        self.mapping.append (u"pqrs7PQRS") # 7
                        self.mapping.append (u"tuvúù8TUVÚÙ") # 8
                        self.mapping.append (u"wxyz9WXYZ") # 9
+               if self.lang in ['sv_SE', 'fi_FI']:
+                       self.mapping.append (u".,?'\"0-()@/:_") # 0
+                       self.mapping.append (u" 1") # 1
+                       self.mapping.append (u"abcåä2ABCÅÄ") # 2
+                       self.mapping.append (u"defé3DEFÉ") # 3
+                       self.mapping.append (u"ghi4GHI") # 4
+                       self.mapping.append (u"jkl5JKL") # 5
+                       self.mapping.append (u"mnoö6MNOÖ") # 6
+                       self.mapping.append (u"pqrs7PQRS") # 7
+                       self.mapping.append (u"tuv8TUV") # 8
+                       self.mapping.append (u"wxyz9WXYZ") # 9
                else:
                        self.mapping.append (u".,?'\"0-()@/:_") # 0
                        self.mapping.append (u" 1") # 1
@@ -45,7 +56,7 @@ class NumericalTextInput:
 
                if handleTimeout:
                        self.timer = eTimer()
-                       self.timer.timeout.get().append(self.timeout)
+                       self.timer.callback.append(self.timeout)
                else:
                        self.timer = None
                self.lastKey = -1
@@ -56,11 +67,13 @@ class NumericalTextInput:
 
        def getKey(self, num):
                cnt=0
-               if self.timer is not None:
-                       self.timer.start(1000, True)
                if self.lastKey != num:
+                       if self.lastKey != -1:
+                               self.nextChar()
                        self.lastKey = num
                        self.pos = -1
+               if self.timer is not None:
+                       self.timer.start(1000, True)
                while True:
                        self.pos += 1
                        if len(self.mapping[num]) <= self.pos:
@@ -87,4 +100,5 @@ class NumericalTextInput:
                        self.nextFunction()
 
        def timeout(self):
-               self.nextChar()
+               if self.lastKey != -1:
+                       self.nextChar()