From 1b7c72ab3e418455c7da93b16e07f690328e3362 Mon Sep 17 00:00:00 2001
From: Stefan Pluecken <stefan.pluecken@multimedia-labs.de>
Date: Tue, 29 Nov 2005 00:11:06 +0000
Subject: [PATCH] use NumericalTextInput to jump to entries in ChannelSelection
 (jumping needs to implemented before it will work :))

---
 data/keymap.xml                        | 11 ++++++++
 lib/python/Screens/ChannelSelection.py | 36 +++++++++++++++++++++++---
 lib/python/Tools/NumericalTextInput.py |  5 ++--
 3 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/data/keymap.xml b/data/keymap.xml
index 5a7c6696..b909e09a 100644
--- a/data/keymap.xml
+++ b/data/keymap.xml
@@ -141,6 +141,17 @@
 		<!--<key id="KEY_BLUE" mapto="bouquet:(type == 1) FROM BOUQUET &quot;bouquets.tv&quot; ORDER BY bouquet" flags="m" />-->
 		<key id="KEY_BLUE" mapto="showFavourites" flags="m" />
 		<key id="KEY_INFO" mapto="showEPGList" flags="m" />
+		
+		<key id="KEY_1" mapto="1" flags="m" />
+		<key id="KEY_2" mapto="2" flags="m" />
+		<key id="KEY_3" mapto="3" flags="m" />
+		<key id="KEY_4" mapto="4" flags="m" />
+		<key id="KEY_5" mapto="5" flags="m" />
+		<key id="KEY_6" mapto="6" flags="m" />
+		<key id="KEY_7" mapto="7" flags="m" />
+		<key id="KEY_8" mapto="8" flags="m" />
+		<key id="KEY_9" mapto="9" flags="m" />
+		<key id="KEY_0" mapto="0" flags="m" />
 	</map>
 
 	<map context="EPGSelectActions">
diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py
index 0534a78d..d3bf1b40 100644
--- a/lib/python/Screens/ChannelSelection.py
+++ b/lib/python/Screens/ChannelSelection.py
@@ -1,11 +1,12 @@
 from Screen import Screen
 from Components.Button import Button
 from Components.ServiceList import ServiceList
-from Components.ActionMap import ActionMap
+from Components.ActionMap import NumberActionMap
 from EpgSelection import EPGSelection
 from enigma import eServiceReference, eEPGCache, eEPGCachePtr, eServiceCenter, eServiceCenterPtr, iMutableServiceListPtr, iStaticServiceInformationPtr, eTimer
 from Components.config import config, configElement, ConfigSubsection, configText
 from Screens.FixedMenu import FixedMenu
+from Tools.NumericalTextInput import NumericalTextInput
 
 import xml.dom.minidom
 
@@ -224,6 +225,8 @@ class ChannelSelectionBase(Screen):
 
 		#self["okbutton"] = Button("ok", [self.channelSelected])
 		
+		self.numericalTextInput = NumericalTextInput()
+		
 		self.lastService = None
 
 		self.lastServiceTimer = eTimer()
@@ -272,6 +275,11 @@ class ChannelSelectionBase(Screen):
 	def showFavourites(self):
 		self.setRoot(self.bouquet_root)
 
+	def keyNumberGlobal(self, number):
+		print "You pressed number " + str(number)
+		print "You would go to character " + str(self.numericalTextInput.getKey(number))
+		pass
+
 	def enterBouquet(self, action):
 		if action[:7] == "bouquet":
 			if action.find("FROM BOUQUET") != -1:
@@ -306,12 +314,12 @@ class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit):
 		if config.tv.lastroot.value == "":
 			self.servicelist.setRoot(eServiceReference("""1:0:1:0:0:0:0:0:0:0:(type == 1)"""))
 
-		class ChannelActionMap(ActionMap):
+		class ChannelActionMap(NumberActionMap):
 			def action(self, contexts, action):
 				if not self.csel.enterBouquet(action):
 					if action == "cancel":
 						self.csel.handleEditCancel()
-					ActionMap.action(self, contexts, action)
+					NumberActionMap.action(self, contexts, action)
 		self["actions"] = ChannelActionMap(["ChannelSelectActions", "OkCancelActions", "ContextMenuActions"],
 			{
 				"cancel": self.cancel,
@@ -319,7 +327,17 @@ class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit):
 				"mark": self.doMark,
 				"contextMenu": self.doContext,
 				"showFavourites": self.showFavourites,
-				"showEPGList": self.showEPGList
+				"showEPGList": self.showEPGList,
+				"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
 			})
 		self["actions"].csel = self
 
@@ -387,6 +405,16 @@ class SimpleChannelSelection(ChannelSelectionBase):
 				"cancel": self.cancel,
 				"ok": self.channelSelected,
 				"showFavourites": self.showFavourites,
+				"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
 			})
 		self["actions"].csel = self
 
diff --git a/lib/python/Tools/NumericalTextInput.py b/lib/python/Tools/NumericalTextInput.py
index 79c33010..74497895 100644
--- a/lib/python/Tools/NumericalTextInput.py
+++ b/lib/python/Tools/NumericalTextInput.py
@@ -13,7 +13,7 @@ class NumericalTextInput:
     mapping.append ("tuv8TUV") # 8
     mapping.append ("wxyz9WXYZ") # 9
                                 
-    def __init__(self, nextFunction):
+    def __init__(self, nextFunction = None):
         self.nextFunction = nextFunction
         self.Timer = eTimer()
         self.Timer.timeout.get().append(self.nextChar)
@@ -40,5 +40,6 @@ class NumericalTextInput:
         self.Timer.stop()
         print "Timer done"
         self.nextKey()
-        self.nextFunction()
+        if (self.nextFunction != None):
+        	self.nextFunction()
         
\ No newline at end of file
-- 
2.30.2