X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/17dacebf2ff4f85f23c96398287c0b1b23df6342..55125a070ce39f188225a32c664a97d8271fdcfc:/lib/python/Screens/ServiceScan.py

diff --git a/lib/python/Screens/ServiceScan.py b/lib/python/Screens/ServiceScan.py
index c1059539..6ee35b84 100644
--- a/lib/python/Screens/ServiceScan.py
+++ b/lib/python/Screens/ServiceScan.py
@@ -3,8 +3,32 @@ 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 ServiceScanSummary(Screen):
+	skin = """
+	<screen position="0,0" size="132,64">
+		<widget name="Title" position="6,4" size="120,42" font="Regular;16" transparent="1" />
+		<widget name="scan_progress" position="6,50" zPosition="1" borderWidth="1" size="56,12" backgroundColor="dark" />
+		<widget name="Service" position="6,22" size="120,26" font="Regular;12" transparent="1" />
+	</screen>"""
+	
+	def __init__(self, session, parent, showStepSlider = True):
+		Screen.__init__(self, session, parent)
+		
+		self["Title"] = Label(parent.title or "ServiceScan")
+		self["Service"] = Label("No Service")
+		self["scan_progress"] = ProgressBar()
+		
+	def updateProgress(self, value):
+		self["scan_progress"].setValue(value)
+
+	def updateService(self, name):
+		self["Service"].setText(name)
 
 class ServiceScan(Screen):
+	
 	def ok(self):
 		print "ok"
 		if self["scan"].isDone():
@@ -13,17 +37,33 @@ class ServiceScan(Screen):
 	def cancel(self):
 		self.close()
 	
-	def __init__(self, session, transponders):
+	def __init__(self, session, scanList):
 		Screen.__init__(self, session)
 		
+		self.scanList = scanList
+		
 		self.session.nav.stopService()
 		
 		self["scan_progress"] = ProgressBar()
-		self["scan_state"] = Label("scan state")
-		self["scan"] = CScan(self["scan_progress"], self["scan_state"], transponders)
+		self["scan_state"] = Label(_("scan state"))
+		self["network"] = Label()
+		self["transponder"] = Label()
 
+		self["pass"] = Label("")
+		self["servicelist"] = FIFOList(len=10)
+		self["FrontendInfo"] = FrontendInfo()
+		
 		self["actions"] = ActionMap(["OkCancelActions"], 
 			{
 				"ok": self.ok,
 				"cancel": self.cancel
 			})
+			
+		self.onFirstExecBegin.append(self.doServiceScan)
+
+	def doServiceScan(self):
+		self["scan"] = CScan(self["scan_progress"], self["scan_state"], self["servicelist"], self["pass"], self.scanList, self["network"], self["transponder"], self["FrontendInfo"], self.session.summary)
+
+	def createSummary(self):
+		print "ServiceScanCreateSummary"
+		return ServiceScanSummary
\ No newline at end of file