entering numbers into networksetup is possible now

[vuplus_dvbapp] / lib / python / Components / config.py

diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py
index ed85ed2..7bd8175 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,18 +65,93 @@ class configBoolean:
                self.parent.save()
 
        def handleKey(self, key):
-               if key == 1:
+               if key == config.key["prevElement"]:
                        self.parent.value = self.parent.value - 1
-               if key == 2:
+               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:
+       def __init__(self, parent):
+               self.parent = parent
+               self.markedPos = 0
+               
+       def checkValues(self):
+               maxPos = len(self.parent.value) * self.parent.vals[1] 
+               print maxPos
+                       
+               if self.markedPos >= maxPos:
+                       self.markedPos = maxPos - 1
+               if self.markedPos < 0:
+                       self.markedPos = 0
+                       
+       def cancel(self):
+               self.parent.reload()
+
+       def save(self):
+               self.parent.save()
+
+       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.markedPos -= 1
+               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()                      
+               
+               print "markPos:",
+               print self.markedPos
+
+               #FIXME: dont call when press left/right
+               self.parent.change()    
+
+       def __call__(self, selected):                   #needed by configlist
+               value = ""
+               mPos = self.markedPos
+               print "Positon: " + str(mPos)
+               for i in self.parent.value:
+                       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:
+                               ## 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):
@@ -87,7 +162,19 @@ class configValue:
 
 class Config:
        def __init__(self):
-               pass
+               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()
@@ -110,16 +197,16 @@ class ConfigSlider:
                        self.parent.value = 10  
 
        def handleKey(self, key):
-               if key == 1:
+               if key == config.key["prevElement"]:
                        self.parent.value = self.parent.value - 1
-               if key == 2:
+               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:
@@ -130,16 +217,31 @@ 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 = [ ]
+                       part = data.split(self.vals[0])
+                       for x in part:
+                               list.append(int(x))
+                       return list
                else: 
                        return ""       
 
        def datatoFile(self, control, data):
                if control == ConfigSlider:
                        return str(data);
-               elif control == configBoolean:
+               elif control == configSelection:
                        return str(data);
+               elif control == configSequence:
+                       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 ""       
 
@@ -162,6 +264,7 @@ class configElement:
                self.controlType = control
                self.vals = vals
                self.notifierList = [ ]
+               self.enabled = True
                self.loadData()         
        def addNotifier(self, notifier):
                self.notifierList.append(notifier);