some fixes for dvb-s2

[enigma2.git] / lib / python / Components / Input.py

diff --git a/lib/python/Components/Input.py b/lib/python/Components/Input.py
index a0252e46d83f13976468972013efee436c254371..0bd13059e3ad69d75bcb7dbb4a0ce26afcab7309 100644 (file)
--- a/lib/python/Components/Input.py
+++ b/lib/python/Components/Input.py
@@ -6,7 +6,7 @@ from enigma import eLabel
 
 from Tools.NumericalTextInput import NumericalTextInput
 
 
 from Tools.NumericalTextInput import NumericalTextInput
 

-class Input(HTMLComponent, GUIComponent, VariableText):
+class Input(VariableText, HTMLComponent, GUIComponent):

        TEXT = 0
        PIN = 1
        NUMBER = 2      
        TEXT = 0
        PIN = 1
        NUMBER = 2      


@@ -54,7 +54,7 @@ class Input(HTMLComponent, GUIComponent, VariableText):
                self.update()
                
        def up(self):
                self.update()
                
        def up(self):

-               if self.text[self.currPos] == "9":
+               if self.text[self.currPos] == "9" or self.text[self.currPos] == " ":

                        newNumber = "0"
                else:
                        newNumber = str(int(self.text[self.currPos]) + 1)
                        newNumber = "0"
                else:
                        newNumber = str(int(self.text[self.currPos]) + 1)


@@ -62,13 +62,18 @@ class Input(HTMLComponent, GUIComponent, VariableText):
                self.update()
                
        def down(self):
                self.update()
                
        def down(self):

-               if self.text[self.currPos] == "0":
+               if self.text[self.currPos] == "0" or self.text[self.currPos] == " ":

                        newNumber = "9"
                else:
                        newNumber = str(int(self.text[self.currPos]) - 1)
                        newNumber = "9"
                else:
                        newNumber = str(int(self.text[self.currPos]) - 1)

+

                self.text = self.text[0:self.currPos] + newNumber + self.text[self.currPos + 1:]
                self.update()
                
                self.text = self.text[0:self.currPos] + newNumber + self.text[self.currPos + 1:]
                self.update()
                

+       def delete(self):
+               self.text = self.text[:self.currPos] + self.text[self.currPos + 1:]
+               self.update()
+               

        def number(self, number):
                if self.type == self.TEXT:
                        newChar = self.numericalTextInput.getKey(number)
        def number(self, number):
                if self.type == self.TEXT:
                        newChar = self.numericalTextInput.getKey(number)


@@ -78,9 +83,3 @@ class Input(HTMLComponent, GUIComponent, VariableText):
                if self.type == self.PIN or self.type == self.NUMBER:
                        self.right()
                self.update()
                if self.type == self.PIN or self.type == self.NUMBER:
                        self.right()
                self.update()

-
-       def show(self):
-               self.instance.show()
-
-       def hide(self):
-               self.instance.hide()
\ No newline at end of file