- beautified network cursor, added 'selected' argument to __call__

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

diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py
index 2fd0ff15a3653e7e8f19dbf73ed68b89b12b69d1..494d1d882a3e86cd3fb3e1f456a7dbe7e4cb63bc 100644 (file)
--- a/lib/python/Components/config.py
+++ b/lib/python/Components/config.py
@@ -74,8 +74,8 @@ class configSelection:
 
                self.parent.change()    
 
 
                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:
                return ("text", self.parent.vals[self.parent.value])
                
 class configSequence:


@@ -114,24 +114,25 @@ class configSequence:
                #FIXME: dont call when press left/right
                self.parent.change()    
 
                #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
                for i in self.parent.value:
                value = ""
                mPos = self.markedPos
                print 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 += 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
                        value +=        str(i)
                                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)
+
+                       # 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):
 
 class configValue:
        def __init__(self, obj):


@@ -175,8 +176,8 @@ class ConfigSlider:
                self.checkValues()      
                self.parent.change()    
 
                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:
                return ("slider", self.parent.value * 10)
 
 class ConfigSubsection: