add save/cancel functions

[enigma2.git] / lib / python / Screens / Setup.py

diff --git a/lib/python/Screens/Setup.py b/lib/python/Screens/Setup.py
index c643c7503de9020923db8a02472a0c3f9372170d..fc108a48887252d71fe0ab59c7c9374ea2631db5 100644 (file)
--- a/lib/python/Screens/Setup.py
+++ b/lib/python/Screens/Setup.py
@@ -15,14 +15,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 +60,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,7 +99,7 @@ class Setup(Screen):
 
                self["actions"] = ActionMap(["SetupActions"], 
                        {
-                               "cancel": self.close,
+                               "cancel": self.keyCancel,
                                "ok": self.keyOk,
                                "left": self.keyLeft,
                                "right": self.keyRight,