From: acid-burn <acid-burn@opendreambox.org>
Date: Fri, 29 Jan 2010 08:14:17 +0000 (+0100)
Subject: Merge commit 'origin/bug_218_simplify_networkwizard' into experimental
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=57ff47aa9d84ac5502a6d1bebcb10780997c3134

Merge commit 'origin/bug_218_simplify_networkwizard' into experimental

Conflicts:
	lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py
---

57ff47aa9d84ac5502a6d1bebcb10780997c3134
diff --cc lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py
index 13e7fdd,018ae87..150dba9
--- a/lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py
+++ b/lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py
@@@ -354,3 -395,26 +395,27 @@@ class NetworkWizard(WizardLanguage, Rc)
  		else:
  			self.WlanPluginInstalled = True
  
+ 	def listChoices(self):
+ 		self.rescanTimer.stop()
+ 		list = []
+ 		if self.WlanPluginInstalled == True:
+ 			list.append((_("Configure your wireless LAN again"), "scanwlan"))
+ 		list.append((_("Configure your internal LAN"), "nwconfig"))
+ 		list.append((_("Exit network wizard"), "end"))		
+ 		return list
+ 
+ 	def ChoicesSelectionMade(self, index):
+ 		self.ChoicesSelect(index)
+ 
+ 	def ChoicesSelect(self, index):
+ 		if index == 'end':
+ 			self.NextStep = 'end'
+ 		elif index == 'nwconfig':
+ 			self.selectedInterface = "eth0"
+ 			self.NextStep = 'nwconfig'
+ 		else:
+ 			self.NextStep = 'scanwlan'
+ 
+ 	def ChoicesSelectionMoved(self):
+ 		pass
++