*** empty log message ***

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

diff --git a/lib/python/Screens/Setup.py b/lib/python/Screens/Setup.py
index de27ff5ee9f235f9ce0e5cd26a0e3af2501bb7ef..e2e55974bf524b967f72a2261adf1f0cf4965e83 100644 (file)
--- a/lib/python/Screens/Setup.py
+++ b/lib/python/Screens/Setup.py
@@ -1,9 +1,9 @@
 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
 
 import xml.dom.minidom
 from xml.dom import EMPTY_NAMESPACE
@@ -11,13 +11,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):
@@ -49,24 +51,32 @@ class Setup(Screen):
                                list.append( (ItemText, item) )
 
        def keyOk(self):
-               self["config"].handleKey(0)
+               self["config"].handleKey(config.choseElement)
        def keyLeft(self):
-               self["config"].handleKey(1)
+               self["config"].handleKey(config.prevElement)
        def keyRight(self):
-               self["config"].handleKey(2)
+               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)
 
                print "request setup for " + setup
                
-               entries = setupdom.childNodes
+               xmldata = setupdom.childNodes[0]
+               
+               entries = xmldata.childNodes
 
                list = []
                                
@@ -83,11 +93,14 @@ class Setup(Screen):
                
                self["config"] = ConfigList(list)
 
+               self["ok"] = Label("OK")
+               self["cancel"] = Label("Cancel")
+
                self["actions"] = ActionMap(["SetupActions"], 
                        {
-                               "cancel": self.close,
+                               "cancel": self.keyCancel,
                                "ok": self.keyOk,
                                "left": self.keyLeft,
                                "right": self.keyRight,
                                "save": self.keySave
-                       })
+                       }, -1)