From 22e4755ccb4820da1a50c7301951978dc45eaab3 Mon Sep 17 00:00:00 2001
From: Fraxinas <andreas.frisch@multimedia-labs.de>
Date: Mon, 8 Dec 2008 13:43:31 +0100
Subject: add search parameter for NumericalTextInput which supplies a mapping
 with only lowercase and standard ascii characters plus number plus SQL
 wildcards

---
 lib/python/Tools/NumericalTextInput.py | 33 +++++++++++++++++++++++----------
 1 file changed, 23 insertions(+), 10 deletions(-)

(limited to 'lib/python/Tools/NumericalTextInput.py')

diff --git a/lib/python/Tools/NumericalTextInput.py b/lib/python/Tools/NumericalTextInput.py
index 5954c9c3..be4cf01f 100644
--- a/lib/python/Tools/NumericalTextInput.py
+++ b/lib/python/Tools/NumericalTextInput.py
@@ -3,12 +3,33 @@ from enigma import eTimer
 from Components.Language import language
 
 class NumericalTextInput:
-	def __init__(self, nextFunc=None, handleTimeout = True):
+	def __init__(self, nextFunc=None, handleTimeout = True, search = False):
 		self.mapping = []
 		self.lang = language.getLanguage()
 		self.useableChars=None
 		self.nextFunction=nextFunc
-		
+
+		if handleTimeout:
+			self.timer = eTimer()
+			self.timer.callback.append(self.timeout)
+		else:
+			self.timer = None
+		self.lastKey = -1
+		self.pos = -1
+
+		if search:
+			self.mapping.append (u"%_0") # 0
+			self.mapping.append (u" 1") # 1
+			self.mapping.append (u"abc2") # 2
+			self.mapping.append (u"def3") # 3
+			self.mapping.append (u"ghi4") # 4
+			self.mapping.append (u"jkl5") # 5
+			self.mapping.append (u"mno6") # 6
+			self.mapping.append (u"pqrs7") # 7
+			self.mapping.append (u"tuv8") # 8
+			self.mapping.append (u"wxyz9") # 9
+			return
+
 		if self.lang == 'de_DE':
 			self.mapping.append (u".,?'+\"0-()@/:_$!") # 0
 			self.mapping.append (u" 1") # 1
@@ -54,14 +75,6 @@ class NumericalTextInput:
 			self.mapping.append (u"tuv8TUV") # 8
 			self.mapping.append (u"wxyz9WXYZ") # 9
 
-		if handleTimeout:
-			self.timer = eTimer()
-			self.timer.callback.append(self.timeout)
-		else:
-			self.timer = None
-		self.lastKey = -1
-		self.pos = -1
-
 	def setUseableChars(self, useable):
 		self.useableChars = useable
 
-- 
cgit v1.2.3


From 91f1726f99acf507973513a7203cbd1306275718 Mon Sep 17 00:00:00 2001
From: Fraxinas <andreas.frisch@multimedia-labs.de>
Date: Mon, 8 Dec 2008 14:50:20 +0100
Subject: change character encoding of source file from 8859-1 to utf-8

---
 lib/python/Tools/NumericalTextInput.py | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'lib/python/Tools/NumericalTextInput.py')

diff --git a/lib/python/Tools/NumericalTextInput.py b/lib/python/Tools/NumericalTextInput.py
index be4cf01f..c5576405 100644
--- a/lib/python/Tools/NumericalTextInput.py
+++ b/lib/python/Tools/NumericalTextInput.py
@@ -1,4 +1,4 @@
-# -*- coding: iso-8859-1 -*-
+# -*- coding: utf-8 -*-
 from enigma import eTimer
 from Components.Language import language
 
@@ -33,33 +33,33 @@ class NumericalTextInput:
 		if self.lang == 'de_DE':
 			self.mapping.append (u".,?'+\"0-()@/:_$!") # 0
 			self.mapping.append (u" 1") # 1
-			self.mapping.append (u"a�bc2A�BC") # 2
+			self.mapping.append (u"aäbc2AÄBC") # 2
 			self.mapping.append (u"def3DEF") # 3
 			self.mapping.append (u"ghi4GHI") # 4
 			self.mapping.append (u"jkl5JKL") # 5
-			self.mapping.append (u"mno�6MNO�") # 6
-			self.mapping.append (u"pqrs�7PQRS�") # 7
-			self.mapping.append (u"tu�v8TU�V") # 8
+			self.mapping.append (u"mnoö6MNOÖ") # 6
+			self.mapping.append (u"pqrsß7PQRSß") # 7
+			self.mapping.append (u"tuüv8TUÜV") # 8
 			self.mapping.append (u"wxyz9WXYZ") # 9
 		elif self.lang == 'es_ES':
 			self.mapping.append (u".,?'+\"0-()@/:_$!") # 0
 			self.mapping.append (u" 1") # 1
-			self.mapping.append (u"abc��2ABC��") # 2
-			self.mapping.append (u"de��f3DEF��") # 3
-			self.mapping.append (u"ghi��4GHI��") # 4
+			self.mapping.append (u"abcáà2ABCÁÀ") # 2
+			self.mapping.append (u"deéèf3DEFÉÈ") # 3
+			self.mapping.append (u"ghiíì4GHIÍÌ") # 4
 			self.mapping.append (u"jkl5JKL") # 5
-			self.mapping.append (u"mn�o��6MN�O��") # 6
+			self.mapping.append (u"mnñoóò6MNÑOÓÒ") # 6
 			self.mapping.append (u"pqrs7PQRS") # 7
-			self.mapping.append (u"tuv��8TUV��") # 8
+			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"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"mnoö6MNOÖ") # 6
 			self.mapping.append (u"pqrs7PQRS") # 7
 			self.mapping.append (u"tuv8TUV") # 8
 			self.mapping.append (u"wxyz9WXYZ") # 9
-- 
cgit v1.2.3