diff options
| author | Fraxinas <andreas.frisch@multimedia-labs.de> | 2009-02-20 11:39:29 +0100 |
|---|---|---|
| committer | Fraxinas <andreas.frisch@multimedia-labs.de> | 2009-02-20 11:39:29 +0100 |
| commit | fd7605d30bb6b1523282dfb0493826dfd2e26152 (patch) | |
| tree | 2f1fd5309079389430a912bfc99738646ed74dcd /lib/python/Components/config.py | |
| parent | c7e6f96e31b2ffd4cdc9419d5f9ed4912b960745 (diff) | |
| parent | 29d62cc699d7043a749e6f184925b7fd14b5daab (diff) | |
| download | enigma2-fd7605d30bb6b1523282dfb0493826dfd2e26152.tar.gz enigma2-fd7605d30bb6b1523282dfb0493826dfd2e26152.zip | |
Merge branch 'master' of fraxinas@git.opendreambox.org:/git/enigma2
Diffstat (limited to 'lib/python/Components/config.py')
| -rwxr-xr-x | lib/python/Components/config.py | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py index a6d34152..e3a29b52 100755 --- a/lib/python/Components/config.py +++ b/lib/python/Components/config.py @@ -279,6 +279,7 @@ class ConfigSelection(ConfigElement): if default is None: default = self.choices.default() + self._descr = None self.default = self._value = self.last_value = default self.changed() @@ -296,6 +297,7 @@ class ConfigSelection(ConfigElement): self._value = value else: self._value = self.default + self._descr = None self.changed() def tostring(self, val): @@ -307,7 +309,7 @@ class ConfigSelection(ConfigElement): def setCurrentText(self, text): i = self.choices.index(self.value) self.choices[i] = text - self.description[text] = text + self._descr = self.description[text] = text self._value = text value = property(getValue, setValue) @@ -336,13 +338,18 @@ class ConfigSelection(ConfigElement): self.value = self.choices[(i + 1) % nchoices] def getText(self): - descr = self.description[self.value] + if self._descr is not None: + return self._descr + descr = self._descr = self.description[self.value] if descr: return _(descr) return descr def getMulti(self, selected): - descr = self.description[self.value] + if self._descr is not None: + descr = self._descr + else: + descr = self._descr = self.description[self.value] if descr: return ("text", _(descr)) return ("text", descr) |