From 0e2adbdfe1aaa39c0b652a8839f512717bb48de8 Mon Sep 17 00:00:00 2001
From: Stefan Pluecken <stefan.pluecken@multimedia-labs.de>
Date: Fri, 16 May 2008 23:08:45 +0000
Subject: lots of improvements in the default wizard

---
 data/defaultwizard.xml | 58 +++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 46 insertions(+), 12 deletions(-)

(limited to 'data/defaultwizard.xml')

diff --git a/data/defaultwizard.xml b/data/defaultwizard.xml
index a8409b75..e29963bb 100644
--- a/data/defaultwizard.xml
+++ b/data/defaultwizard.xml
@@ -1,27 +1,61 @@
 <wizard>
-	<step id="welcome" nextstep="end">
+	<step id="welcome" nextstep="nothingtoinstall">
 		<condition>
 packagelist = self.fillPackagesList()
-self.condition = (len(packagelist) > 1)
+self.runWizard = (len(packagelist) > 0)
+self.condition = self.runWizard
 		</condition>
-		<text value="Default-Wizard" />
-		<list type="dynamic" source="listDefaults" evaluation="selectionMade" />
+		<text value="You can choose some default settings now. Please select the settings you want to be installed." />
+		<!--list type="dynamic" source="listDefaults" evaluation="selectionMade" /-->
+		<config type="dynamic" source="getConfigList" evaluation="selectionMade" />
 		<code pos="after">
 self.disableKeys = True
 		</code>
 	</step>
-	<step id="end">
+	<step id="nopackages" nextstep="install">
+		<condition>
+self.condition = self.runWizard or not self.silent
+		</condition>
+		<text value="There are no default settings in your image." />
+	</step>
+	
+	<step id="nothingtoinstall" nextstep="install">
+		<condition>
+if self.runWizard:
+	self.condition = True
+	for x in self.packagesConfig:
+		if x.value:
+			self.condition = False
+			break
+else:
+	self.condition = False
+		</condition>
+		<text value="You chose not to install any default settings. You can however install the default settings later in the settings menu." />
+		<!--list type="dynamic" source="listDefaults" evaluation="selectionMade" /-->
 		<code>
-self.disableKeys = True			
+self.disableKeys = False
+		</code>
+		<code pos="after">
+self.markDone()
 		</code>
+	</step>
+	
+	<step id="install">
 		<condition>
-packagelist = self.fillPackagesList()
-self.condition = (len(packagelist) > 0)
-		</condition>		
+self.condition = False
+if self.runWizard:
+	for x in self.packagesConfig:
+		if x.value:
+			self.condition = True
+			break 
+		</condition>
+		<code>
+self.disableKeys = True			
+		</code>
 		<code>
-print "len of packageslist", len(self.packageslist)
-if (len(self.packageslist) == 1):
-	self.installPackage(0)
+#print "len of packageslist", len(self.packageslist)
+#if (len(self.packageslist) == 1):
+	#self.installPackage(0)
 		</code>
 		<text value="Installing defaults... Please wait..." />
 	</step>
-- 
cgit v1.2.3