beautify the ok, cancel and initialize buttons

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

diff --git a/lib/python/Screens/Setup.py b/lib/python/Screens/Setup.py
index c643c7503de9020923db8a02472a0c3f9372170d..d6215afdad226e16c545cbe1691e9de5748d6b72 100644 (file)
--- a/lib/python/Screens/Setup.py
+++ b/lib/python/Screens/Setup.py
@@ -1,10 +1,10 @@
 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 configEntry
-from Components.config import configBoolean
+from Components.config import configSelection
 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
@@ -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)
@@ -40,7 +39,7 @@ class Setup(Screen):
                        if x.nodeType != xml.dom.minidom.Element.nodeType:
                                continue
                        elif x.tagName == 'item':
-                               ItemText = getValbyAttr(x, "text")
+                               ItemText = _(getValbyAttr(x, "text"))
                                b = eval(XMLTools.mergeText(x.childNodes));
                                print "item " + ItemText + " " + b.configPath
                                if b == "":
@@ -53,17 +52,32 @@ 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.key["choseElement"])
        def keyLeft(self):
-               self["config"].handleKey(1)
+               if (self["config"].getCurrent()[1].parent.enabled == True):
+                       self["config"].handleKey(config.key["prevElement"])
        def keyRight(self):
-               self["config"].handleKey(2)
+               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"]:
-                       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 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)
@@ -84,19 +98,34 @@ class Setup(Screen):
                                if ItemText != setup:
                                        continue
                                self.addItems(list, x.childNodes);
+                               myTitle = getValbyAttr(x, "title")
                
                #check for list.entries > 0 else self.close
                
                self["config"] = ConfigList(list)
 
-               self["ok"] = Label("OK")
-               self["cancel"] = Label("Cancel")
+               self["title"] = Label(_(myTitle));
 
-               self["actions"] = ActionMap(["SetupActions"], 
+               self["oktext"] = Label(_("OK"))
+               self["canceltext"] = Label(_("Cancel"))
+               self["ok"] = Pixmap()
+               self["cancel"] = Pixmap()
+               
+               self["actions"] = NumberActionMap(["SetupActions"], 
                        {
-                               "cancel": self.close,
+                               "cancel": self.keyCancel,
                                "ok": self.keyOk,
                                "left": self.keyLeft,
                                "right": self.keyRight,
-                               "save": self.keySave
-                       })
+                               "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)