network setup stuff

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

diff --git a/lib/python/Screens/Setup.py b/lib/python/Screens/Setup.py
index 0886ddf12781bb7dffd54ee10f16821d0957cf1a..cb2685804652dfa11adb8a08694a7ac29a4284ab 100644 (file)
--- 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
@@ -60,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)
@@ -93,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)