add NumberActionMap to satconfig and scansetup

diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py
index 1e7887077a6939de5d514d46d7eabf268a0b16aa..49de8c829d150f4f6770321e61769502d3d64372 100644 (file)
--- a/lib/python/Screens/Satconfig.py
+++ b/lib/python/Screens/Satconfig.py
@@ -1,4 +1,5 @@
 from Screen import Screen
 from Screen import Screen

+from Components.ActionMap import NumberActionMap

 from Components.ActionMap import ActionMap
 from Components.ConfigList import ConfigList
 from Components.config import *
 from Components.ActionMap import ActionMap
 from Components.ConfigList import ConfigList
 from Components.config import *


@@ -56,6 +57,11 @@ class NimSetup(Screen):
                self["config"].handleKey(config.key["nextElement"])
                self.newConfig()
 
                self["config"].handleKey(config.key["nextElement"])
                self.newConfig()
 

+       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 keySave(self):
                for x in self["config"].list:
                        x[1].save()
        def keySave(self):
                for x in self["config"].list:
                        x[1].save()


@@ -70,12 +76,22 @@ class NimSetup(Screen):
                Screen.__init__(self, session)
                self.nim = nim
 
                Screen.__init__(self, session)
                self.nim = nim
 

-               self["actions"] = ActionMap(["SetupActions"],
+               self["actions"] = NumberActionMap(["SetupActions"],

                {
                        "ok": self.keySave,
                        "cancel": self.keyCancel,
                        "left": self.keyLeft,
                {
                        "ok": self.keySave,
                        "cancel": self.keyCancel,
                        "left": self.keyLeft,

-                       "right": self.keyRight
+                       "right": self.keyRight,
+                       "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)
 
                self.list = [ ]
                }, -1)
 
                self.list = [ ]

diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py
index 7618b97519b8bb32500a5bc2d2540598709409f3..ad45316b90ad9266a93233d880e91b16f67793d3 100644 (file)
--- a/lib/python/Screens/ScanSetup.py
+++ b/lib/python/Screens/ScanSetup.py
@@ -1,6 +1,6 @@
 from Screen import Screen
 from Components.config import *
 from Screen import Screen
 from Components.config import *

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

 from Components.ConfigList import ConfigList
 from Components.config import config
 from Components.config import getConfigListEntry
 from Components.ConfigList import ConfigList
 from Components.config import config
 from Components.config import getConfigListEntry


@@ -15,12 +15,22 @@ class ScanSetup(Screen):
         self.createConfig()
 
         
         self.createConfig()
 
         

-        self["actions"] = ActionMap(["SetupActions"],
+        self["actions"] = NumberActionMap(["SetupActions"],

         {
             "ok": self.keySave,
             "cancel": self.keyCancel,
             "left": self.keyLeft,
         {
             "ok": self.keySave,
             "cancel": self.keyCancel,
             "left": self.keyLeft,

-            "right": self.keyRight
+            "right": self.keyRight,
+            "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)
                 
         self.list = []
         }, -1)
                 
         self.list = []


@@ -144,6 +154,11 @@ class ScanSetup(Screen):
         self["config"].handleKey(config.key["nextElement"])
         self.newConfig()
 
         self["config"].handleKey(config.key["nextElement"])
         self.newConfig()
 

+    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 keySave(self):
         for x in self["config"].list:
             x[1].save()
     def keySave(self):
         for x in self["config"].list:
             x[1].save()