git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- fixed left/right in language selection (updates language on the fly)
[enigma2.git]
/
lib
/
python
/
Components
/
config.py
diff --git
a/lib/python/Components/config.py
b/lib/python/Components/config.py
index a2dfb8db12871a2aa8d575e985da5d3533c2fab8..212c92eea5a16a2395aca9e1ab94c511b76e2542 100644
(file)
--- a/
lib/python/Components/config.py
+++ b/
lib/python/Components/config.py
@@
-48,7
+48,18
@@
class configFile:
fileHandle.write(wstr)
fileHandle.write(wstr)
- fileHandle.close()
+ fileHandle.close()
+
+def currentConfigSelectionElement(element):
+ return element.vals[element.value][0]
+
+def getConfigSelectionElement(element, value):
+ count = 0
+ for x in element.vals:
+ if x[0] == value:
+ return count
+ count += 1
+ return -1
class configSelection:
def __init__(self, parent):
class configSelection:
def __init__(self, parent):
@@
-78,8
+89,13
@@
class configSelection:
def __call__(self, selected): #needed by configlist
self.checkValues()
def __call__(self, selected): #needed by configlist
self.checkValues()
- return ("text", _(self.parent.vals[self.parent.value]))
-
+ if isinstance(self.parent.vals[self.parent.value], str):
+ returnValue = _(self.parent.vals[self.parent.value])
+ else:
+ returnValue = _(self.parent.vals[self.parent.value][1])
+
+ return ("text", returnValue)
+
class configDateTime:
def __init__(self, parent):
self.parent = parent
class configDateTime:
def __init__(self, parent):
self.parent = parent
@@
-148,7
+164,7
@@
class configSequenceArg:
def get(self, type, args = ()):
# configsequencearg.get ("IP")
if (type == "IP"):
def get(self, type, args = ()):
# configsequencearg.get ("IP")
if (type == "IP"):
- return (("."), [(
1
,255),(0,255),(0,255),(0,255)], "")
+ return (("."), [(
0
,255),(0,255),(0,255),(0,255)], "")
# configsequencearg.get ("MAC")
if (type == "MAC"):
return ((":"), [(1,255),(1,255),(1,255),(1,255),(1,255),(1,255)], "")
# configsequencearg.get ("MAC")
if (type == "MAC"):
return ((":"), [(1,255),(1,255),(1,255),(1,255),(1,255),(1,255)], "")
@@
-165,6
+181,9
@@
class configSequenceArg:
# configsequencearg.get("FLOAT", [(min,max),(min1,max1)]) => x.y with min <= x <= max and min1 <= y <= max1
if (type == "FLOAT"):
return (("."), args, "")
# configsequencearg.get("FLOAT", [(min,max),(min1,max1)]) => x.y with min <= x <= max and min1 <= y <= max1
if (type == "FLOAT"):
return (("."), args, "")
+
+ def getFloat(self, element):
+ return float(("%d.%0" + str(len(str(element.vals[1][1][1]))) + "d") % (element.value[0], element.value[1]))
configsequencearg = configSequenceArg()
configsequencearg = configSequenceArg()
@@
-238,15
+257,10
@@
class configSequence:
olddec = oldvalue % 10 ** (numberLen - posinblock) - (oldvalue % 10 ** (numberLen - posinblock - 1))
newvalue = oldvalue - olddec + (10 ** (numberLen - posinblock - 1) * number)
olddec = oldvalue % 10 ** (numberLen - posinblock) - (oldvalue % 10 ** (numberLen - posinblock - 1))
newvalue = oldvalue - olddec + (10 ** (numberLen - posinblock - 1) * number)
- print "You actually pressed a number (" + str(number) + ") which will be added at block number " + str(blocknumber) + " on position " + str(posinblock)
- print "Old value: " + str(oldvalue) + " olddec: " + str(olddec) + " newvalue: " + str(newvalue)
self.parent.value[blocknumber] = newvalue
self.markedPos += 1
self.parent.value[blocknumber] = newvalue
self.markedPos += 1
- self.checkValues()
-
- print "markPos:",
- print self.markedPos
+ self.checkValues()
#FIXME: dont call when press left/right
self.parent.change()
#FIXME: dont call when press left/right
self.parent.change()
@@
-254,7
+268,6
@@
class configSequence:
def __call__(self, selected): #needed by configlist
value = ""
mPos = self.markedPos
def __call__(self, selected): #needed by configlist
value = ""
mPos = self.markedPos
- print "Positon: " + str(mPos)
num = 0;
for i in self.parent.value:
if len(value): #fixme no heading separator possible
num = 0;
for i in self.parent.value:
if len(value): #fixme no heading separator possible
@@
-266,7
+279,6
@@
class configSequence:
#if diff > 0:
## if this helps?!
#value += " " * diff
#if diff > 0:
## if this helps?!
#value += " " * diff
- print (("%0" + str(len(str(self.valueBounds[num][1]))) + "d") % i)
if (self.censorChar == ""):
value += ("%0" + str(len(str(self.valueBounds[num][1]))) + "d") % i
else:
if (self.censorChar == ""):
value += ("%0" + str(len(str(self.valueBounds[num][1]))) + "d") % i
else:
@@
-304,7
+316,6
@@
class configText:
self.parent.save()
def nextEntry(self):
self.parent.save()
def nextEntry(self):
- print self.parent
self.parent.vals[1](self.parent.getConfigPath())
def handleKey(self, key):
self.parent.vals[1](self.parent.getConfigPath())
def handleKey(self, key):
@@
-417,7
+428,17
@@
class configElement:
if control == ConfigSlider:
return int(data)
elif control == configSelection:
if control == ConfigSlider:
return int(data)
elif control == configSelection:
- return int(data)
+ try:
+ return int(data)
+ except:
+ for x in data.split(":"):
+ if x[0] == "*":
+ count = 0
+ for y in self.vals:
+ if y[0] == x[1:-1]:
+ return count
+ count += 1
+ return self.defaultValue
elif control == configDateTime:
return int(data)
elif control == configText:
elif control == configDateTime:
return int(data)
elif control == configText:
@@
-437,24
+458,39
@@
class configElement:
if control == ConfigSlider:
return str(data)
elif control == configSelection:
if control == ConfigSlider:
return str(data)
elif control == configSelection:
+ if len(self.vals) < data + 1:
+ return "0"
+ if isinstance(self.vals[data], str):
+ return str(data)
+ else:
+ confList = []
+ count = 0
+ for x in self.vals:
+ if count == data:
+ confList.append("*" + str(x[0] + "*"))
+ else:
+ confList.append(x[0])
+ count += 1
+ return ":".join(confList)
return str(data)
elif control == configDateTime:
return str(data)
elif control == configText:
return str(data.strip())
return str(data)
elif control == configDateTime:
return str(data)
elif control == configText:
return str(data.strip())
-
elif control == configSequence:
elif control == configSequence:
- print data
+# print self.vals
+# print self.value
try:
try:
- value = ((len(data) * ("%d" + self.vals[0]))[0:-1]) % tuple(data)
+ value = ""
+ count = 0
+ for i in data:
+ if value !="":
+ value += self.vals[0]
+ value += (("%0" + str(len(str(self.vals[1][count][1]))) + "d") % i)
+ count += 1
+ #value = ((len(data) * ("%d" + self.vals[0]))[0:-1]) % tuple(data)
except:
value = str(data)
except:
value = str(data)
-# just in case you don't understand the above, here an equivalent:
-# value = ""
-# for i in data:
-# if value !="":
-# value += self.vals[0]
-# value += str(i)
return value
elif control == configSatlist:
return str(self.vals[self.value][1]);
return value
elif control == configSatlist:
return str(self.vals[self.value][1]);
@@
-470,27
+506,29
@@
class configElement:
if value == "":
#print "value not found - using default"
if value == "":
#print "value not found - using default"
-
if self.controlType == configSatlist:
self.value = self.getIndexbyEntry(self.defaultValue)
if self.controlType == configSatlist:
self.value = self.getIndexbyEntry(self.defaultValue)
- else:
+ elif self.controlType == configSequence:
+ self.value = self.defaultValue[:]
+ else:
self.value = self.defaultValue
self.save() #add missing value to dict
else:
#print "set val:" + str(value)
self.value = value
self.value = self.defaultValue
self.save() #add missing value to dict
else:
#print "set val:" + str(value)
self.value = value
-
+
#is this right? activate settings after load/cancel and use default
self.change()
#is this right? activate settings after load/cancel and use default
self.change()
- def __init__(self, configPath, control, defaultValue, vals):
+ def __init__(self, configPath, control, defaultValue, vals
, saveDefaults = True
):
self.configPath = configPath
self.defaultValue = defaultValue
self.controlType = control
self.vals = vals
self.notifierList = [ ]
self.enabled = True
self.configPath = configPath
self.defaultValue = defaultValue
self.controlType = control
self.vals = vals
self.notifierList = [ ]
self.enabled = True
+ self.saveDefaults = saveDefaults
self.loadData()
def getConfigPath(self):
self.loadData()
def getConfigPath(self):
@@
-499,13
+537,21
@@
class configElement:
def addNotifier(self, notifier):
self.notifierList.append(notifier);
notifier(self);
def addNotifier(self, notifier):
self.notifierList.append(notifier);
notifier(self);
+
def change(self):
for notifier in self.notifierList:
notifier(self)
def change(self):
for notifier in self.notifierList:
notifier(self)
+
def reload(self):
self.loadData()
def reload(self):
self.loadData()
+
def save(self):
def save(self):
- configfile.setKey(self.configPath, self.datatoFile(self.controlType,self.value))
+ if self.controlType == configSatlist:
+ defaultValue = self.getIndexbyEntry(self.defaultValue)
+ else:
+ defaultValue = self.defaultValue
+ if (defaultValue != self.value) or (self.saveDefaults == True):
+ configfile.setKey(self.configPath, self.datatoFile(self.controlType,self.value))
class configElement_nonSave(configElement):
def __init__(self, configPath, control, defaultValue, vals):
class configElement_nonSave(configElement):
def __init__(self, configPath, control, defaultValue, vals):
@@
-513,13
+559,12
@@
class configElement_nonSave(configElement):
def save(self):
pass
def save(self):
pass
-
+
def getConfigListEntry(description, element):
b = element
item = b.controlType(b)
return ((description, item))
def getConfigListEntry(description, element):
b = element
item = b.controlType(b)
return ((description, item))
-
def configElementBoolean(name, default, texts=(_("Enable"), _("Disable"))):
return configElement(name, configSelection, default, texts)
def configElementBoolean(name, default, texts=(_("Enable"), _("Disable"))):
return configElement(name, configSelection, default, texts)