From 654997a8cb0b5166b4aa50a4ff1c8b5396d694e4 Mon Sep 17 00:00:00 2001 From: Stefan Pluecken Date: Sat, 15 Oct 2005 01:25:40 +0000 Subject: [PATCH] add NumberActionMap to satconfig and scansetup --- lib/python/Screens/Satconfig.py | 20 ++++++++++++++++++-- lib/python/Screens/ScanSetup.py | 21 ++++++++++++++++++--- 2 files changed, 36 insertions(+), 5 deletions(-) diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py index 1e788707..49de8c82 100644 --- a/lib/python/Screens/Satconfig.py +++ b/lib/python/Screens/Satconfig.py @@ -1,4 +1,5 @@ from Screen import Screen +from Components.ActionMap import NumberActionMap 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() + 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() @@ -70,12 +76,22 @@ class NimSetup(Screen): Screen.__init__(self, session) self.nim = nim - self["actions"] = ActionMap(["SetupActions"], + self["actions"] = NumberActionMap(["SetupActions"], { "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 = [ ] diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py index 7618b975..ad45316b 100644 --- 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 Components.ActionMap import ActionMap +from Components.ActionMap import NumberActionMap 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["actions"] = ActionMap(["SetupActions"], + self["actions"] = NumberActionMap(["SetupActions"], { "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 = [] @@ -144,6 +154,11 @@ class ScanSetup(Screen): 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() -- 2.30.2