git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix configElementBoolean display sense
[enigma2.git]
/
lib
/
python
/
Components
/
config.py
diff --git
a/lib/python/Components/config.py
b/lib/python/Components/config.py
index 51ac7606f0de6da5c667f349e65da9b7a153adf9..c17e5aa12922350e88d3d64807c1b96ecc2cebad 100644
(file)
--- a/
lib/python/Components/config.py
+++ b/
lib/python/Components/config.py
@@
-38,6
+38,18
@@
class configFile:
else:
self.configElements[key] = value
else:
self.configElements[key] = value
+ def getResolvedKey(self, key):
+ str = self.configElements[key]
+ if len(str):
+ pos = str.find('*')
+ if pos != -1:
+ str = str[pos+1:]
+ pos = str.find('*')
+ if pos != -1:
+ return str[:pos]
+ return str
+ return None
+
def save(self):
if self.changed == 0: #no changes, so no write to disk needed
return
def save(self):
if self.changed == 0: #no changes, so no write to disk needed
return
@@
-95,7
+107,7
@@
class configSelection:
returnValue = _(self.parent.vals[self.parent.value])
if not isinstance(returnValue, str):
returnValue = _(self.parent.vals[self.parent.value])
if not isinstance(returnValue, str):
- returnValue = returnValue[
0
]
+ returnValue = returnValue[
1
]
# FIXME: it's not really nice to translate this here.
# however, configSelections are persistent.
# FIXME: it's not really nice to translate this here.
# however, configSelections are persistent.
@@
-176,6
+188,8
@@
class configSequenceArg:
if (type == "IP"):
return (("."), [(0,255),(0,255),(0,255),(0,255)], "")
# configsequencearg.get ("MAC")
if (type == "IP"):
return (("."), [(0,255),(0,255),(0,255),(0,255)], "")
# configsequencearg.get ("MAC")
+ if (type == "POSITION"):
+ return ((","), [(0,args[0]),(0,args[1]),(0,args[2]),(0,args[3])], "")
if (type == "MAC"):
return ((":"), [(1,255),(1,255),(1,255),(1,255),(1,255),(1,255)], "")
# configsequencearg.get ("CLOCK")
if (type == "MAC"):
return ((":"), [(1,255),(1,255),(1,255),(1,255),(1,255),(1,255)], "")
# configsequencearg.get ("CLOCK")
@@
-602,7
+616,7
@@
def getConfigListEntry(description, element):
item = b.controlType(b)
return ((description, item))
item = b.controlType(b)
return ((description, item))
-def configElementBoolean(name, default, texts=(_("
Enable"), _("Dis
able"))):
+def configElementBoolean(name, default, texts=(_("
Disable"), _("En
able"))):
return configElement(name, configSelection, default, texts)
config.misc = ConfigSubsection()
return configElement(name, configSelection, default, texts)
config.misc = ConfigSubsection()