git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add .cvsignores to plugins
[enigma2.git]
/
lib
/
python
/
Components
/
config.py
diff --git
a/lib/python/Components/config.py
b/lib/python/Components/config.py
index c06d3b7298e1c0f48588d2d17435f2c6a589700b..635eb748589e28d095dbec67756de463443f662a 100644
(file)
--- a/
lib/python/Components/config.py
+++ b/
lib/python/Components/config.py
@@
-27,11
+27,9
@@
class configFile:
x = line.find("=")
if x > -1:
self.configElements[line[:x]] = line[x + 1:-1]
x = line.find("=")
if x > -1:
self.configElements[line[:x]] = line[x + 1:-1]
-
+
def getKey(self, key):
def getKey(self, key):
- if self.configElements.has_key(key):
- return self.configElements[key]
- return None
+ return self.configElements[key]
def setKey(self, key, value, isDefaultKey=False):
self.changed = 1
def setKey(self, key, value, isDefaultKey=False):
self.changed = 1
@@
-295,7
+293,27
@@
class configSequence:
return ("mtext"[1-selected:], value, [mPos])
else:
return ("text", value)
return ("mtext"[1-selected:], value, [mPos])
else:
return ("text", value)
+
+class configNothing:
+ def __init__(self, parent):
+ self.parent = parent
+ self.markedPos = 0
+
+ def cancel(self):
+ self.parent.reload()
+
+ def save(self):
+ self.parent.save()
+ def nextEntry(self):
+ self.parent.vals[1](self.parent.getConfigPath())
+
+ def handleKey(self, key):
+ pass
+
+ def __call__(self, selected): #needed by configlist
+ return ("text", "")
+
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
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
@@
-380,7
+398,7
@@
config = Config();
configfile = configFile()
configfile = configFile()
-class
C
onfigSlider:
+class
c
onfigSlider:
def __init__(self, parent):
self.parent = parent
def __init__(self, parent):
self.parent = parent
@@
-394,21
+412,21
@@
class ConfigSlider:
if self.parent.value < 0:
self.parent.value = 0
if self.parent.value < 0:
self.parent.value = 0
- if self.parent.value >
10
:
- self.parent.value =
10
+ if self.parent.value >
self.parent.vals[1]
:
+ self.parent.value =
self.parent.vals[1]
def handleKey(self, key):
if key == config.key["prevElement"]:
def handleKey(self, key):
if key == config.key["prevElement"]:
- self.parent.value = self.parent.value -
1
+ self.parent.value = self.parent.value -
self.parent.vals[0]
if key == config.key["nextElement"]:
if key == config.key["nextElement"]:
- self.parent.value = self.parent.value +
1
+ self.parent.value = self.parent.value +
self.parent.vals[0]
self.checkValues()
self.parent.change()
def __call__(self, selected): #needed by configlist
self.checkValues()
self.checkValues()
self.parent.change()
def __call__(self, selected): #needed by configlist
self.checkValues()
- return ("slider", self.parent.value
* 10
)
+ return ("slider", self.parent.value
, self.parent.vals[1]
)
class ConfigSubsection:
def __init__(self):
class ConfigSubsection:
def __init__(self):
@@
-430,7
+448,7
@@
class configElement:
return 0 #prevent bigger then array
def datafromFile(self, control, data):
return 0 #prevent bigger then array
def datafromFile(self, control, data):
- if control ==
C
onfigSlider:
+ if control ==
c
onfigSlider:
return int(data)
elif control == configSelection:
try:
return int(data)
elif control == configSelection:
try:
@@
-460,7
+478,7
@@
class configElement:
return ""
def datatoFile(self, control, data):
return ""
def datatoFile(self, control, data):
- if control ==
C
onfigSlider:
+ if control ==
c
onfigSlider:
return str(data)
elif control == configSelection:
if len(self.vals) < data + 1:
return str(data)
elif control == configSelection:
if len(self.vals) < data + 1:
@@
-558,7
+576,10
@@
class configElement:
if self.value != defaultValue or self.saveDefaults:
configfile.setKey(self.configPath, self.datatoFile(self.controlType, self.value))
else:
if self.value != defaultValue or self.saveDefaults:
configfile.setKey(self.configPath, self.datatoFile(self.controlType, self.value))
else:
- oldValue = configfile.getKey(self.configPath)
+ try:
+ oldValue = configfile.getKey(self.configPath)
+ except:
+ oldValue = None
if oldValue is not None and oldValue != defaultValue:
configfile.setKey(self.configPath, self.datatoFile(self.controlType, self.value), True)
if oldValue is not None and oldValue != defaultValue:
configfile.setKey(self.configPath, self.datatoFile(self.controlType, self.value), True)