X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/8afb642da9d21c2d3979ca4aada92bd05657a0b8..cbaa4012ef5481091ac9b206e29e4c396859abe2:/lib/python/Screens/ScanSetup.py

diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py
index 7618b975..03374c50 100644
--- a/lib/python/Screens/ScanSetup.py
+++ b/lib/python/Screens/ScanSetup.py
@@ -1,6 +1,7 @@
 from Screen import Screen
+from ServiceScan import *
 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 +16,22 @@ class ScanSetup(Screen):
         self.createConfig()
 
         
-        self["actions"] = ActionMap(["SetupActions"],
+        self["actions"] = NumberActionMap(["SetupActions"],
         {
-            "ok": self.keySave,
+            "ok": self.keyGo,
             "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,12 +155,68 @@ class ScanSetup(Screen):
         self["config"].handleKey(config.key["nextElement"])
         self.newConfig()
 
-    def keySave(self):
+    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 keyGo(self):
         for x in self["config"].list:
             x[1].save()
-        self.close()
+        self.session.openWithCallback(self.keyCancel, ServiceScan)        
+
+        #self.close()
 
     def keyCancel(self):
         for x in self["config"].list:
             x[1].cancel()
-        self.close()
\ No newline at end of file
+        self.close()
+
+class ScanSimple(Screen):
+
+	def keyOK(self):
+		print "start scan for sats:"
+		for x in self.list:
+			if x[1].parent.value == 0:
+				print "   " + str(x[1].parent.configPath)
+		
+	def keyCancel(self):
+		self.close()
+
+	def keyLeft(self):
+		self["config"].handleKey(config.key["prevElement"])
+
+	def keyRight(self):
+		self["config"].handleKey(config.key["nextElement"])
+
+	def Satexists(self, tlist, pos):
+		for x in tlist:
+			if x == pos:
+				return 1
+		return 0
+
+	def __init__(self, session):
+		Screen.__init__(self, session)
+
+		self["actions"] = ActionMap(["SetupActions"],
+		{
+			"ok": self.keyOK,
+			"cancel": self.keyCancel,
+			"left": self.keyLeft,
+			"right": self.keyRight,
+		}, -1)
+                
+		self.list = []
+		tlist = []
+		
+		SatList = nimmanager.getConfiguredSats()
+
+		for x in SatList:
+			if self.Satexists(tlist, x) == 0:
+				tlist.append(x)
+				sat = configElement_nonSave(x, configSelection, 0, ("Enable", "Disable"))
+				self.list.append(getConfigListEntry(nimmanager.getSatDescription(x), sat))
+
+		self["config"] = ConfigList(self.list)
+		self["header"] = Label("Automatic Scan")
+		self["footer"] = Label("Press OK to scan")