X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/394e2b2e2488ae3fa5edc6a9a512bcf0414cc562..d65ce06bfed2444d9870630f095db401d78a096e:/lib/python/Components/Input.py

diff --git a/lib/python/Components/Input.py b/lib/python/Components/Input.py
index 42426114..e0a7f449 100644
--- a/lib/python/Components/Input.py
+++ b/lib/python/Components/Input.py
@@ -1,99 +1,134 @@
-from HTMLComponent import *
-from GUIComponent import *
-from VariableText import *
+from HTMLComponent import HTMLComponent
+from GUIComponent import GUIComponent
+from VariableText import VariableText
 
 from enigma import eLabel
 
 from Tools.NumericalTextInput import NumericalTextInput
 
-class Input(VariableText, HTMLComponent, GUIComponent):
+class Input(VariableText, HTMLComponent, GUIComponent, NumericalTextInput):
 	TEXT = 0
 	PIN = 1
-	NUMBER = 2	
-	
+	NUMBER = 2
+
 	def __init__(self, text="", maxSize = False, type = TEXT):
+		NumericalTextInput.__init__(self, self.right)
 		GUIComponent.__init__(self)
 		VariableText.__init__(self)
-		self.numericalTextInput = NumericalTextInput(self.right)
 		self.type = type
 		self.maxSize = maxSize
 		self.currPos = 0
-		self.text = text
-		self.update()
+		self.overwrite = 0
+		self.setText(text)
+		
+	def __len__(self):
+		return len(self.text)
 
 	def update(self):
 		self.setMarkedPos(self.currPos)
-		text = self.text
 		if self.type == self.PIN:
-			text = "*" * len(self.text)
-		self.message = text
-		if self.instance:
-			self.instance.setText(self.message)
+			self.text = "*" * len(self.Text)
+		else:
+			self.text = self.Text.encode("utf-8")
 
 	def setText(self, text):
 		if not len(text):
 			self.currPos = 0
-		self.text = text
+			self.Text = u""
+		else:
+			try:
+				self.Text = text.decode("utf-8")
+			except UnicodeDecodeError:
+				print "utf8 kaputt!"
+				self.Text = text
 		self.update()
 
 	def getText(self):
-		return self.text
-	
+		return self.Text.encode("utf-8")
+
 	def createWidget(self, parent):
 		return eLabel(parent, self.currPos)
-	
+
 	def getSize(self):
 		s = self.instance.calculateSize()
 		return (s.width(), s.height())
 	
 	def right(self):
 		self.currPos += 1
-		if self.currPos == len(self.text):
+		if self.currPos == len(self.Text):
 			if self.maxSize:
 				self.currPos -= 1
 			else:
-				self.text = self.text + " "
-			
+				self.Text = self.Text + " "
 		self.update()
-		
+
 	def left(self):
 		if self.currPos > 0:
 			self.currPos -= 1
 			self.update()
-		
+
 	def up(self):
-		if self.text[self.currPos] == "9" or self.text[self.currPos] == " ":
+		if self.Text[self.currPos] == "9" or self.Text[self.currPos] == " ":
 			newNumber = "0"
 		else:
-			newNumber = str(int(self.text[self.currPos]) + 1)
-		self.text = self.text[0:self.currPos] + newNumber + self.text[self.currPos + 1:]
+			newNumber = str(int(self.Text[self.currPos]) + 1)
+		self.Text = self.Text[0:self.currPos] + newNumber + self.Text[self.currPos + 1:]
 		self.update()
-		
+
 	def down(self):
-		if self.text[self.currPos] == "0" or self.text[self.currPos] == " ":
+		if self.Text[self.currPos] == "0" or self.Text[self.currPos] == " ":
 			newNumber = "9"
 		else:
-			newNumber = str(int(self.text[self.currPos]) - 1)
-
-		self.text = self.text[0:self.currPos] + newNumber + self.text[self.currPos + 1:]
+			newNumber = str(int(self.Text[self.currPos]) - 1)
+		self.Text = self.Text[0:self.currPos] + newNumber + self.Text[self.currPos + 1:]
 		self.update()
 		
+	def home(self):
+		self.currPos = 0
+		self.update()
+	
+	def end(self):
+		self.currPos = len(self.Text) - 1
+		self.update()
+
+	def tab(self):
+		if self.currPos == len(self.Text) - 1:
+			self.Text=self.Text+ " "
+			self.end()
+		else:
+			self.Text = self.Text[0:self.currPos] + " " + self.Text[self.currPos:]
+		self.update()
+
 	def delete(self):
-		self.text = self.text[:self.currPos] + self.text[self.currPos + 1:]
+		self.Text = self.Text[:self.currPos] + self.Text[self.currPos + 1:]
+		self.update()
+
+	def toggleOverwrite(self):
+		if self.overwrite==1:
+			self.overwrite=0
+		else:
+			self.overwrite=1
+		self.update()
+
+	def deleteBackward(self):
+		self.Text = self.Text[:self.currPos - 1] + self.Text[self.currPos:]
+		self.left()
 		self.update()
 
 	def handleAscii(self, code):
-		newChar = chr(code)
-		self.text = self.text[0:self.currPos] + newChar + self.text[self.currPos + 1:]
+		newChar = unichr(code)
+		if self.overwrite==1:
+			self.Text = self.Text[0:self.currPos] + newChar + self.Text[self.currPos + 1:]
+		else:
+			self.Text = self.Text[0:self.currPos] + newChar + self.Text[self.currPos:]
 		self.right()
-		self.update()
 
 	def number(self, number):
 		if self.type == self.TEXT:
-			newChar = self.numericalTextInput.getKey(number)
+			newChar = self.getKey(number)
 		elif self.type == self.PIN or self.type == self.NUMBER:
 			newChar = str(number)
-		self.text = self.text[0:self.currPos] + newChar + self.text[self.currPos + 1:]
+		self.Text = self.Text[0:self.currPos] + newChar + self.Text[self.currPos + 1:]
 		if self.type == self.PIN or self.type == self.NUMBER:
 			self.right()
 		self.update()