move installPackage call one wizard step to properly update the wizard texts

diff --git a/data/defaultsatlists.xml b/data/defaultsatlists.xml
index 2902d1d..f648967 100644 (file)
--- a/data/defaultsatlists.xml
+++ b/data/defaultsatlists.xml
@@ -48,6 +48,7 @@ if self.runWizard:
                </condition>
                <code>
 self.disableKeys = True                        
+self.installPackages(self.indexList)
                </code>
                <code>
 #print "len of packageslist", len(self.packageslist)

diff --git a/data/defaultwizard.xml b/data/defaultwizard.xml
index e29963b..92231ff 100644 (file)
--- a/data/defaultwizard.xml
+++ b/data/defaultwizard.xml
@@ -50,7 +50,8 @@ if self.runWizard:
                        break 
                </condition>
                <code>
-self.disableKeys = True                        
+self.disableKeys = True                
+self.installPackages(self.indexList)
                </code>
                <code>
 #print "len of packageslist", len(self.packageslist)

diff --git a/lib/python/Screens/DefaultWizard.py b/lib/python/Screens/DefaultWizard.py
index c74e586..79c68f6 100644 (file)
--- a/lib/python/Screens/DefaultWizard.py
+++ b/lib/python/Screens/DefaultWizard.py
@@ -57,11 +57,10 @@ class DefaultWizard(WizardLanguage, DreamInfoHandler):
        def selectionMade(self):
                print "selection made"
                #self.installPackage(int(index))
-               indexList = []
+               self.indexList = []
                for x in range(len(self.packagesConfig)):
                        if self.packagesConfig[x].value:
-                               indexList.append(x)
-               self.installPackages(indexList)
+                               self.indexList.append(x)
                
 class DreamPackageWizard(DefaultWizard):
        def __init__(self, session, packagefile, silent = False):

diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py
index 92d8207..357888f 100644 (file)
--- a/lib/python/Screens/ScanSetup.py
+++ b/lib/python/Screens/ScanSetup.py
@@ -285,7 +285,15 @@ class DefaultSatLists(DefaultWizard):
 
        def setDirectory(self):
                self.directory = resolveFilename(SCOPE_DEFAULTPARTITIONMOUNTDIR)
-               self.xmlfile = "defaultsatlists.xml"            
+               self.xmlfile = "defaultsatlists.xml"
+               
+       def statusCallback(self, status, progress):
+               print "statusCallback:", status, progress
+               from Components.DreamInfoHandler import DreamInfoHandler
+               if status == DreamInfoHandler.STATUS_DONE:
+                       self["text"].setText(_("The installation of the default services lists is finished."))
+                       self.markDone()
+                       self.disableKeys = False        
 
 class ScanSetup(ConfigListScreen, Screen, CableTransponderSearchSupport):
        def __init__(self, session):