- new automatic scan - scans everything the NIM can handle

- ServiceScan is now able to do a multipass scan
- added the manual scan to the startwizard
- wizards have a new "nextstep" attribute for the <step>-tag now

1 files changed, 7 insertions, 1 deletions

diff --git a/lib/python/Screens/Wizard.py b/lib/python/Screens/Wizard.py
index 43931576..c91639c4 100644
--- a/lib/python/Screens/Wizard.py
+++ b/lib/python/Screens/Wizard.py
@@ -31,7 +31,11 @@ class Wizard(Screen, HelpableScreen):
 					id = str(attrs.get('id'))
 				else:
 					id = ""
-				self.wizard[self.lastStep] = {"id": id, "condition": "", "text": "", "list": [], "config": {"screen": None, "args": None, "type": "" }, "code": "", "codeafter": ""}
+				if attrs.has_key('nextstep'):
+					nextstep = str(attrs.get('nextstep'))
+				else:
+					nextstep = None
+				self.wizard[self.lastStep] = {"id": id, "condition": "", "text": "", "list": [], "config": {"screen": None, "args": None, "type": "" }, "code": "", "codeafter": "", "nextstep": nextstep}
 			elif (name == "text"):
 				self.wizard[self.lastStep]["text"] = string.replace(str(attrs.get('value')), "\\n", "\n")
 			elif (name == "listentry"):
@@ -160,6 +164,8 @@ class Wizard(Screen, HelpableScreen):
 			self.session.close()
 		else:
 			self.runCode(self.wizard[self.currStep]["codeafter"])
+			if self.wizard[self.currStep]["nextstep"] is not None:
+				self.currStep = self.getStepWithID(self.wizard[self.currStep]["nextstep"])
 			self.currStep += 1
 			self.updateValues()