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 network-setting (tested now... not yet complete... have to remove the cursor...
[enigma2.git]
/
lib
/
python
/
Components
/
config.py
diff --git
a/lib/python/Components/config.py
b/lib/python/Components/config.py
index 1486420c22d4f26cc927b84a9e5262b660affe50..7137845f7feb9cab8f38c793c3550de8af59d8ef 100644
(file)
--- a/
lib/python/Components/config.py
+++ b/
lib/python/Components/config.py
@@
-25,7
+25,7
@@
class configFile:
def addElement(self, line):
x = line.find("=")
if x > -1:
def addElement(self, line):
x = line.find("=")
if x > -1:
- self.configElements[line[:x]] = line[x + 1:]
+ self.configElements[line[:x]] = line[x + 1:
-1
]
def getKey(self, key):
return self.configElements[key]
def getKey(self, key):
return self.configElements[key]
@@
-43,10
+43,7
@@
class configFile:
keys = self.configElements.keys()
keys.sort()
for x in keys:
keys = self.configElements.keys()
keys.sort()
for x in keys:
- wstr = x + "=" + self.configElements[x]
-
- if wstr[len(wstr) - 1] != '\n':
- wstr = wstr + "\n"
+ wstr = x + "=" + self.configElements[x] + "\n"
fileHandle.write(wstr)
fileHandle.write(wstr)
@@
-58,10
+55,9
@@
class configSelection:
def checkValues(self):
if self.parent.value < 0:
def checkValues(self):
if self.parent.value < 0:
- self.parent.value = 0
-
- if(self.parent.value >= (len(self.parent.vals) - 1)):
- self.parent.value = len(self.parent.vals) - 1
+ self.parent.value = len(self.parent.vals) - 1
+ elif(self.parent.value > (len(self.parent.vals) - 1)):
+ self.parent.value = 0
def cancel(self):
self.parent.reload()
def cancel(self):
self.parent.reload()
@@
-77,11
+73,11
@@
class configSelection:
self.checkValues()
self.checkValues()
- self.parent.change()
+ self.parent.change()
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]
)
+ return ("text",
_(self.parent.vals[self.parent.value])
)
class configDateTime:
def __init__(self, parent):
class configDateTime:
def __init__(self, parent):
@@
-291,12
+287,14
@@
class configText:
self.parent.save()
def nextEntry(self):
self.parent.save()
def nextEntry(self):
- print
"Next entry"
- self.
handleKey(config.key["nextElement"]
)
+ print
self.parent
+ self.
parent.vals[1](self.parent.getConfigPath()
)
def handleKey(self, key):
#this will no change anything on the value itself
#so we can handle it here in gui element
def handleKey(self, key):
#this will no change anything on the value itself
#so we can handle it here in gui element
+ if key == config.key["delete"]:
+ self.parent.value = self.parent.value[0:self.markedPos] + self.parent.value[self.markedPos + 1:]
if key == config.key["prevElement"]:
self.textInput.nextKey()
self.markedPos -= 1
if key == config.key["prevElement"]:
self.textInput.nextKey()
self.markedPos -= 1
@@
-333,6
+331,7
@@
class Config:
self.key = { "choseElement": 0,
"prevElement": 1,
"nextElement": 2,
self.key = { "choseElement": 0,
"prevElement": 1,
"nextElement": 2,
+ "delete": 3,
"0": 10,
"1": 11,
"2": 12,
"0": 10,
"1": 11,
"2": 12,
@@
-345,6
+344,7
@@
class Config:
"9": 19 }
config = Config();
"9": 19 }
config = Config();
+
configfile = configFile()
class ConfigSlider:
configfile = configFile()
class ConfigSlider:
@@
-393,7
+393,7
@@
class configElement:
tcnt = cnt
cnt += 1
if tcnt != -1:
tcnt = cnt
cnt += 1
if tcnt != -1:
- return tcnt
+ return tcnt
return 0 #prevent bigger then array
def datafromFile(self, control, data):
return 0 #prevent bigger then array
def datafromFile(self, control, data):
@@
-427,7
+427,11
@@
class configElement:
return str(data.strip())
elif control == configSequence:
return str(data.strip())
elif control == configSequence:
- value = ((len(data) * ("%d" + self.vals[0]))[0:-1]) % tuple(data)
+ print data
+ try:
+ value = ((len(data) * ("%d" + self.vals[0]))[0:-1]) % tuple(data)
+ except:
+ value = str(data)
# just in case you don't understand the above, here an equivalent:
# value = ""
# for i in data:
# just in case you don't understand the above, here an equivalent:
# value = ""
# for i in data:
@@
-441,6
+445,7
@@
class configElement:
return ""
def loadData(self):
return ""
def loadData(self):
+ #print "load:" + self.configPath
try:
value = self.datafromFile(self.controlType, configfile.getKey(self.configPath))
except:
try:
value = self.datafromFile(self.controlType, configfile.getKey(self.configPath))
except:
@@
-456,6
+461,7
@@
class configElement:
self.save() #add missing value to dict
else:
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.value = value
#is this right? activate settings after load/cancel and use default
@@
-469,6
+475,10
@@
class configElement:
self.notifierList = [ ]
self.enabled = True
self.loadData()
self.notifierList = [ ]
self.enabled = True
self.loadData()
+
+ def getConfigPath(self):
+ return self.configPath
+
def addNotifier(self, notifier):
self.notifierList.append(notifier);
notifier(self);
def addNotifier(self, notifier):
self.notifierList.append(notifier);
notifier(self);
@@
-491,3
+501,9
@@
def getConfigListEntry(description, element):
b = element
item = b.controlType(b)
return ((description, item))
b = element
item = b.controlType(b)
return ((description, item))
+
+
+def configElementBoolean(name, default, texts=(_("Enable"), _("Disable"))):
+ return configElement(name, configSelection, default, texts)
+
+config.misc = ConfigSubsection()