git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
permit also to record from service groups (services with associated alternative services)
[enigma2.git]
/
lib
/
python
/
Components
/
config.py
diff --git
a/lib/python/Components/config.py
b/lib/python/Components/config.py
index 876e3a34a7b56683960a98981088ef409eb1bf35..08dd3745e8e97f0dbbf983400c0e3ee5b344fd03 100755
(executable)
--- a/
lib/python/Components/config.py
+++ b/
lib/python/Components/config.py
@@
-29,6
+29,7
@@
from time import localtime, strftime
class ConfigElement(object):
def __init__(self):
self.saved_value = None
class ConfigElement(object):
def __init__(self):
self.saved_value = None
+ self.save_forced = False
self.last_value = None
self.save_disabled = False
self.__notifiers = None
self.last_value = None
self.save_disabled = False
self.__notifiers = None
@@
-83,7
+84,7
@@
class ConfigElement(object):
# you need to override this if str(self.value) doesn't work
def save(self):
# you need to override this if str(self.value) doesn't work
def save(self):
- if self.save_disabled or
self.value == self.default
:
+ if self.save_disabled or
(self.value == self.default and not self.save_forced)
:
self.saved_value = None
else:
self.saved_value = self.tostring(self.value)
self.saved_value = None
else:
self.saved_value = self.tostring(self.value)
@@
-178,7
+179,7
@@
class choicesList(object): # XXX: we might want a better name for this
def __list__(self):
if self.type == choicesList.LIST_TYPE_LIST:
def __list__(self):
if self.type == choicesList.LIST_TYPE_LIST:
- ret = [not isinstance(x, tuple) and x or
x[0]
for x in self.choices]
+ ret = [not isinstance(x, tuple) and x or
len(x) > 0 and x[0] or len(x) == 0 and x
for x in self.choices]
else:
ret = self.choices.keys()
return ret or [""]
else:
ret = self.choices.keys()
return ret or [""]
@@
-1034,13
+1035,13
@@
class ConfigSelectionNumber(ConfigSelection):
step += stepwidth
ConfigSelection.__init__(self, choices, default)
step += stepwidth
ConfigSelection.__init__(self, choices, default)
-
+
def getValue(self):
def getValue(self):
- return int(
self.text
)
+ return int(
ConfigSelection.getValue(self)
)
def setValue(self, val):
def setValue(self, val):
-
self.text = str(val
)
-
+
ConfigSelection.setValue(self, str(val)
)
+
def handleKey(self, key):
if not self.wraparound:
if key == KEY_RIGHT:
def handleKey(self, key):
if not self.wraparound:
if key == KEY_RIGHT:
@@
-1050,8
+1051,6
@@
class ConfigSelectionNumber(ConfigSelection):
if self.choices.index(self.value) == 0:
return
ConfigSelection.handleKey(self, key)
if self.choices.index(self.value) == 0:
return
ConfigSelection.handleKey(self, key)
-
-
class ConfigNumber(ConfigText):
def __init__(self, default = 0):
class ConfigNumber(ConfigText):
def __init__(self, default = 0):
@@
-1140,6
+1139,9
@@
class ConfigDirectory(ConfigText):
else:
return ConfigText.getMulti(self, selected)
else:
return ConfigText.getMulti(self, selected)
+ def onSelect(self, session):
+ self.allmarked = (self.value != "")
+
# a slider.
class ConfigSlider(ConfigElement):
def __init__(self, default = 0, increment = 1, limits = (0, 100)):
# a slider.
class ConfigSlider(ConfigElement):
def __init__(self, default = 0, increment = 1, limits = (0, 100)):