git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
default wizard
[enigma2.git]
/
lib
/
python
/
Screens
/
Wizard.py
diff --git
a/lib/python/Screens/Wizard.py
b/lib/python/Screens/Wizard.py
index 206a87ce86af128042540384493268b72f4fafa0..c4fcb10a4156669d47a1f8a2df7bb1991e1371f2 100644
(file)
--- a/
lib/python/Screens/Wizard.py
+++ b/
lib/python/Screens/Wizard.py
@@
-188,6
+188,8
@@
class Wizard(Screen, HelpableScreen):
self.lcdCallbacks = []
self.lcdCallbacks = []
+ self.disableKeys = False
+
self["actions"] = NumberActionMap(["WizardActions", "NumberActions", "ColorActions"],
{
"ok": self.ok,
self["actions"] = NumberActionMap(["WizardActions", "NumberActions", "ColorActions"],
{
"ok": self.ok,
@@
-232,6
+234,8
@@
class Wizard(Screen, HelpableScreen):
self.lcdCallbacks.append(callback)
def back(self):
self.lcdCallbacks.append(callback)
def back(self):
+ if self.disableKeys:
+ return
print "getting back..."
print "stepHistory:", self.stepHistory
if len(self.stepHistory) > 1:
print "getting back..."
print "stepHistory:", self.stepHistory
if len(self.stepHistory) > 1:
@@
-291,6
+295,8
@@
class Wizard(Screen, HelpableScreen):
def ok(self):
print "OK"
def ok(self):
print "OK"
+ if self.disableKeys:
+ return
currStep = self.currStep
if self.showConfig:
currStep = self.currStep
if self.showConfig:
@@
-382,6
+388,13
@@
class Wizard(Screen, HelpableScreen):
def updateValues(self):
print "Updating values in step " + str(self.currStep)
def updateValues(self):
print "Updating values in step " + str(self.currStep)
+ # calling a step which doesn't exist can only happen if the condition in the last step is not fulfilled
+ # if a non-existing step is called, end the wizard
+ if self.currStep > len(self.wizard):
+ self.markDone()
+ self.close()
+ return
+
self.timeoutTimer.stop()
if self.configInstance is not None:
self.timeoutTimer.stop()
if self.configInstance is not None: