unmute on volUp and volDown if volume is muted

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

diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py
index 2056192fe05aa2a3b8e67a92a13e57850b83bf57..037b66b13c8fa8b6a9e5cd8456c81e1ecd24fcfe 100644 (file)
--- a/lib/python/Components/config.py
+++ b/lib/python/Components/config.py
@@ -55,10 +55,9 @@ class configSelection:
                
        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
+                       self.parent.value = len(self.parent.vals) - 1   
+               elif(self.parent.value > (len(self.parent.vals) - 1)):
+                       self.parent.value = 0
 
        def cancel(self):
                self.parent.reload()
@@ -78,7 +77,7 @@ class configSelection:
 
        def __call__(self, selected):                   #needed by configlist
                self.checkValues()
-               return ("text", self.parent.vals[self.parent.value])
+               return ("text", _(self.parent.vals[self.parent.value]))
 
 class configDateTime:
        def __init__(self, parent):
@@ -261,8 +260,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
@@ -294,6 +296,8 @@ class configText:
        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["delete"]:
+                       self.parent.value = self.parent.value[0:self.markedPos] + self.parent.value[self.markedPos + 1:]
                if key == config.key["prevElement"]:
                        self.textInput.nextKey()
                        self.markedPos -= 1
@@ -330,6 +334,7 @@ class Config:
                self.key = { "choseElement": 0,
                                         "prevElement": 1,
                                         "nextElement": 2,
+                                        "delete": 3,
                                         "0": 10,
                                         "1": 11,
                                         "2": 12,