Merge branch 'master' of git.opendreambox.org:/git/enigma2
[enigma2.git] / lib / python / Components / config.py
old mode 100644 (file)
new mode 100755 (executable)
index c4d4632..6eeca69
@@ -31,9 +31,12 @@ class ConfigElement(object):
 
                object.__init__(self)
                self.saved_value = None
+               self.last_value = None
                self.save_disabled = False
                self.notifiers = []
+               self.notifiers_final = []
                self.enabled = True
+               self.callNotifiersOnSaveAndCancel = False
 
        # you need to override this to do input validation
        def setValue(self, value):
@@ -66,9 +69,13 @@ class ConfigElement(object):
                        self.saved_value = None
                else:
                        self.saved_value = self.tostring(self.value)
+               if self.callNotifiersOnSaveAndCancel:
+                       self.changed()
 
        def cancel(self):
                self.load()
+               if self.callNotifiersOnSaveAndCancel:
+                       self.changed()
 
        def isChanged(self):
                sv = self.saved_value
@@ -80,10 +87,16 @@ class ConfigElement(object):
                for x in self.notifiers:
                        x(self)
                        
-       def addNotifier(self, notifier, initial_call = True):
+       def changedFinal(self):
+               for x in self.notifiers_final:
+                       x(self)
+                       
+       def addNotifier(self, notifier, initial_call = True, immediate_feedback = True):
                assert callable(notifier), "notifiers must be callable"
-               self.notifiers.append(notifier)
-
+               if immediate_feedback:
+                       self.notifiers.append(notifier)
+               else:
+                       self.notifiers_final.append(notifier)
                # CHECKME:
                # do we want to call the notifier
                #  - at all when adding it? (yes, though optional)
@@ -105,7 +118,9 @@ class ConfigElement(object):
                pass
 
        def onDeselect(self, session):
-               pass
+               if not self.last_value == self.value:
+                       self.changedFinal()
+                       self.last_value = self.value
 
 KEY_LEFT = 0
 KEY_RIGHT = 1
@@ -138,6 +153,7 @@ class ConfigSelection(ConfigElement):
                ConfigElement.__init__(self)
                self._value = None
                self.setChoices(choices, default)
+               self.last_value = self._value
 
        def setChoices(self, choices, default = None):
                self.choices = []
@@ -167,9 +183,8 @@ class ConfigSelection(ConfigElement):
                        default = self.choices[0]
 
                assert default in self.choices, "default must be in choice list, but " + repr(default) + " is not!"
-               for x in self.choices:
-                       assert isinstance(x, str), "ConfigSelection choices must be strings"
-               
+#              for x in self.choices:
+#                      assert isinstance(x, str), "ConfigSelection choices must be strings"
                self.default = default
 
                if self.value == None or not self.value in self.choices:
@@ -257,7 +272,8 @@ class ConfigBoolean(ConfigElement):
        def __init__(self, default = False, descriptions = {False: "false", True: "true"}):
                ConfigElement.__init__(self)
                self.descriptions = descriptions
-               self.value = self.default = default
+               self.value = self.last_value = self.default = default
+
        def handleKey(self, key):
                if key in [KEY_LEFT, KEY_RIGHT]:
                        self.value = not self.value
@@ -304,6 +320,11 @@ class ConfigBoolean(ConfigElement):
                else:
                        self.value = False
 
+       def onDeselect(self, session):
+               if not self.last_value == self.value:
+                       self.changedFinal()
+                       self.last_value = self.value
+
 class ConfigYesNo(ConfigBoolean):
        def __init__(self, default = False):
                ConfigBoolean.__init__(self, default = default, descriptions = {False: _("no"), True: _("yes")})
@@ -321,7 +342,7 @@ class ConfigDateTime(ConfigElement):
                ConfigElement.__init__(self)
                self.increment = increment
                self.formatstring = formatstring
-               self.value = self.default = int(default)
+               self.value = self.last_value = self.default = int(default)
 
        def handleKey(self, key):
                if key == KEY_LEFT:
@@ -362,6 +383,7 @@ class ConfigSequence(ConfigElement):
                
                self.default = default
                self.value = copy.copy(default)
+               self.last_value = copy.copy(default)
                
                self.endNotifier = []
 
@@ -502,27 +524,93 @@ class ConfigSequence(ConfigElement):
        def fromstring(self, value):
                return [int(x) for x in value.split(self.seperator)]
 
+       def onDeselect(self, session):
+               if not self.last_value == self._value:
+                       self.changedFinal()
+                       self.last_value = copy.copy(self._value)
+
 class ConfigIP(ConfigSequence):
-       def __init__(self, default):
+       def __init__(self, default, auto_jump = False):
                ConfigSequence.__init__(self, seperator = ".", limits = [(0,255),(0,255),(0,255),(0,255)], default = default)
-       
-       def getHTML(self, id):
-               # we definitely don't want leading zeros
-               return '.'.join(["%d" % d for d in self.value])
-       
+               self.block_len = []
+               for x in self.limits:
+                       self.block_len.append(len(str(x[1])))
+               self.marked_block = 0
+               self.overwrite = True
+               self.auto_jump = auto_jump
+
+       def handleKey(self, key):
+               
+               if key == KEY_LEFT:
+                       if self.marked_block > 0:
+                               self.marked_block -= 1
+                       self.overwrite = True
+
+               if key == KEY_RIGHT:
+                       if self.marked_block < len(self.limits)-1:
+                               self.marked_block += 1
+                       self.overwrite = True
+
+               if key == KEY_HOME:
+                       self.marked_block = 0
+                       self.overwrite = True
+
+               if key == KEY_END:
+                       self.marked_block = len(self.limits)-1
+                       self.overwrite = True
+
+               if key in KEY_NUMBERS or key == KEY_ASCII:
+                       if key == KEY_ASCII:
+                               code = getPrevAsciiCode()
+                               if code < 48 or code > 57:
+                                       return
+                               number = code - 48
+                       else:   
+                               number = getKeyNumber(key)
+                       oldvalue = self._value[self.marked_block]
+                       
+                       if self.overwrite:
+                               self._value[self.marked_block] = number
+                               self.overwrite = False          
+                       else:
+                               oldvalue *= 10
+                               newvalue = oldvalue + number
+                               if self.auto_jump and newvalue > self.limits[self.marked_block][1] and self.marked_block < len(self.limits)-1:
+                                       self.handleKey(KEY_RIGHT)
+                                       self.handleKey(key)
+                                       return
+                               else:
+                                       self._value[self.marked_block] = newvalue
+
+                       if len(str(self._value[self.marked_block])) >= self.block_len[self.marked_block]:
+                               self.handleKey(KEY_RIGHT)
+
+                       self.validate()
+                       self.changed()
+
        def genText(self):
                value = ""
-               mPos = self.marked_pos
-               num = 0;
+               block_strlen = []
                for i in self._value:
+                       block_strlen.append(len(str(i)))        
                        if len(value):
                                value += self.seperator
-                               if mPos >= len(value) - 1:
-                                       mPos += 1
-                       value += (" " * (len(str(self.limits[num][1]))-len(str(i))))
                        value += str(i)
-                       num += 1
-               return (value, mPos)
+               leftPos = sum(block_strlen[:(self.marked_block)])+self.marked_block
+               rightPos = sum(block_strlen[:(self.marked_block+1)])+self.marked_block
+               mBlock = range(leftPos, rightPos)
+               return (value, mBlock)
+       
+       def getMulti(self, selected):
+               (value, mBlock) = self.genText()
+               if self.enabled:
+                       return ("mtext"[1-selected:], value, mBlock)
+               else:
+                       return ("text", value)
+
+       def getHTML(self, id):
+               # we definitely don't want leading zeros
+               return '.'.join(["%d" % d for d in self.value])
 
 class ConfigMAC(ConfigSequence):
        def __init__(self, default):
@@ -538,6 +626,36 @@ class ConfigClock(ConfigSequence):
                t = time.localtime(default)
                ConfigSequence.__init__(self, seperator = ":", limits = [(0,23),(0,59)], default = [t.tm_hour, t.tm_min])
 
+       def increment(self):
+               # Check if Minutes maxed out
+               if self._value[1] == 59:
+                       # Increment Hour, reset Minutes
+                       if self._value[0] < 23:
+                               self._value[0] += 1
+                       else:
+                               self._value[0] = 0
+                       self._value[1] = 0
+               else:
+                       # Increment Minutes
+                       self._value[1] += 1
+               # Trigger change
+               self.changed()
+
+       def decrement(self):
+               # Check if Minutes is minimum
+               if self._value[1] == 0:
+                       # Decrement Hour, set Minutes to 59
+                       if self._value[0] > 0:
+                               self._value[0] -= 1
+                       else:
+                               self._value[0] = 23
+                       self._value[1] = 59
+               else:
+                       # Decrement Minutes
+                       self._value[1] -= 1
+               # Trigger change
+               self.changed()
+
 class ConfigInteger(ConfigSequence):
        def __init__(self, default, limits = (0, 9999999999)):
                ConfigSequence.__init__(self, seperator = ":", limits = [limits], default = default)
@@ -591,7 +709,7 @@ class ConfigText(ConfigElement, NumericalTextInput):
                self.offset = 0
                self.overwrite = fixed_size
                self.help_window = None
-               self.value = self.default = default
+               self.value = self.last_value = self.default = default
 
        def validateMarker(self):
                if self.fixed_size:
@@ -716,12 +834,12 @@ class ConfigText(ConfigElement, NumericalTextInput):
 
        def getValue(self):
                return self.text.encode("utf-8")
-               
+
        def setValue(self, val):
                try:
                        self.text = val.decode("utf-8")
                except UnicodeDecodeError:
-                       self.text = val
+                       self.text = val.decode("utf-8", "ignore")
                        print "Broken UTF8!"
 
        value = property(getValue, setValue)
@@ -757,6 +875,9 @@ class ConfigText(ConfigElement, NumericalTextInput):
                if self.help_window:
                        session.deleteDialog(self.help_window)
                        self.help_window = None
+               if not self.last_value == self.value:
+                       self.changedFinal()
+                       self.last_value = self.value
 
        def getHTML(self, id):
                return '<input type="text" name="' + id + '" value="' + self.value + '" /><br>\n'
@@ -831,12 +952,40 @@ class ConfigNumber(ConfigText):
        def onDeselect(self, session):
                self.marked_pos = 0
                self.offset = 0
+               if not self.last_value == self.value:
+                       self.changedFinal()
+                       self.last_value = self.value
+
+class ConfigSearchText(ConfigText):
+       def __init__(self, default = "", fixed_size = False, visible_width = False):
+               ConfigText.__init__(self, default = default, fixed_size = fixed_size, visible_width = visible_width)
+               NumericalTextInput.__init__(self, nextFunc = self.nextFunc, handleTimeout = False, search = True)
+
+class ConfigDirectory(ConfigText):
+       def __init__(self, default="", visible_width=60):
+               ConfigText.__init__(self, default, fixed_size = True, visible_width = visible_width)
+       def handleKey(self, key):
+               pass
+       def getValue(self):
+               if self.text == "":
+                       return None
+               else:
+                       return ConfigText.getValue(self)
+       def setValue(self, val):
+               if val == None:
+                       val = ""
+               ConfigText.setValue(self, val)
+       def getMulti(self, selected):
+               if self.text == "":
+                       return ("mtext"[1-selected:], _("List of Storage Devices"), range(0))
+               else:
+                       return ConfigText.getMulti(self, selected)
 
 # a slider.
 class ConfigSlider(ConfigElement):
        def __init__(self, default = 0, increment = 1, limits = (0, 100)):
                ConfigElement.__init__(self)
-               self.value = self.default = default
+               self.value = self.last_value = self.default = default
                self.min = limits[0]
                self.max = limits[1]
                self.increment = increment
@@ -908,7 +1057,7 @@ class ConfigSet(ConfigElement):
                        default = []
                self.pos = -1
                default.sort()
-               self.default = default
+               self.last_value = self.default = default
                self.value = default+[]
 
        def toggleChoice(self, choice):
@@ -917,6 +1066,7 @@ class ConfigSet(ConfigElement):
                else:
                        self.value.append(choice)
                        self.value.sort()
+               self.changed()
 
        def handleKey(self, key):
                if key in KEY_NUMBERS + [KEY_DELETE, KEY_BACKSPACE]:
@@ -963,7 +1113,9 @@ class ConfigSet(ConfigElement):
 
        def onDeselect(self, session):
                self.pos = -1
-               self.changed()
+               if not self.last_value == self.value:
+                       self.changedFinal()
+                       self.last_value = self.value+[]
                
        def tostring(self, value):
                return str(value)
@@ -980,6 +1132,7 @@ class ConfigLocations(ConfigElement):
                self.locations = []
                self.mountpoints = []
                harddiskmanager.on_partition_list_change.append(self.mountpointsChanged)
+               self.value = default+[]
 
        def setValue(self, value):
                loc = [x[0] for x in self.locations if x[3]]