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:
174f7b8
)
'fix' orphan listboxes in wizard
author
Felix Domke
<tmbinc@elitedvb.net>
Thu, 11 May 2006 14:19:29 +0000
(14:19 +0000)
committer
Felix Domke
<tmbinc@elitedvb.net>
Thu, 11 May 2006 14:19:29 +0000
(14:19 +0000)
lib/python/Screens/Wizard.py
patch
|
blob
|
history
diff --git
a/lib/python/Screens/Wizard.py
b/lib/python/Screens/Wizard.py
index fc76bcd270f368feb3a44a7d53bc32f77ff761b4..036c81de8ba21be74addca8180565eac8c0fdc31 100644
(file)
--- a/
lib/python/Screens/Wizard.py
+++ b/
lib/python/Screens/Wizard.py
@@
-72,6
+72,7
@@
class Wizard(Screen, HelpableScreen):
self.wizard[self.lastStep]["code"] = self.wizard[self.lastStep]["code"] + ch
elif self.currContent == "condition":
self.wizard[self.lastStep]["condition"] = self.wizard[self.lastStep]["condition"] + ch
self.wizard[self.lastStep]["code"] = self.wizard[self.lastStep]["code"] + ch
elif self.currContent == "condition":
self.wizard[self.lastStep]["condition"] = self.wizard[self.lastStep]["condition"] + ch
+
def __init__(self, session, showSteps = True, showStepSlider = True, showList = True, showConfig = True):
Screen.__init__(self, session)
HelpableScreen.__init__(self)
def __init__(self, session, showSteps = True, showStepSlider = True, showList = True, showConfig = True):
Screen.__init__(self, session)
HelpableScreen.__init__(self)
@@
-109,6
+110,8
@@
class Wizard(Screen, HelpableScreen):
self["list"] = MenuList(self.list)
self.onShown.append(self.updateValues)
self["list"] = MenuList(self.list)
self.onShown.append(self.updateValues)
+
+ self.configInstance = None
self["actions"] = NumberActionMap(["WizardActions", "NumberActions"],
{
self["actions"] = NumberActionMap(["WizardActions", "NumberActions"],
{
@@
-154,10
+157,11
@@
class Wizard(Screen, HelpableScreen):
currStep = self.currStep
if self.showConfig:
if (self.wizard[currStep]["config"]["screen"] != None):
currStep = self.currStep
if self.showConfig:
if (self.wizard[currStep]["config"]["screen"] != None):
- try: # don't die, if no run() is available
- self.configInstance.run()
- except:
- print "Failed to run configInstance"
+ # TODO: don't die, if no run() is available
+ # there was a try/except here, but i can't see a reason
+ # for this. If there is one, please do a more specific check
+ # and/or a comment in which situation there is no run()
+ self.configInstance.run()
if self.showList:
if (len(self.wizard[currStep]["list"]) > 0):
if self.showList:
if (len(self.wizard[currStep]["list"]) > 0):
@@
-214,6
+218,11
@@
class Wizard(Screen, HelpableScreen):
self.stepHistory.append(self.currStep)
self.stepHistory.append(self.currStep)
+ if self.configInstance is not None:
+ del self.configInstance["config"]
+ self.configInstance.doClose()
+ self.configInstance = None
+
self.condition = True
exec (self.wizard[self.currStep]["condition"])
if self.condition:
self.condition = True
exec (self.wizard[self.currStep]["condition"])
if self.condition:
@@
-250,6
+259,7
@@
class Wizard(Screen, HelpableScreen):
else:
self.configInstance = self.session.instantiateDialog(self.wizard[self.currStep]["config"]["screen"], eval(self.wizard[self.currStep]["config"]["args"]))
self["config"].l.setList(self.configInstance["config"].list)
else:
self.configInstance = self.session.instantiateDialog(self.wizard[self.currStep]["config"]["screen"], eval(self.wizard[self.currStep]["config"]["args"]))
self["config"].l.setList(self.configInstance["config"].list)
+ self.configInstance["config"].destroy()
self.configInstance["config"] = self["config"]
else:
self["config"].l.setList([])
self.configInstance["config"] = self["config"]
else:
self["config"].l.setList([])