configBoolean is now configSelection

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

diff --git a/lib/python/Screens/Setup.py b/lib/python/Screens/Setup.py
index 0886ddf12781bb7dffd54ee10f16821d0957cf1a..589f470cd7a1c57947fa606dff8ac808bf6d50c8 100644 (file)
--- a/lib/python/Screens/Setup.py
+++ b/lib/python/Screens/Setup.py
@@ -1,8 +1,7 @@
 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.config import configSelection
 from Components.ConfigList import ConfigList
 from Components.Label import Label
 
@@ -52,17 +51,26 @@ class Setup(Screen):
                                list.append( (ItemText, item) )
 
        def keyOk(self):
-               self["config"].handleKey(0)
+               if (self["config"].getCurrent()[1].parent.enabled == True):
+                       self["config"].handleKey(config.choseElement)
        def keyLeft(self):
-               self["config"].handleKey(1)
+               if (self["config"].getCurrent()[1].parent.enabled == True):
+                       self["config"].handleKey(config.prevElement)
        def keyRight(self):
-               self["config"].handleKey(2)
+               if (self["config"].getCurrent()[1].parent.enabled == True):
+                       self["config"].handleKey(config.nextElement)
 
        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 +101,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)