- simplified getInterface-styled calls: now using return value instead of mutable...

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

diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py
index c7434e4dc263150bbd00ff7935570c5b2a56a771..7bd8175a612ab35a0b837c4583fe76f4632367be 100644 (file)
--- a/lib/python/Components/config.py
+++ b/lib/python/Components/config.py
@@ -47,7 +47,7 @@ class configFile:
 
                fileHandle.close()              
 
-class configBoolean:
+class configSelection:
        def __init__(self, parent):
                self.parent = parent
                
@@ -65,17 +65,17 @@ class configBoolean:
                self.parent.save()
 
        def handleKey(self, key):
-               if key == config.prevElement:
+               if key == config.key["prevElement"]:
                        self.parent.value = self.parent.value - 1
-               if key == config.nextElement:
+               if key == config.key["nextElement"]:
                        self.parent.value = self.parent.value + 1
                
                self.checkValues()                      
 
                self.parent.change()    
 
-       def __call__(self):                     #needed by configlist
-               self.checkValues()                      
+       def __call__(self, selected):                   #needed by configlist
+               self.checkValues()
                return ("text", self.parent.vals[self.parent.value])
                
 class configSequence:
@@ -101,9 +101,27 @@ class configSequence:
        def handleKey(self, key):
                #this will no change anything on the value itself
                #so we can handle it here in gui element
-               if key == config.prevElement:
+               if key == config.key["prevElement"]:
                        self.markedPos -= 1
-               if key == config.nextElement:
+               if key == config.key["nextElement"]:
+                       self.markedPos += 1
+               
+               if key >= config.key["0"] and key <= config.key["9"]:
+                       number = 9 - config.key["9"] + key
+                       # length of numberblock
+                       numberLen = len(str(self.parent.vals[1][1]))
+                       # position in the block
+                       posinblock = self.markedPos % numberLen
+                       # blocknumber
+                       blocknumber = self.markedPos / numberLen
+                       
+                       oldvalue = self.parent.value[blocknumber]
+                       olddec = oldvalue % 10 ** (numberLen - posinblock) - (oldvalue % 10 ** (numberLen - posinblock - 1))
+                       newvalue = oldvalue - olddec + (10 ** (numberLen - posinblock - 1) * number)
+                       
+                       print "You actually pressed a number (" + str(number) + ") which will be added at block number " + str(blocknumber) + " on position " + str(posinblock)
+                       print "Old value: " + str(oldvalue) + " olddec: " + str(olddec) + " newvalue: " + str(newvalue)
+                       self.parent.value[blocknumber] = newvalue
                        self.markedPos += 1
                
                self.checkValues()                      
@@ -114,25 +132,26 @@ class configSequence:
                #FIXME: dont call when press left/right
                self.parent.change()    
 
-       def __call__(self):                     #needed by configlist
-               print "__CALL__"
+       def __call__(self, selected):                   #needed by configlist
                value = ""
                mPos = self.markedPos
-               print mPos
+               print "Positon: " + str(mPos)
                for i in self.parent.value:
-                       if value != "": #fixme no heading separator possible
+                       if len(value):  #fixme no heading separator possible
                                value += self.parent.vals[0]
                                if mPos >= len(value) - 1:
                                        mPos += 1
                                
-                       diff =  self.parent.vals[1] - len(str(i))
-                       if diff > 0:
-                               #how about alignment?
-                               value += "           "[0:diff]          #how is this done correct?
-                       value +=        str(i)
-               
-               value = value[0:mPos] + "_" + value[mPos + 1:]
-               return ("text", value)
+                       #diff =         self.parent.vals[1] - len(str(i))
+                       #if diff > 0:
+                               ## if this helps?!
+                               #value += " " * diff
+                       print (("%0" + str(len(str(self.parent.vals[1][1]))) + "d") % i)
+                       value += ("%0" + str(len(str(self.parent.vals[1][1]))) + "d") % i
+
+                       # only mark cursor when we are selected
+                       # (this code is heavily ink optimized!)
+               return ("mtext"[1-selected:], value, [mPos])
 
 class configValue:
        def __init__(self, obj):
@@ -143,10 +162,20 @@ class configValue:
 
 class Config:
        def __init__(self):
-               self.choseElement = 0
-               self.prevElement = 1
-               self.nextElement = 2
-                                               
+               self.key = { "choseElement": 0,
+                                        "prevElement": 1,
+                                        "nextElement": 2,
+                                        "0": 10,
+                                        "1": 11,
+                                        "2": 12,
+                                        "3": 13,
+                                        "4": 14,
+                                        "5": 15,
+                                        "6": 16,
+                                        "7": 17,
+                                        "8": 18,
+                                        "9": 19 }
+               
 config = Config();
 configfile = configFile()
 
@@ -168,16 +197,16 @@ class ConfigSlider:
                        self.parent.value = 10  
 
        def handleKey(self, key):
-               if key == config.prevElement:
+               if key == config.key["prevElement"]:
                        self.parent.value = self.parent.value - 1
-               if key == config.nextElement:
+               if key == config.key["nextElement"]:
                        self.parent.value = self.parent.value + 1
                                        
                self.checkValues()      
                self.parent.change()    
 
-       def __call__(self):                     #needed by configlist
-               self.checkValues()      
+       def __call__(self, selected):                   #needed by configlist
+               self.checkValues()
                return ("slider", self.parent.value * 10)
 
 class ConfigSubsection:
@@ -188,7 +217,7 @@ class configElement:
        def datafromFile(self, control, data):
                if control == ConfigSlider:
                        return int(data);
-               elif control == configBoolean:
+               elif control == configSelection:
                        return int(data);
                elif control == configSequence:
                        list = [ ]
@@ -202,14 +231,16 @@ class configElement:
        def datatoFile(self, control, data):
                if control == ConfigSlider:
                        return str(data);
-               elif control == configBoolean:
+               elif control == configSelection:
                        return str(data);
                elif control == configSequence:
-                       value = ""
-                       for i in data:
-                               if value !="":
-                                       value += self.vals[0]
-                               value += str(i)
+                       value = ((len(data) * ("%d" + self.vals[0]))[0:-1]) % tuple(data)
+#                      just in case you don't understand the above, here an equivalent:
+#                      value = ""
+#                      for i in data:
+#                              if value !="":
+#                                      value += self.vals[0]
+#                              value += str(i)
                        return value
                else: 
                        return ""