X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/4588321e0ee8151324a5a183ff2ced5ea80629cf..HEAD:/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..0b3a2988 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,17 +83,37 @@ 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>
+
+        <step id="asknetworktype">
+		<condition>
+self.condition = (self.isInterfaceUp == True and self.WlanPluginInstalled == True)
+		</condition>
+                <text value="Wireless network connection setup." />
+                <displaytext value="Wireless network connection setup" />
+                <code>
+self.clearSelectedKeys()
+self.selectKey("OK")
+self.selectKey("UP")
+self.selectKey("DOWN")
+                </code>
+                <list>
+                        <listentry caption="List available networks" step="scanwlan" />
+                        <listentry caption="Manual configuration" step="wlanconfig" />
+                        <listentry caption="Exit network wizard" step="end" />
+                </list>
+        </step>
+
         <step id="scanwlan">
 		<condition>
 self.condition = (self.isInterfaceUp == True and self.WlanPluginInstalled == True)
                 </condition>
                 <text value="Please select the wireless network that you want to connect to.\n\nPlease press OK to continue." />
                 <displaytext value="Select wireless network" />
-                <list type="dynamic" source="listAccessPoints" evaluation="AccessPointsSelectionMade" onselect="AccessPointsSelectionMoved" />
+                <list type="dynamic" source="listAccessPoints" onselect="AccessPointsSelectionMoved" />
                 <code>
 self.clearSelectedKeys()
 self.selectKey("OK")
@@ -109,11 +132,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 +146,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")
@@ -141,7 +158,7 @@ self.selectKey("DOWN")
         <step id="wlanconfig">
                 <text value="Please configure your internet connection by filling out the required values.\nWhen you are ready press OK to continue." />
                 <displaytext value="Configure interface" />
-                <config screen="AdapterSetup" module="NetworkSetup" args="(self.selectedInterface,self.ap,self.WlanList)" type="ConfigList" />
+                <config screen="AdapterSetup" module="NetworkSetup" args="(self.selectedInterface,self.ap)" type="ConfigList" />
                 <code>
 self.clearSelectedKeys()
 self.selectKey("OK")
@@ -185,7 +202,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>
@@ -199,4 +216,3 @@ self.selectKey("OK")
         </step>
 </wizard>
 
-