git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dont show display contrast setting in display setup when a oled is detected
[enigma2.git]
/
lib
/
python
/
Screens
/
Setup.py
diff --git
a/lib/python/Screens/Setup.py
b/lib/python/Screens/Setup.py
index 9c5c1e7dd72275df00d03f312b2b7ae10bd9e382..3439954dd0f9f24f573c6455c30be8743fec9f97 100644
(file)
--- a/
lib/python/Screens/Setup.py
+++ b/
lib/python/Screens/Setup.py
@@
-1,6
+1,6
@@
from Screen import Screen
from Components.ActionMap import NumberActionMap
from Screen import Screen
from Components.ActionMap import NumberActionMap
-from Components.config import config
+from Components.config import config
, ConfigNothing
from Components.ConfigList import ConfigListScreen
from Components.Label import Label
from Components.Pixmap import Pixmap
from Components.ConfigList import ConfigListScreen
from Components.Label import Label
from Components.Pixmap import Pixmap
@@
-55,28
+55,36
@@
class Setup(ConfigListScreen, Screen):
ALLOW_SUSPEND = True
ALLOW_SUSPEND = True
- def
__init__(self, session, setup
):
-
Screen.__init__(self, session
)
+ def
removeNotifier(self
):
+
config.usage.setup_level.notifiers.remove(self.levelChanged
)
+ def levelChanged(self, configElement):
+ list = []
+ self.refill(list)
+ self["config"].setList(list)
+
+ def refill(self, list):
xmldata = setupdom.childNodes[0]
xmldata = setupdom.childNodes[0]
-
entries = xmldata.childNodes
entries = xmldata.childNodes
-
- self.onChangedEntry = [ ]
- list = []
-
for x in entries: #walk through the actual nodelist
if x.nodeType != xml.dom.minidom.Element.nodeType:
continue
elif x.tagName == 'setup':
for x in entries: #walk through the actual nodelist
if x.nodeType != xml.dom.minidom.Element.nodeType:
continue
elif x.tagName == 'setup':
- if x.getAttribute("key") != setup:
+ if x.getAttribute("key") != se
lf.se
tup:
continue
self.addItems(list, x.childNodes);
continue
self.addItems(list, x.childNodes);
- myTitle = x.getAttribute("title").encode("UTF-8")
+ self.setup_title = x.getAttribute("title").encode("UTF-8")
+
+ def __init__(self, session, setup):
+ Screen.__init__(self, session)
+
+ self.onChangedEntry = [ ]
+
+ self.setup = setup
+ list = []
+ self.refill(list)
#check for list.entries > 0 else self.close
#check for list.entries > 0 else self.close
-
- self.setup_title = myTitle
self["title"] = Label(_(self.setup_title))
self["oktext"] = Label(_("OK"))
self["title"] = Label(_(self.setup_title))
self["oktext"] = Label(_("OK"))
@@
-115,6
+123,10
@@
class Setup(ConfigListScreen, Screen):
elif x.tagName == 'item':
item_level = int(x.getAttribute("level") or "0")
elif x.tagName == 'item':
item_level = int(x.getAttribute("level") or "0")
+ if not self.levelChanged in config.usage.setup_level.notifiers:
+ config.usage.setup_level.notifiers.append(self.levelChanged)
+ self.onClose.append(self.removeNotifier)
+
if item_level > config.usage.setup_level.index:
continue
if item_level > config.usage.setup_level.index:
continue
@@
-126,10
+138,12
@@
class Setup(ConfigListScreen, Screen):
item = b
# the first b is the item itself, ignored by the configList.
# the second one is converted to string.
item = b
# the first b is the item itself, ignored by the configList.
# the second one is converted to string.
- list.append( (item_text, item) )
+ if not isinstance(item, ConfigNothing):
+ list.append( (item_text, item) )
def getSetupTitle(id):
xmldata = setupdom.childNodes[0].childNodes
for x in elementsWithTag(xmldata, "setup"):
if x.getAttribute("key") == id:
return x.getAttribute("title").encode("UTF-8")
def getSetupTitle(id):
xmldata = setupdom.childNodes[0].childNodes
for x in elementsWithTag(xmldata, "setup"):
if x.getAttribute("key") == id:
return x.getAttribute("title").encode("UTF-8")
+ raise "unknown setup id '%s'!" % repr(id)