fix automatic scan

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

diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py
index dfd5d5971a2bcd39a9c5c961cffaecf029069306..4850ca3569fe57a24d48035c411900bd2f8dae48 100644 (file)
--- a/lib/python/Components/config.py
+++ b/lib/python/Components/config.py
@@ -1,4 +1,5 @@
 from time import *
+from Tools.NumericalTextInput import *
 
 class configFile:
        def __init__(self):
@@ -24,7 +25,7 @@ class configFile:
        def addElement(self, line):
                x = line.find("=")
                if x > -1:
-                       self.configElements[line[:x]] = line[x + 1:]
+                       self.configElements[line[:x]] = line[x + 1:-1]
        
        def getKey(self, key):
                return self.configElements[key]
@@ -42,10 +43,7 @@ class configFile:
                keys = self.configElements.keys()
                keys.sort()
                for x in keys:
-                       wstr = x + "=" + self.configElements[x]
-                       
-                       if wstr[len(wstr) - 1] != '\n':
-                               wstr = wstr + "\n"
+                       wstr = x + "=" + self.configElements[x] + "\n"
 
                        fileHandle.write(wstr)
 
@@ -76,7 +74,7 @@ class configSelection:
                
                self.checkValues()                      
 
-               self.parent.change()    
+               self.parent.change()
 
        def __call__(self, selected):                   #needed by configlist
                self.checkValues()
@@ -154,6 +152,9 @@ class configSequenceArg:
                # configsequencearg.get ("MAC")
                if (type == "MAC"):
                        return ((":"), [(1,255),(1,255),(1,255),(1,255),(1,255),(1,255)], "")
+               # configsequencearg.get ("CLOCK")
+               if (type == "CLOCK"):
+                       return ((":"), [(0,23),(0,59)], "")
                # configsequencearg.get("INTEGER", (min, max)) => x with min <= x <= max
                if (type == "INTEGER"):
                        return ((":"), [args], "")
@@ -262,6 +263,61 @@ class configSequence:
                        # (this code is heavily ink optimized!)
                return ("mtext"[1-selected:], value, [mPos])
 
+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
+       extendableSize = 1
+       fixedSize = 2
+
+       def __init__(self, parent):
+               self.parent = parent
+               self.markedPos = 0
+               self.mode = self.parent.vals[0]
+               self.textInput = NumericalTextInput(self.nextEntry)
+
+       def checkValues(self):
+               if (self.markedPos < 0):
+                       self.markedPos = 0
+               if (self.markedPos >= len(self.parent.value)):
+                       self.markedPos = len(self.parent.value) - 1
+                       
+       def cancel(self):
+               self.parent.reload()
+
+       def save(self):
+               self.parent.save()
+               
+       def nextEntry(self):
+               print self.parent
+               self.parent.vals[1](self.parent.getConfigPath())
+
+       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.key["prevElement"]:
+                       self.textInput.nextKey()
+                       self.markedPos -= 1
+
+               if key == config.key["nextElement"]:
+                       self.textInput.nextKey()
+                       self.markedPos += 1
+                       if (self.mode == self.extendableSize):
+                               if (self.markedPos >= len(self.parent.value)):
+                                       self.parent.value = self.parent.value.ljust(len(self.parent.value) + 1)
+                       
+                               
+               if key >= config.key["0"] and key <= config.key["9"]:
+                       number = 9 - config.key["9"] + key
+
+                       self.parent.value = self.parent.value[0:self.markedPos] + str(self.textInput.getKey(number)) + self.parent.value[self.markedPos + 1:]
+               
+               self.checkValues()                      
+               
+               self.parent.change()    
+
+       def __call__(self, selected):                   #needed by configlist
+               return ("mtext"[1-selected:], str(self.parent.value), [self.markedPos])
+               
 class configValue:
        def __init__(self, obj):
                self.obj = obj
@@ -334,16 +390,18 @@ class configElement:
                                        tcnt = cnt
                        cnt += 1
                if tcnt != -1:
-                       return tcnt                     
+                       return tcnt
                return 0        #prevent bigger then array
 
        def datafromFile(self, control, data):
                if control == ConfigSlider:
-                       return int(data);
+                       return int(data)
                elif control == configSelection:
-                       return int(data);
+                       return int(data)
                elif control == configDateTime:
-                       return int(data);
+                       return int(data)
+               elif control == configText:
+                       return str(data)
                elif control == configSequence:
                        list = [ ]
                        part = data.split(self.vals[0])
@@ -357,13 +415,20 @@ class configElement:
 
        def datatoFile(self, control, data):
                if control == ConfigSlider:
-                       return str(data);
+                       return str(data)
                elif control == configSelection:
-                       return str(data);
+                       return str(data)
                elif control == configDateTime:
-                       return str(data);
+                       return str(data)
+               elif control == configText:
+                       return str(data.strip())
+
                elif control == configSequence:
-                       value = ((len(data) * ("%d" + self.vals[0]))[0:-1]) % tuple(data)
+                       print data
+                       try:
+                               value = ((len(data) * ("%d" + self.vals[0]))[0:-1]) % tuple(data)
+                       except: 
+                               value = str(data)       
 #                      just in case you don't understand the above, here an equivalent:
 #                      value = ""
 #                      for i in data:
@@ -377,6 +442,7 @@ class configElement:
                        return ""       
 
        def loadData(self):
+               #print "load:" + self.configPath
                try:
                        value = self.datafromFile(self.controlType, configfile.getKey(self.configPath))
                except:         
@@ -392,6 +458,7 @@ class configElement:
 
                        self.save()             #add missing value to dict
                else:
+                       #print "set val:" + str(value)
                        self.value = value
                        
                #is this right? activate settings after load/cancel and use default     
@@ -405,6 +472,10 @@ class configElement:
                self.notifierList = [ ]
                self.enabled = True
                self.loadData()         
+               
+       def getConfigPath(self):
+               return self.configPath
+       
        def addNotifier(self, notifier):
                self.notifierList.append(notifier);
                notifier(self);
@@ -427,5 +498,3 @@ def getConfigListEntry(description, element):
        b = element
        item = b.controlType(b)
        return ((description, item))
-
-       
\ No newline at end of file