X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/a4da9cccc2575c4bf299bde9594dad3e049ddf6a..8e63444e6767c17cffe73fb03a88fe4b68fa06c3:/lib/python/Screens/ServiceScan.py

diff --git a/lib/python/Screens/ServiceScan.py b/lib/python/Screens/ServiceScan.py
index 0c27237c..60701e60 100644
--- a/lib/python/Screens/ServiceScan.py
+++ b/lib/python/Screens/ServiceScan.py
@@ -3,6 +3,8 @@ from Components.ServiceScan import ServiceScan as CScan
 from Components.ProgressBar import ProgressBar
 from Components.Label import Label
 from Components.ActionMap import ActionMap
+from Components.FIFOList import FIFOList
+from Components.Sources.FrontendInfo import FrontendInfo
 
 class ServiceScan(Screen):
 	def ok(self):
@@ -11,14 +13,22 @@ class ServiceScan(Screen):
 			self.close()
 	
 	def cancel(self):
-		print "cancel not yet implemented ;)"
+		self.close()
 	
-	def __init__(self, session):
+	def __init__(self, session, scanList):
 		Screen.__init__(self, session)
 		
+		self.session.nav.stopService()
+		
 		self["scan_progress"] = ProgressBar()
-		self["scan_state"] = Label("scan state")
-		self["scan"] = CScan(self["scan_progress"], self["scan_state"])
+		self["scan_state"] = Label(_("scan state"))
+		self["network"] = Label()
+		self["transponder"] = Label()
+
+		self["pass"] = Label("")
+		self["servicelist"] = FIFOList(len=10)
+		self["FrontendInfo"] = FrontendInfo()
+		self["scan"] = CScan(self["scan_progress"], self["scan_state"], self["servicelist"], self["pass"], scanList, self["network"], self["transponder"], self["FrontendInfo"])
 
 		self["actions"] = ActionMap(["OkCancelActions"], 
 			{