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
[enigma2.git]
/
lib
/
python
/
Components
/
config.py
diff --git
a/lib/python/Components/config.py
b/lib/python/Components/config.py
index 19fdefeee5a52311d0c8bbdd5f3ad11f548ff2e5..25684fc186dcda69b112869e5ffd145f6db476d2 100644
(file)
--- a/
lib/python/Components/config.py
+++ b/
lib/python/Components/config.py
@@
-1,12
+1,13
@@
from time import *
from Tools.NumericalTextInput import *
from time import *
from Tools.NumericalTextInput import *
+from Tools.Directories import *
class configFile:
def __init__(self):
self.changed = 0
self.configElements = { }
try:
class configFile:
def __init__(self):
self.changed = 0
self.configElements = { }
try:
- self.file = open(
"config"
)
+ self.file = open(
resolveFilename(SCOPE_CONFIG, "config")
)
except IOError:
print "cannot open config file"
return
except IOError:
print "cannot open config file"
return
@@
-38,19
+39,27
@@
class configFile:
if self.changed == 0: #no changes, so no write to disk needed
return
if self.changed == 0: #no changes, so no write to disk needed
return
- fileHandle = open(
"config"
, "w")
+ fileHandle = open(
resolveFilename(SCOPE_CONFIG, "config")
, "w")
keys = self.configElements.keys()
keys.sort()
for x in keys:
wstr = x + "=" + self.configElements[x] + "\n"
keys = self.configElements.keys()
keys.sort()
for x in keys:
wstr = x + "=" + self.configElements[x] + "\n"
-
- if wstr[len(wstr) - 1] != '\n':
- wstr = wstr + "\n"
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):
@@
-58,10
+67,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()
@@
-81,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
@@
-151,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)], "")
@@
-216,13
+229,26
@@
class configSequence:
self.markedPos += 1
if key >= config.key["0"] and key <= config.key["9"]:
self.markedPos += 1
if key >= config.key["0"] and key <= config.key["9"]:
+ self.blockLen = []
+ for x in self.valueBounds:
+ self.blockLen.append(len(str(x[1])))
+
+ pos = 0
+ blocknumber = 0
+ self.blockLenTotal = [0,]
+ for x in self.blockLen:
+ pos += self.blockLen[blocknumber]
+ self.blockLenTotal.append(pos)
+ if (pos - 1 >= self.markedPos):
+ pass
+ else:
+ blocknumber += 1
+
number = 9 - config.key["9"] + key
# length of numberblock
number = 9 - config.key["9"] + key
# length of numberblock
- numberLen = len(str(self.valueBounds[
0
][1]))
+ numberLen = len(str(self.valueBounds[
blocknumber
][1]))
# position in the block
# position in the block
- posinblock = self.markedPos % numberLen
- # blocknumber
- blocknumber = self.markedPos / numberLen
+ posinblock = self.markedPos - self.blockLenTotal[blocknumber]
oldvalue = self.parent.value[blocknumber]
olddec = oldvalue % 10 ** (numberLen - posinblock) - (oldvalue % 10 ** (numberLen - posinblock - 1))
oldvalue = self.parent.value[blocknumber]
olddec = oldvalue % 10 ** (numberLen - posinblock) - (oldvalue % 10 ** (numberLen - posinblock - 1))
@@
-264,8
+290,11
@@
class configSequence:
num += 1
# only mark cursor when we are selected
# (this code is heavily ink optimized!)
num += 1
# only mark cursor when we are selected
# (this code is heavily ink optimized!)
- return ("mtext"[1-selected:], value, [mPos])
-
+ if (self.parent.enabled == True):
+ return ("mtext"[1-selected:], value, [mPos])
+ else:
+ return ("text", value)
+
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
@@
-297,6
+326,8
@@
class configText:
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
+364,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
+377,7
@@
class Config:
"9": 19 }
config = Config();
"9": 19 }
config = Config();
+
configfile = configFile()
class ConfigSlider:
configfile = configFile()
class ConfigSlider:
@@
-400,7
+433,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:
@@
-420,6
+463,18
@@
class configElement:
if control == ConfigSlider:
return str(data)
elif control == configSelection:
if control == ConfigSlider:
return str(data)
elif control == configSelection:
+ 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)
return str(data)
elif control == configDateTime:
return str(data)
@@
-501,3
+556,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()