X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fpython%2FPlugins%2FSystemPlugins%2FNetworkWizard%2Fnetworkwizard.xml;h=0b3a2988e1d78f0426e79aa0427432d5ffaf7775;hb=4712fa7b44263f0e9517bb5a4b1729d922994572;hp=134797a78911cf0fa33c305d2a627d0d84bbbddb;hpb=4e8904ef73e3ce5e275a1f5fbf369c4f9dab648e;p=vuplus_dvbapp

diff --git a/lib/python/Plugins/SystemPlugins/NetworkWizard/networkwizard.xml b/lib/python/Plugins/SystemPlugins/NetworkWizard/networkwizard.xml
index 134797a..0b3a298 100755
--- a/lib/python/Plugins/SystemPlugins/NetworkWizard/networkwizard.xml
+++ b/lib/python/Plugins/SystemPlugins/NetworkWizard/networkwizard.xml
@@ -1,172 +1,218 @@
 <wizard>
-		<step id="welcome" nextstep="selectinterface">
-			<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>
+        <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>
-		</step>
+                </code>
+		<code pos="after" async="yes">
+self.selectInterface()
+		</code>
+        </step>
 
-		<step id="selectinterface">
-			<text value="Please select the network interface that you want to use for your internet connection.\n\nPlease press OK to continue." />
-			<displaytext value="Select interface" />
-			<list type="dynamic" source="listInterfaces" evaluation="InterfaceSelectionMade" onselect="InterfaceSelectionMoved" />
-			<code>
+        <step id="selectinterface">
+                <text value="Please select the network interface that you want to use for your internet connection.\n\nPlease press OK to continue." />
+                <displaytext value="Select interface" />
+                <list type="dynamic" source="listInterfaces" evaluation="InterfaceSelectionMade" onselect="InterfaceSelectionMoved" />
+                <code>
 self.clearSelectedKeys()
 self.selectKey("OK")
 self.selectKey("UP")
 self.selectKey("DOWN")
-			</code>
-			<code pos="after" async="yes">
+                </code>
+                <code pos="after" async="yes">
 self.checkInterface(self.selectedInterface)
-			</code>	
-		</step>
-
-		<step id="nwconfig">
-			<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" type="ConfigList" />
-			<code>
+                </code> 
+        </step>
+        <step id="nwconfig">
+                <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" type="ConfigList" />
+                <code>
 self.clearSelectedKeys()
 self.selectKey("OK")
 self.selectKey("UP")
 self.selectKey("DOWN")
 self.selectKey("LEFT")
 self.selectKey("RIGHT")
-			</code>
-			<code pos="after" async="yes">
+                </code>
+                <code pos="after" async="yes">
 self.AdapterSetupEnd(self.selectedInterface)
-			</code>			
-		</step>
-
-		<step id="confdns" nextstep="checklanstatusend">
-			<text value="Please configure or verify your Nameservers by filling out the required values.\nWhen you are ready press OK to continue." />
-			<displaytext value="Configure nameservers" />
-			<config screen="NameserverSetup" module="NetworkSetup" type="ConfigList" />
-			<code>
+                </code>                 
+        </step>
+        <step id="confdns" nextstep="checklanstatusend">
+                <text value="Please configure or verify your Nameservers by filling out the required values.\nWhen you are ready press OK to continue." />
+                <displaytext value="Configure nameservers" />
+                <config screen="NameserverSetup" module="NetworkSetup" type="ConfigList" />
+                <code>
 self.clearSelectedKeys()
 self.selectKey("OK")
-			</code>
-			<code pos="after" async="yes">
+                </code>
+                <code pos="after" async="yes">
 self.checkNetwork()
-			</code>	
-		</step>
-
-		<step id="checklanstatusend" nextstep="end">
+                </code> 
+        </step>
+        <step id="checklanstatusend" nextstep="end">
 		<condition>
 self.condition = (self.InterfaceState == True )
 		</condition>
-			<text value="Your Dreambox is now ready to use.\n\nYour internet connection is working now.\n\nPlease press OK to continue." />
-			<displaytext value="Please follow the instructions on the TV" />
-			<code>
+                <text value="Your Dreambox is now ready to use.\n\nYour internet connection is working now.\n\nPlease press OK to continue." />
+                <displaytext value="Please follow the instructions on the TV" />
+                <code>
 self.clearSelectedKeys()
 self.selectKey("OK")
-			</code>
-			<code pos="after">
-currStep = self.numSteps				
+                </code>
+                <code pos="after">
+currStep = self.numSteps                                
 self.wizard[currStep]["nextstep"] = None
 self.markDone()
 self.close()
-			</code>	
-		</step>
-
-		<step id="checklanstatusend">
+                </code> 
+        </step>
+        <step id="checklanstatusend">
 		<condition>
 self.condition = (self.InterfaceState == False )
 		</condition>
-			<text value="Your internet connection is not working!\nPlease choose what you want to do next." />
-			<displaytext value="Please follow the instructions on the TV" />
-			<code>
+                <text value="Your internet connection is not working!\nPlease choose what you want to do next." />
+                <displaytext value="Please follow the instructions on the TV" />
+                <code>
 self.clearSelectedKeys()
 self.selectKey("OK")
 self.selectKey("UP")
 self.selectKey("DOWN")
-			</code>
-			<list>
-				<listentry caption="Configure your network again" step="selectinterface" />
-				<listentry caption="Exit network wizard" step="end" />
-			</list>
-		</step>
+                </code>
+                <list>
+                        <listentry caption="Configure your network again" step="welcome" />
+                        <listentry caption="Exit network wizard" step="end" />
+                </list>
+        </step>
 
-		<step id="scanwlan" nextstep="wlanconfig">
+        <step id="asknetworktype">
 		<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="listModes" evaluation="modeSelectionMade" onselect="modeSelectionMoved" />
-			<code>
+                <text value="Wireless network connection setup." />
+                <displaytext value="Wireless network connection setup" />
+                <code>
 self.clearSelectedKeys()
 self.selectKey("OK")
 self.selectKey("UP")
 self.selectKey("DOWN")
-self.selectKey("LEFT")
-self.selectKey("RIGHT")
-			</code>
-		</step>
+                </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">
+        <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" onselect="AccessPointsSelectionMoved" />
+                <code>
+self.clearSelectedKeys()
+self.selectKey("OK")
+self.selectKey("UP")
+self.selectKey("DOWN")
+self.selectKey("LEFT")
+self.selectKey("RIGHT")
+                </code>
+                <code pos="after">
+self.checkWlanSelection()
+                </code> 
+        </step>
+        <step id="scanwlan">
+                <condition>
 self.condition = (self.isInterfaceUp == False and self.WlanPluginInstalled == True)
-		</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>
-			<code>
+                </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 type="dynamic" source="listChoices" evaluation="ChoicesSelectionMade" onselect="ChoicesSelectionMoved" />
+                <code>
 self.clearSelectedKeys()
 self.selectKey("OK")
 self.selectKey("UP")
 self.selectKey("DOWN")
-			</code>
-		</step>
-
-		<step id="scanwlan">
-		<condition>
+                </code>
+        </step>
+        <step id="scanwlan">
+                <condition>
 self.condition = (self.isInterfaceUp == True and self.WlanPluginInstalled == False)
-		</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>
-			<code>
+                </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 type="dynamic" source="listChoices" evaluation="ChoicesSelectionMade" onselect="ChoicesSelectionMoved" />
+		
+                <code>
 self.clearSelectedKeys()
 self.selectKey("OK")
 self.selectKey("UP")
 self.selectKey("DOWN")
-			</code>
-		</step>
-
-		<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" />
-			<code>
+                </code>
+        </step>
+        <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)" type="ConfigList" />
+                <code>
 self.clearSelectedKeys()
 self.selectKey("OK")
 self.selectKey("UP")
 self.selectKey("DOWN")
 self.selectKey("LEFT")
 self.selectKey("RIGHT")
-			</code>
-			<code pos="after" async="yes">
+                </code>
+                <code pos="after" async="yes">
 self.AdapterSetupEnd(self.selectedInterface)
-			</code>			
-		</step>
+                </code>                 
+        </step>
+        <step id="checkWlanstatusend" nextstep="end">
+		<condition>
+self.condition = (self.InterfaceState == True )
+		</condition>
+                <text value="Your Dreambox is now ready to use.\n\nYour internet connection is working now.\n\nPlease press OK to continue." />
+                <displaytext value="Please follow the instructions on the TV" />
+                <code>
+self.clearSelectedKeys()
+self.selectKey("OK")
+self["text"].setText(self.Text)
+                </code>
+                <code pos="after">
+currStep = self.numSteps                                
+self.wizard[currStep]["nextstep"] = None
+self.markDone()
+self.close()
+                </code> 
+        </step>
+        <step id="checkWlanstatusend">
+		<condition>
+self.condition = (self.InterfaceState == False )
+		</condition>
+                <text value="Your internet connection is not working!\nPlease choose what you want to do next." />
+                <displaytext value="Please follow the instructions on the TV" />
+                <code>
+self.clearSelectedKeys()
+self.selectKey("OK")
+self.selectKey("UP")
+self.selectKey("DOWN")
+                </code>
+                <list>
+                        <listentry caption="Configure your network again" step="welcome" />
+                        <listentry caption="Exit network wizard" step="end" />
+                </list>
+        </step>
 
-		<step id="end">
-			<text value="Thank you for using the wizard.\nPlease press OK to continue." />
-			<code>
+        <step id="end">
+                <text value="Thank you for using the wizard.\nPlease press OK to continue." />
+                <code>
 self.clearSelectedKeys()
 self.selectKey("OK")
-			</code>
-		</step>
+                </code>
+        </step>
 </wizard>
 
-