remove useless LCD clock from start Wizard and ServiceScan

diff --git a/lib/python/Components/ServiceScan.py b/lib/python/Components/ServiceScan.py
index 15b7117..1910e45 100644 (file)
--- a/lib/python/Components/ServiceScan.py
+++ b/lib/python/Components/ServiceScan.py
@@ -18,6 +18,7 @@ class ServiceScan:
        def scanStatusChanged(self):
                if self.state == self.Running:
                        self.progressbar.setValue(self.scan.getProgress())
+                       self.lcd_summary.updateProgress(self.scan.getProgress())
                        if self.scan.isDone():
                                errcode = self.scan.getError()
                                
@@ -104,7 +105,7 @@ class ServiceScan:
                                self.run += 1
                                self.execBegin()
        
-       def __init__(self, progressbar, text, servicelist, passNumber, scanList, network, transponder, frontendInfo):
+       def __init__(self, progressbar, text, servicelist, passNumber, scanList, network, transponder, frontendInfo, lcd_summary):
                self.foundServices = 0
                self.progressbar = progressbar
                self.text = text
@@ -115,6 +116,7 @@ class ServiceScan:
                self.transponder = transponder
                self.network = network
                self.run = 0
+               self.lcd_summary = lcd_summary
 
        def doRun(self):
                self.scan = eComponentScan()
@@ -160,6 +162,7 @@ class ServiceScan:
        def newService(self):
                newServiceName = self.scan.getLastServiceName()
                self.servicelist.addItem(newServiceName)
+               self.lcd_summary.updateService(self.scan.getLastServiceName())
 
        def destroy(self):
                pass

diff --git a/lib/python/Screens/ServiceScan.py b/lib/python/Screens/ServiceScan.py
index 60701e6..6ee35b8 100644 (file)
--- a/lib/python/Screens/ServiceScan.py
+++ b/lib/python/Screens/ServiceScan.py
@@ -6,7 +6,29 @@ 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():
@@ -18,6 +40,8 @@ class ServiceScan(Screen):
        def __init__(self, session, scanList):
                Screen.__init__(self, session)
                
+               self.scanList = scanList
+               
                self.session.nav.stopService()
                
                self["scan_progress"] = ProgressBar()
@@ -28,10 +52,18 @@ class ServiceScan(Screen):
                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"], 
                        {
                                "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