some changes to the configSelection stuff

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

diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py
index 7137845f7feb9cab8f38c793c3550de8af59d8ef..25684fc186dcda69b112869e5ffd145f6db476d2 100644 (file)
--- a/lib/python/Components/config.py
+++ b/lib/python/Components/config.py
@@ -1,12 +1,13 @@
 from time import *
 from Tools.NumericalTextInput import *
+from Tools.Directories import *
 
 class configFile:
        def __init__(self):
                self.changed = 0
                self.configElements = { }
                try:
-                       self.file = open("config")
+                       self.file = open(resolveFilename(SCOPE_CONFIG, "config"))
                except IOError:
                        print "cannot open config file"
                        return 
@@ -38,7 +39,7 @@ class configFile:
                if self.changed == 0:           #no changes, so no write to disk needed
                        return
                        
-               fileHandle = open("config", "w")
+               fileHandle = open(resolveFilename(SCOPE_CONFIG, "config"), "w")
                
                keys = self.configElements.keys()
                keys.sort()
@@ -47,7 +48,18 @@ class configFile:
 
                        fileHandle.write(wstr)
 
-               fileHandle.close()              
+               fileHandle.close()
+               
+def currentConfigSelectionElement(element):
+       return element.vals[element.value][0]
+
+def getConfigSelectionElement(element, value):
+       count = 0
+       for x in element.vals:
+               if x[0] == value:
+                       return count
+               count += 1
+       return -1
 
 class configSelection:
        def __init__(self, parent):
@@ -77,8 +89,13 @@ class configSelection:
 
        def __call__(self, selected):                   #needed by configlist
                self.checkValues()
-               return ("text", _(self.parent.vals[self.parent.value]))
-
+               if isinstance(self.parent.vals[self.parent.value], str):
+                       returnValue = _(self.parent.vals[self.parent.value])
+               else:
+                       returnValue = _(self.parent.vals[self.parent.value][1])
+               
+               return ("text", returnValue)
+               
 class configDateTime:
        def __init__(self, parent):
                self.parent = parent
@@ -147,7 +164,7 @@ class configSequenceArg:
        def get(self, type, args = ()):
                # configsequencearg.get ("IP")
                if (type == "IP"):
-                       return (("."), [(1,255),(0,255),(0,255),(0,255)], "")
+                       return (("."), [(0,255),(0,255),(0,255),(0,255)], "")
                # configsequencearg.get ("MAC")
                if (type == "MAC"):
                        return ((":"), [(1,255),(1,255),(1,255),(1,255),(1,255),(1,255)], "")
@@ -212,13 +229,26 @@ class configSequence:
                        self.markedPos += 1
                
                if key >= config.key["0"] and key <= config.key["9"]:
+                       self.blockLen = []
+                       for x in self.valueBounds:
+                               self.blockLen.append(len(str(x[1])))
+                               
+                       pos = 0
+                       blocknumber = 0
+                       self.blockLenTotal = [0,]
+                       for x in self.blockLen:
+                               pos += self.blockLen[blocknumber]
+                               self.blockLenTotal.append(pos)
+                               if (pos - 1 >= self.markedPos):
+                                       pass
+                               else:
+                                       blocknumber += 1
+                                       
                        number = 9 - config.key["9"] + key
                        # length of numberblock
-                       numberLen = len(str(self.valueBounds[0][1]))
+                       numberLen = len(str(self.valueBounds[blocknumber][1]))
                        # position in the block
-                       posinblock = self.markedPos % numberLen
-                       # blocknumber
-                       blocknumber = self.markedPos / numberLen
+                       posinblock = self.markedPos - self.blockLenTotal[blocknumber]
                        
                        oldvalue = self.parent.value[blocknumber]
                        olddec = oldvalue % 10 ** (numberLen - posinblock) - (oldvalue % 10 ** (numberLen - posinblock - 1))
@@ -260,8 +290,11 @@ class configSequence:
                        num += 1
                        # only mark cursor when we are selected
                        # (this code is heavily ink optimized!)
-               return ("mtext"[1-selected:], value, [mPos])
-
+               if (self.parent.enabled == True):
+                       return ("mtext"[1-selected:], value, [mPos])
+               else:
+                       return ("text", value)
+               
 class configText:
        # used as first parameter
        # is the text of a fixed size or is the user able to extend the length of the text
@@ -400,7 +433,17 @@ class configElement:
                if control == ConfigSlider:
                        return int(data)
                elif control == configSelection:
-                       return int(data)
+                       try:
+                               return int(data)
+                       except:
+                               for x in data.split(":"):
+                                       if x[0] == "*":
+                                               count = 0
+                                               for y in self.vals:
+                                                       if y[0] == x[1:-1]:
+                                                               return count
+                                                       count += 1
+                               return self.defaultValue
                elif control == configDateTime:
                        return int(data)
                elif control == configText:
@@ -420,6 +463,18 @@ class configElement:
                if control == ConfigSlider:
                        return str(data)
                elif control == configSelection:
+                       if isinstance(self.vals[data], str):
+                               return str(data)
+                       else:
+                               confList = []
+                               count = 0
+                               for x in self.vals:
+                                       if count == data:
+                                               confList.append("*" + str(x[0] + "*"))
+                                       else:
+                                               confList.append(x[0])
+                                       count += 1
+                               return ":".join(confList)
                        return str(data)
                elif control == configDateTime:
                        return str(data)