git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of /home/tmbinc/enigma2-git
[enigma2.git]
/
lib
/
python
/
Components
/
config.py
diff --git
a/lib/python/Components/config.py
b/lib/python/Components/config.py
index e3a29b52cf630bf00a9d93f878bb32b3766a67f8..24d39cbaeee8659b4553a506544a528e2bd9623a 100755
(executable)
--- a/
lib/python/Components/config.py
+++ b/
lib/python/Components/config.py
@@
-385,7
+385,7
@@
class ConfigBoolean(ConfigElement):
self.value = self.last_value = self.default = default
def handleKey(self, key):
self.value = self.last_value = self.default = default
def handleKey(self, key):
- if key in
[KEY_LEFT, KEY_RIGHT]
:
+ if key in
(KEY_LEFT, KEY_RIGHT)
:
self.value = not self.value
elif key == KEY_HOME:
self.value = False
self.value = not self.value
elif key == KEY_HOME:
self.value = False
@@
-1029,6
+1029,13
@@
class ConfigNumber(ConfigText):
value = property(getValue, setValue)
_value = property(getValue, setValue)
value = property(getValue, setValue)
_value = property(getValue, setValue)
+ def isChanged(self):
+ sv = self.saved_value
+ strv = self.tostring(self.value)
+ if sv is None and strv == self.default:
+ return False
+ return strv != sv
+
def conform(self):
pos = len(self.text) - self.marked_pos
self.text = self.text.lstrip("0")
def conform(self):
pos = len(self.text) - self.marked_pos
self.text = self.text.lstrip("0")
@@
-1187,7
+1194,7
@@
class ConfigSet(ConfigElement):
self.pos = -1
else:
self.pos += 1
self.pos = -1
else:
self.pos += 1
- elif key in
[KEY_HOME, KEY_END]
:
+ elif key in
(KEY_HOME, KEY_END)
:
self.pos = -1
def genString(self, lst):
self.pos = -1
def genString(self, lst):
@@
-1352,7
+1359,7
@@
class ConfigLocations(ConfigElement):
self.pos += 1
if self.pos >= len(self.value):
self.pos = -1
self.pos += 1
if self.pos >= len(self.value):
self.pos = -1
- elif key in
[KEY_HOME, KEY_END]
:
+ elif key in
(KEY_HOME, KEY_END)
:
self.pos = -1
def getText(self):
self.pos = -1
def getText(self):
@@
-1614,8
+1621,9
@@
class Config(ConfigSubsection):
self.setSavedValue(tree["config"])
def saveToFile(self, filename):
self.setSavedValue(tree["config"])
def saveToFile(self, filename):
+ text = self.pickle()
f = open(filename, "w")
f = open(filename, "w")
- f.write(
self.pickle()
)
+ f.write(
text
)
f.close()
def loadFromFile(self, filename):
f.close()
def loadFromFile(self, filename):