Merge branch 'master' of git.opendreambox.org:/git/enigma2

[enigma2.git] / lib / python / Screens / ServiceScan.py

diff --git a/lib/python/Screens/ServiceScan.py b/lib/python/Screens/ServiceScan.py
index b09353f0a45a036273249acfb086b02954fcb639..6ee35b84654040bb5382f7904f522acff2cfeeee 100644 (file)
--- a/lib/python/Screens/ServiceScan.py
+++ b/lib/python/Screens/ServiceScan.py
@@ -4,8 +4,31 @@ from Components.ProgressBar import ProgressBar
 from Components.Label import Label
 from Components.ActionMap import ActionMap
 from Components.FIFOList import FIFOList
 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):
 
 class ServiceScan(Screen):

+       

        def ok(self):
                print "ok"
                if self["scan"].isDone():
        def ok(self):
                print "ok"
                if self["scan"].isDone():


@@ -14,18 +37,33 @@ class ServiceScan(Screen):
        def cancel(self):
                self.close()
        
        def cancel(self):
                self.close()
        

-       def __init__(self, session, transponders, feid, flags):
+       def __init__(self, session, scanList):

                Screen.__init__(self, session)
                
                Screen.__init__(self, session)
                

+               self.scanList = scanList
+               

                self.session.nav.stopService()
                
                self["scan_progress"] = ProgressBar()
                self["scan_state"] = Label(_("scan state"))
                self.session.nav.stopService()
                
                self["scan_progress"] = ProgressBar()
                self["scan_state"] = Label(_("scan state"))

-               self["servicelist"] = FIFOList(len=7)
-               self["scan"] = CScan(self["scan_progress"], self["scan_state"], self["servicelist"], transponders, feid, flags)
+               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["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