From bc8ba2d89e7c71e95c1ee8e8e2da26a993e01997 Mon Sep 17 00:00:00 2001
From: Stefan Pluecken <stefan.pluecken@multimedia-labs.de>
Date: Sat, 25 Feb 2006 21:29:34 +0000
Subject: - 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

---
 data/skin.xml        |  9 +++++----
 data/startwizard.xml | 16 ++++++++++++++--
 2 files changed, 19 insertions(+), 6 deletions(-)

(limited to 'data')

diff --git a/data/skin.xml b/data/skin.xml
index 92dfa0bb..50646655 100644
--- a/data/skin.xml
+++ b/data/skin.xml
@@ -333,10 +333,11 @@
 			<widget name="list" position="0,0" size="560,375" zPosition="1" scrollbarMode="showOnDemand" />
 			<widget name="freeDiskSpace" position="10,380" size="540,30" font="Regular;25" />
 		</screen>
-		<screen name="ServiceScan" position="200,100" size="300,300" title="Service Scan">
-			<widget name="scan_progress" position="10,10" size="300,20" />
-			<widget name="scan_state" position="10,40" size="280,60" font="Regular;20" />
-			<widget name="servicelist" position="10,110" size="280,175" selectionDisabled="1" />
+		<screen name="ServiceScan" position="200,100" size="300,330" title="Service Scan">
+			<widget name="pass" position="10,10" size="280,30" font="Regular;20" />
+			<widget name="scan_progress" position="10,45" size="280,20" />
+			<widget name="scan_state" position="10,65" size="280,60" font="Regular;20" />
+			<widget name="servicelist" position="10,135" size="280,175" selectionDisabled="1" />
 		</screen>
 		<screen name="InputBox" position="100,100" size="550,400" title="Input" >
 			<widget name="text" position="0,0" size="550,25" font="Regular;20" />
diff --git a/data/startwizard.xml b/data/startwizard.xml
index 4b735f84..54533ebe 100644
--- a/data/startwizard.xml
+++ b/data/startwizard.xml
@@ -74,14 +74,26 @@ self["arrowup2"].moveTo(800, 310, 1)
 self["arrowup2"].startMoving()
 			</code>
 			<list>
-				<listentry caption="Yes, scan now" step="scan" />
+				<listentry caption="Yes, do an automatic scan now" step="scan" />
+				<listentry caption="Yes, do a manual scan now" step="manualscan" />
 				<listentry caption="No, scan later manually" step="end" />
 			</list>
 		</step>
-		<step id="scan">
+		<step id="scan" nextstep="end">
 			<text value="What do you want to scan?" />
 			<config screen="ScanSimple" module="ScanSetup" type="ConfigList" />
 		</step>
+		<step id="manualscan">
+			<text value="What do you want to scan?" />
+			<config screen="ScanSetup" module="ScanSetup" type="ConfigList" />
+		</step>
+		<step id="nextscan">
+			<text value="Do you want to do another manual service scan?" />
+			<list>
+				<listentry caption="Yes, do another manual scan now" step="manualscan" />
+				<listentry caption="No, scan later manually" step="end" />
+			</list>
+		</step>
 		<step id="end">
 			<text value="Thank you for using the wizard. Your box is now ready to use.\nPlease press OK to start using you Dreambox." />
 		</step>
-- 
cgit v1.2.3