From bf2f4196dede42bb8b5b8168a85a60498a3d630f Mon Sep 17 00:00:00 2001
From: acid-burn <acid-burn@opendreambox.org>
Date: Fri, 29 Jan 2010 08:50:34 +0100
Subject: * simplify NetworkWizard usability. Its now possible to open the
 wizard directly with the current selected network interface, so its no more
 needed to select the interface twice. * add a blue button link to the network
 wizard also inside the AdapterSelectionScreen. * d't show interface question
 if only one interface is available. This fixes bug #218

---
 .../SystemPlugins/NetworkWizard/networkwizard.xml   | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

(limited to 'lib/python/Plugins/SystemPlugins/NetworkWizard/networkwizard.xml')

diff --git a/lib/python/Plugins/SystemPlugins/NetworkWizard/networkwizard.xml b/lib/python/Plugins/SystemPlugins/NetworkWizard/networkwizard.xml
index dcd9d933..c4300436 100755
--- a/lib/python/Plugins/SystemPlugins/NetworkWizard/networkwizard.xml
+++ b/lib/python/Plugins/SystemPlugins/NetworkWizard/networkwizard.xml
@@ -1,11 +1,14 @@
 <wizard>
-        <step id="welcome" nextstep="selectinterface">
+        <step id="welcome">
                 <text value="Welcome.\n\nIf you want to connect your Dreambox to the Internet, this wizard will guide you through the basic network setup of your Dreambox.\n\nPress OK to start configuring your network" />
                 <displaytext value="Network Wizard" />
 	        <code>
 self.clearSelectedKeys()
 self.selectKey("OK")
                 </code>
+		<code pos="after" async="yes">
+self.selectInterface()
+		</code>
         </step>
 
         <step id="selectinterface">
@@ -80,7 +83,7 @@ self.selectKey("UP")
 self.selectKey("DOWN")
                 </code>
                 <list>
-                        <listentry caption="Configure your network again" step="selectinterface" />
+                        <listentry caption="Configure your network again" step="welcome" />
                         <listentry caption="Exit network wizard" step="end" />
                 </list>
         </step>
@@ -109,11 +112,7 @@ self.condition = (self.isInterfaceUp == False and self.WlanPluginInstalled == Tr
                 </condition>
                 <text value="Your wireless LAN internet connection could not be started!\nHave you attached your USB WLAN Stick?\n\nPlease choose what you want to do next." />
                 <displaytext value="Please follow the instructions on the TV" />
-                <list>
-                        <listentry caption="Configure your wireless LAN again" step="scanwlan" />
-                        <listentry caption="Configure your internal LAN" step="selectinterface" />
-                        <listentry caption="Exit network wizard" step="end" />
-                </list>
+                <list type="dynamic" source="listChoices" evaluation="ChoicesSelectionMade" onselect="ChoicesSelectionMoved" />
                 <code>
 self.clearSelectedKeys()
 self.selectKey("OK")
@@ -127,10 +126,8 @@ self.condition = (self.isInterfaceUp == True and self.WlanPluginInstalled == Fal
                 </condition>
                 <text value="The wireless LAN plugin is not installed!\nPlease install it and choose what you want to do next." />
                 <displaytext value="Please follow the instructions on the TV" />
-                <list>
-                        <listentry caption="Configure your internal LAN" step="selectinterface" />
-                        <listentry caption="Exit network wizard" step="end" />
-                </list>
+                <list type="dynamic" source="listChoices" evaluation="ChoicesSelectionMade" onselect="ChoicesSelectionMoved" />
+		
                 <code>
 self.clearSelectedKeys()
 self.selectKey("OK")
@@ -185,7 +182,7 @@ self.selectKey("UP")
 self.selectKey("DOWN")
                 </code>
                 <list>
-                        <listentry caption="Configure your network again" step="selectinterface" />
+                        <listentry caption="Configure your network again" step="welcome" />
                         <listentry caption="Exit network wizard" step="end" />
                 </list>
         </step>
-- 
cgit v1.2.3