add invalidate after reload() used for cancel
[enigma2.git] / lib / python / Components / config.py
index 2fd0ff15a3653e7e8f19dbf73ed68b89b12b69d1..7f8f50727c166bbf50ab99a0c8e1585a5f3b6c43 100644 (file)
@@ -65,18 +65,50 @@ class configSelection:
                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 configSatlist:
+       def __init__(self, parent):
+               self.parent = parent
+
+       def checkValues(self):
+               if self.parent.value < 0:
+                       self.parent.value = 0   
+
+               if(self.parent.value >= (len(self.parent.vals) - 1)):
+                       self.parent.value = len(self.parent.vals) - 1
+                       
+       def cancel(self):
+               self.parent.reload()
+
+       def save(self):
+               self.parent.save()
+
+       def handleKey(self, key):
+               if key == config.key["prevElement"]:
+                       self.parent.value = self.parent.value - 1
+               if key == config.key["nextElement"]:
+                       self.parent.value = self.parent.value + 1
+               
+               self.checkValues()                      
+
+               self.parent.change()    
+
+       def __call__(self, selected):                   #needed by configlist
+               self.checkValues()
+               #fixme
+               return ("text", str(self.parent.vals[self.parent.value][0]))
                
 class configSequence:
        def __init__(self, parent):
@@ -101,9 +133,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,24 +164,26 @@ class configSequence:
                #FIXME: dont call when press left/right
                self.parent.change()    
 
-       def __call__(self):                     #needed by configlist
+       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:
-                               value += " " * diff
-                       value +=        str(i)
-# or the above code if you have to spare ink
-#              value = ((len(self.parent.value) * ("%0" + str(self.parent.vals[1]) + "d" + self.parent.vals[0]))[0:-1]) % tuple(self.parent.value)
-               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):
@@ -142,10 +194,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()
 
@@ -167,16 +229,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:
@@ -184,6 +246,20 @@ class ConfigSubsection:
                pass
 
 class configElement:
+
+       def getIndexbyEntry(self, data):
+               cnt = 0;
+               tcnt = -1; #for defaultval
+               for x in self.vals:
+                       if int(x[1]) == int(data):
+                                       return cnt
+                       if int(x[1]) == int(self.defaultValue):
+                                       tcnt = cnt
+                       cnt += 1
+               if tcnt != -1:
+                       return tcnt                     
+               return 0        #prevent bigger then array
+
        def datafromFile(self, control, data):
                if control == ConfigSlider:
                        return int(data);
@@ -195,6 +271,8 @@ class configElement:
                        for x in part:
                                list.append(int(x))
                        return list
+               elif control == configSatlist:
+                       return self.getIndexbyEntry(data)
                else: 
                        return ""       
 
@@ -212,6 +290,8 @@ class configElement:
 #                                      value += self.vals[0]
 #                              value += str(i)
                        return value
+               elif control == configSatlist:
+                       return str(self.vals[self.value][1]);
                else: 
                        return ""       
 
@@ -223,10 +303,18 @@ class configElement:
 
                if value == "":
                        print "value not found - using default"
-                       self.value = self.defaultValue
+
+                       if self.controlType == configSatlist:
+                               self.value = self.getIndexbyEntry(self.defaultValue)
+                       else:   
+                               self.value = self.defaultValue
+
                        self.save()             #add missing value to dict
                else:
                        self.value = value
+                       
+               #is this right? activate settings after load/cancel and use default     
+               self.change()
 
        def __init__(self, configPath, control, defaultValue, vals):
                self.configPath = configPath