X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/a29d455a1f7860faa7ca1f36586bfc6f6f3337c5..d17277948450b3b080049b7ce859044b57490120:/lib/python/Screens/Setup.py

diff --git a/lib/python/Screens/Setup.py b/lib/python/Screens/Setup.py
index 9f65daaa..0886ddf1 100644
--- a/lib/python/Screens/Setup.py
+++ b/lib/python/Screens/Setup.py
@@ -4,6 +4,7 @@ from Components.config import config				#global config instance
 from Components.config import configEntry
 from Components.config import configBoolean
 from Components.ConfigList import ConfigList
+from Components.Label import Label
 
 import xml.dom.minidom
 from xml.dom import EMPTY_NAMESPACE
@@ -11,13 +12,15 @@ from skin import elementsWithTag
 
 from Tools import XMLTools
 
-setupdom = xml.dom.minidom.parseString(
-	"""
-	<setup key="rc" title="RC Menu">
-		<item text="Repeat Rate">config.inputDevices.repeat</item>
-		<item text="Delay Rate">config.inputDevices.delay</item>
-	</setup>
-	""")
+# read the setupmenu
+try:
+	# first we search in the current path
+	setupfile = file('data/setup.xml', 'r')
+except:
+	# if not found in the current path, we use the global datadir-path
+	setupfile = file('/usr/share/enigma2/setup.xml', 'r')
+setupdom = xml.dom.minidom.parseString(setupfile.read())
+setupfile.close()
 
 def getValbyAttr(x, attr):
 	for p in range(x.attributes.length):
@@ -42,7 +45,11 @@ class Setup(Screen):
 				if b == "":
 					continue
 				#add to configlist
-				list.append( (ItemText, b.controlType(b) ) )
+				item = b.controlType(b)
+				
+				# the first b is the item itself, ignored by the configList.
+				# the second one is converted to string.
+				list.append( (ItemText, item) )
 
 	def keyOk(self):
 		self["config"].handleKey(0)
@@ -62,7 +69,9 @@ class Setup(Screen):
 
 		print "request setup for " + setup
 		
-		entries = setupdom.childNodes
+		xmldata = setupdom.childNodes[0]
+		
+		entries = xmldata.childNodes
 
 		list = []
 				
@@ -79,6 +88,9 @@ class Setup(Screen):
 		
 		self["config"] = ConfigList(list)
 
+		self["ok"] = Label("OK")
+		self["cancel"] = Label("Cancel")
+
 		self["actions"] = ActionMap(["SetupActions"], 
 			{
 				"cancel": self.close,