fix

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

diff --git a/lib/python/Screens/Setup.py b/lib/python/Screens/Setup.py
index 15cd7c66ddf2a1d625f7a64f9b602d7eed29137f..d6215afdad226e16c545cbe1691e9de5748d6b72 100644 (file)
--- a/lib/python/Screens/Setup.py
+++ b/lib/python/Screens/Setup.py
@@ -1,9 +1,10 @@
 from Screen import Screen
 from Screen import Screen

-from Components.ActionMap import ActionMap
+from Components.ActionMap import NumberActionMap

 from Components.config import config                           #global config instance
 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.ConfigList import ConfigList

+from Components.Label import Label
+from Components.Pixmap import Pixmap

 
 import xml.dom.minidom
 from xml.dom import EMPTY_NAMESPACE
 
 import xml.dom.minidom
 from xml.dom import EMPTY_NAMESPACE


@@ -11,13 +12,15 @@ from skin import elementsWithTag
 
 from Tools import XMLTools
 
 
 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):
 
 def getValbyAttr(x, attr):
        for p in range(x.attributes.length):


@@ -36,18 +39,54 @@ class Setup(Screen):
                        if x.nodeType != xml.dom.minidom.Element.nodeType:
                                continue
                        elif x.tagName == 'item':
                        if x.nodeType != xml.dom.minidom.Element.nodeType:
                                continue
                        elif x.tagName == 'item':

-                               ItemText = getValbyAttr(x, "text")
-                               b = XMLTools.mergeText(x.childNodes);
-                               print "item " + ItemText + " " + b
+                               ItemText = _(getValbyAttr(x, "text"))
+                               b = eval(XMLTools.mergeText(x.childNodes));
+                               print "item " + ItemText + " " + b.configPath
+                               if b == "":
+                                       continue

                                #add to configlist
                                #add to configlist

-                               list.append( (ItemText, config.getControlType(b) ) )
+                               item = b.controlType(b)

                                
                                

+                               # the first b is the item itself, ignored by the configList.
+                               # the second one is converted to string.
+                               list.append( (ItemText, item) )
+
+       def keyOk(self):
+               if (self["config"].getCurrent()[1].parent.enabled == True):
+                       self["config"].handleKey(config.key["choseElement"])
+       def keyLeft(self):
+               if (self["config"].getCurrent()[1].parent.enabled == True):
+                       self["config"].handleKey(config.key["prevElement"])
+       def keyRight(self):
+               if (self["config"].getCurrent()[1].parent.enabled == True):
+                       self["config"].handleKey(config.key["nextElement"])
+
+       def keySave(self):
+               print "save requested"
+               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 keyNumberGlobal(self, number):
+               print "You pressed number " + str(number)
+               if (self["config"].getCurrent()[1].parent.enabled == True):
+                       self["config"].handleKey(config.key[str(number)])
+
+

        def __init__(self, session, setup):
                Screen.__init__(self, session)
 
                print "request setup for " + setup
                
        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 = []
                                
 
                list = []
                                


@@ -59,12 +98,34 @@ class Setup(Screen):
                                if ItemText != setup:
                                        continue
                                self.addItems(list, x.childNodes);
                                if ItemText != setup:
                                        continue
                                self.addItems(list, x.childNodes);

+                               myTitle = getValbyAttr(x, "title")

                
                #check for list.entries > 0 else self.close
                
                #check for list.entries > 0 else self.close

+               

                self["config"] = ConfigList(list)
 
                self["config"] = ConfigList(list)
 

-               self["actions"] = ActionMap(["OkCancelActions"], 
+               self["title"] = Label(_(myTitle));
+
+               self["oktext"] = Label(_("OK"))
+               self["canceltext"] = Label(_("Cancel"))
+               self["ok"] = Pixmap()
+               self["cancel"] = Pixmap()
+               
+               self["actions"] = NumberActionMap(["SetupActions"], 

                        {
                        {

-                               "ok": self["config"].toggle,
-                               "cancel": self.close
-                       })
+                               "cancel": self.keyCancel,
+                               "ok": self.keyOk,
+                               "left": self.keyLeft,
+                               "right": self.keyRight,
+                               "save": self.keySave,
+                               "1": self.keyNumberGlobal,
+                               "2": self.keyNumberGlobal,
+                               "3": self.keyNumberGlobal,
+                               "4": self.keyNumberGlobal,
+                               "5": self.keyNumberGlobal,
+                               "6": self.keyNumberGlobal,
+                               "7": self.keyNumberGlobal,
+                               "8": self.keyNumberGlobal,
+                               "9": self.keyNumberGlobal,
+                               "0": self.keyNumberGlobal
+                       }, -1)