add simple summary

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

diff --git a/lib/python/Screens/Setup.py b/lib/python/Screens/Setup.py
index dd555c0aa01ff35800b9b03d1442c0edfaca8a70..d6215afdad226e16c545cbe1691e9de5748d6b72 100644 (file)
--- a/lib/python/Screens/Setup.py
+++ b/lib/python/Screens/Setup.py
@@ -1,9 +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 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
@@ -38,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 == "":
@@ -78,30 +79,6 @@ class Setup(Screen):
                        self["config"].handleKey(config.key[str(number)])
 
 
-       # TODO ugly as hell. any better ideas?
-       def keyNumber1(self):
-               self.keyNumberGlobal(1)
-       def keyNumber2(self):
-               self.keyNumberGlobal(2)
-       def keyNumber3(self):
-               self.keyNumberGlobal(3)
-       def keyNumber4(self):
-               self.keyNumberGlobal(4)
-       def keyNumber5(self):
-               self.keyNumberGlobal(5)
-       def keyNumber6(self):
-               self.keyNumberGlobal(6)
-       def keyNumber7(self):
-               self.keyNumberGlobal(7)
-       def keyNumber8(self):
-               self.keyNumberGlobal(8)
-       def keyNumber9(self):
-               self.keyNumberGlobal(9)
-       def keyNumber0(self):
-               self.keyNumberGlobal(0)
-
-
-
        def __init__(self, session, setup):
                Screen.__init__(self, session)
 
@@ -127,26 +104,28 @@ class Setup(Screen):
                
                self["config"] = ConfigList(list)
 
-               self["title"] = Label(myTitle);
+               self["title"] = Label(_(myTitle));
 
-               self["ok"] = Label("OK")
-               self["cancel"] = Label("Cancel")
-
-               self["actions"] = ActionMap(["SetupActions"], 
+               self["oktext"] = Label(_("OK"))
+               self["canceltext"] = Label(_("Cancel"))
+               self["ok"] = Pixmap()
+               self["cancel"] = Pixmap()
+               
+               self["actions"] = NumberActionMap(["SetupActions"], 
                        {
                                "cancel": self.keyCancel,
                                "ok": self.keyOk,
                                "left": self.keyLeft,
                                "right": self.keyRight,
                                "save": self.keySave,
-                   "1": self.keyNumber1,
-                   "2": self.keyNumber2,
-                   "3": self.keyNumber3,
-                   "4": self.keyNumber4,
-                   "5": self.keyNumber5,
-                   "6": self.keyNumber6,
-                   "7": self.keyNumber7,
-                   "8": self.keyNumber8,
-                   "9": self.keyNumber9,
-                   "0": self.keyNumber0
+                               "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)