X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/78950dbe85f5eafb3adb817eef742654d1f84e5a..82e78679568c43d341e4eb288b9a91385f5a6ed8:/lib/python/Screens/Setup.py

diff --git a/lib/python/Screens/Setup.py b/lib/python/Screens/Setup.py
index c643c750..cb268580 100644
--- a/lib/python/Screens/Setup.py
+++ b/lib/python/Screens/Setup.py
@@ -1,7 +1,6 @@
 from Screen import Screen
 from Components.ActionMap import ActionMap
 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
@@ -15,14 +14,13 @@ from Tools import XMLTools
 # read the setupmenu
 try:
 	# first we search in the current path
-	setupfile = file('data/menu.xml', 'r')
+	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):
 		a = x.attributes.item(p)
@@ -61,9 +59,15 @@ class Setup(Screen):
 
 	def keySave(self):
 		print "save requested"
-		for x in self["config"]:
-			selection =	self["config"].getCurrent()
-			selection.save()
+		for x in self["config"].list:
+			x[1].save()
+		self.close()
+
+	def keyCancel(self):
+		print "cancel requested"
+		for x in self["config"].list:
+			x[1].cancel()
+		self.close()
 
 	def __init__(self, session, setup):
 		Screen.__init__(self, session)
@@ -94,9 +98,9 @@ class Setup(Screen):
 
 		self["actions"] = ActionMap(["SetupActions"], 
 			{
-				"cancel": self.close,
+				"cancel": self.keyCancel,
 				"ok": self.keyOk,
 				"left": self.keyLeft,
 				"right": self.keyRight,
 				"save": self.keySave
-			})
+			}, -1)