git.cweiske.de
/
enigma2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f85dc43
)
move installPackage call one wizard step to properly update the wizard texts
author
Stefan Pluecken
<stefan.pluecken@multimedia-labs.de>
Mon, 2 Jun 2008 11:50:49 +0000
(11:50 +0000)
committer
Stefan Pluecken
<stefan.pluecken@multimedia-labs.de>
Mon, 2 Jun 2008 11:50:49 +0000
(11:50 +0000)
data/defaultsatlists.xml
patch
|
blob
|
history
data/defaultwizard.xml
patch
|
blob
|
history
lib/python/Screens/DefaultWizard.py
patch
|
blob
|
history
lib/python/Screens/ScanSetup.py
patch
|
blob
|
history
diff --git
a/data/defaultsatlists.xml
b/data/defaultsatlists.xml
index 2902d1d7f9dff524ff9e71b3053581d2d282397c..f6489676fd03d8b12d731a6a4084d2f9095d78d3 100644
(file)
--- a/
data/defaultsatlists.xml
+++ b/
data/defaultsatlists.xml
@@
-48,6
+48,7
@@
if self.runWizard:
</condition>
<code>
self.disableKeys = True
</condition>
<code>
self.disableKeys = True
+self.installPackages(self.indexList)
</code>
<code>
#print "len of packageslist", len(self.packageslist)
</code>
<code>
#print "len of packageslist", len(self.packageslist)
diff --git
a/data/defaultwizard.xml
b/data/defaultwizard.xml
index e29963bbe05b70eeaa8184b99c4a76e96bc6561f..92231ff704fec00fd107b9070ffe159e3914ed7d 100644
(file)
--- a/
data/defaultwizard.xml
+++ b/
data/defaultwizard.xml
@@
-50,7
+50,8
@@
if self.runWizard:
break
</condition>
<code>
break
</condition>
<code>
-self.disableKeys = True
+self.disableKeys = True
+self.installPackages(self.indexList)
</code>
<code>
#print "len of packageslist", len(self.packageslist)
</code>
<code>
#print "len of packageslist", len(self.packageslist)
diff --git
a/lib/python/Screens/DefaultWizard.py
b/lib/python/Screens/DefaultWizard.py
index c74e5866f1b539df0a24addd3c5cc8f8d8cb9b32..79c68f65aa45db02bee42ef1fe4d0a806f454731 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))
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:
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):
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 92d82073b127b2b6cddb757ff0d431a61ccb5ef4..357888f8f30e3c6cc35b1e7fb247def253755514 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)
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):
class ScanSetup(ConfigListScreen, Screen, CableTransponderSearchSupport):
def __init__(self, session):