X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/1c21fe13bb453d0f11c8a40461b3bfe7dba5cef1..90a6f5184efbee4252e015a82aecd296749bcad3:/lib/python/Screens/Setup.py

diff --git a/lib/python/Screens/Setup.py b/lib/python/Screens/Setup.py
index 3439954d..3ff0b76e 100644
--- a/lib/python/Screens/Setup.py
+++ b/lib/python/Screens/Setup.py
@@ -1,13 +1,12 @@
 from Screen import Screen
 from Components.ActionMap import NumberActionMap
 from Components.config import config, ConfigNothing
+from Components.SystemInfo import SystemInfo
 from Components.ConfigList import ConfigListScreen
 from Components.Label import Label
 from Components.Pixmap import Pixmap
 
 import xml.dom.minidom
-from skin import elementsWithTag
-
 from Tools import XMLTools
 
 # FIXME: use resolveFile!
@@ -78,6 +77,9 @@ class Setup(ConfigListScreen, Screen):
 	def __init__(self, session, setup):
 		Screen.__init__(self, session)
 
+		# for the skin: first try a setup_<setupID>, then Setup
+		self.skinName = ["setup_" + setup, "Setup" ]
+
 		self.onChangedEntry = [ ]
 
 		self.setup = setup
@@ -130,6 +132,10 @@ class Setup(ConfigListScreen, Screen):
 				if item_level > config.usage.setup_level.index:
 					continue
 
+				requires = x.getAttribute("requires")
+				if requires and not SystemInfo.get(requires, False):
+					continue;
+
 				item_text = _(x.getAttribute("text").encode("UTF-8") or "??")
 				b = eval(XMLTools.mergeText(x.childNodes));
 				if b == "":
@@ -143,7 +149,7 @@ class Setup(ConfigListScreen, Screen):
 
 def getSetupTitle(id):
 	xmldata = setupdom.childNodes[0].childNodes
-	for x in elementsWithTag(xmldata, "setup"):
+	for x in XMLTools.elementsWithTag(xmldata, "setup"):
 		if x.getAttribute("key") == id:
 			return x.getAttribute("title").encode("UTF-8")
 	raise "unknown setup id '%s'!" % repr(id)