fix boundaries of configSequence input

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

diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py
index 7bd8175a612ab35a0b837c4583fe76f4632367be..5a92f076834f8439ab97d241f224ace4f0ae7ed8 100644 (file)
--- a/lib/python/Components/config.py
+++ b/lib/python/Components/config.py
@@ -37,7 +37,9 @@ class configFile:
                        
                fileHandle = open("config", "w")
                
-               for x in self.configElements:
+               keys = self.configElements.keys()
+               keys.sort()
+               for x in keys:
                        wstr = x + "=" + self.configElements[x]
                        
                        if wstr[len(wstr) - 1] != '\n':
@@ -77,6 +79,38 @@ class configSelection:
        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):
@@ -84,8 +118,7 @@ class configSequence:
                self.markedPos = 0
                
        def checkValues(self):
-               maxPos = len(self.parent.value) * self.parent.vals[1] 
-               print maxPos
+               maxPos = len(self.parent.value) * len(self.parent.vals[1]) + len(self.parent.value)
                        
                if self.markedPos >= maxPos:
                        self.markedPos = maxPos - 1
@@ -214,6 +247,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);
@@ -225,6 +272,8 @@ class configElement:
                        for x in part:
                                list.append(int(x))
                        return list
+               elif control == configSatlist:
+                       return self.getIndexbyEntry(data)
                else: 
                        return ""       
 
@@ -242,6 +291,8 @@ class configElement:
 #                                      value += self.vals[0]
 #                              value += str(i)
                        return value
+               elif control == configSatlist:
+                       return str(self.vals[self.value][1]);
                else: 
                        return ""       
 
@@ -253,10 +304,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
@@ -276,3 +335,15 @@ class configElement:
                self.loadData()
        def save(self):
                configfile.setKey(self.configPath, self.datatoFile(self.controlType,self.value))
+
+class configElement_nonSave(configElement):
+       def __init__(self, configPath, control, defaultValue, vals):
+               configElement.__init__(self, configPath, control, defaultValue, vals)
+
+       def save(self):
+               pass
+               
+def getConfigListEntry(description, element):
+       b = element
+       item = b.controlType(b)
+       return ((description, item))
\ No newline at end of file