fix startwizard

data/startwizard.xml

@@ -1,4 +1,3 @@
-<!--suppress XmlUnboundNsPrefix -->
 <wizard>
 		<step id="start" nextstep="introduction">
 			<text value="Welcome.\n\nThis start wizard will guide you through the basic setup of your %s %s.\nPress the OK button on your remote control to move to the next step." />
@@ -19,6 +18,7 @@ self.selectKey("OK")
 self.clearSelectedKeys()
 self.selectKey("UP")
 self.selectKey("DOWN")
+self["key_yellow"].text = ""
 			</code>
 		</step>
 		<step id="network">

data/videowizard.xml

@@ -2,16 +2,16 @@
 <wizard>
 	<step id="inputselection" nextstep="modesdetection" timeout="10" timeoutaction="selectnext">
 		<condition>
-self.portCount = len(self.listPorts())
-self.condition = self.portCount > 1
-if self.portCount == 1:
+self.condition = len(self.listInputChannels()) > 1
+if len(self.listInputChannels()) == 1:
 	self.selection = "HDMI"
-	self.portSelectionMoved()
+	self.inputSelectionMoved()
 		</condition>
 		<text value="Video input selection\n\nPlease press OK if you can see this page on your TV (or select a different input port).\n\nThe next input port will be automatically probed in 10 seconds." />
 		<displaytext value="Select video output port with UP/DOWN buttons" />
-		<list type="dynamic" source="listPorts" evaluation="portSelectionMade" onselect="portSelectionMoved" />
+		<list type="dynamic" source="listInputChannels" evaluation="inputSelectionMade" onselect="inputSelectionMoved" />
 		<code>
+self["portpic"].show()
 self.clearSelectedKeys()
 self.selectKey("OK")
 		</code>
@@ -62,6 +62,7 @@ config.av.edid_override.save()
 self.clearSelectedKeys()
 self.selectKey("UP")
 self.selectKey("DOWN")
+self["portpic"].hide()
 		</code>
 	</step>
 	<step id="rateselection" nextstep="end" timeout="10" timeoutaction="selectnext">
@@ -79,7 +80,10 @@ self.selectKey("DOWN")
 	</step>
 	<step id="end">
 		<code>
-self.saveWizardChanges()
+self.hw.saveMode(self.port, self.mode, self.rate)
+from Components.config import configfile
+configfile.save()
+self.markDone()
 self.close()
 		</code>
 	</step>

lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py

@@ -12,6 +12,7 @@
 from Components.SystemInfo import BoxInfo, getBoxDisplayName
 from Components.config import config
 from Tools.Directories import resolveFilename, SCOPE_PLUGINS
+from Screens.WizardLanguage import WizardLanguage
 
 
 class NetworkWizard(Wizard, ShowRemoteControl):

lib/python/Plugins/SystemPlugins/NetworkWizard/networkwizard.xml

@@ -13,7 +13,6 @@ self.selectInterface()
 
 	<step id="selectinterface">
 
-	<step id="welcome">
 		<text value="Select the network interface to be used for the Internet connection.\n\nPress OK to continue." />
 		<displaytext value="Select interface" />
 		<list type="dynamic" source="listInterfaces" evaluation="InterfaceSelectionMade" onselect="InterfaceSelectionMoved" />

lib/python/Screens/InfoBarGenerics.py

@@ -299,7 +299,7 @@ class InfoBarAutoCam:
 
 	def __init__(self):
 		self.currentCam = BoxInfo.getItem("CurrentSoftcam")
-		self.defaultCam = config.misc.autocamDefault.value or self.currentCam
+#		self.defaultCam = config.misc.autocamDefault.value or self.currentCam
 		self.reload()
 
 	def reload(self):

lib/python/Screens/StartWizard.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import
 from Screens.HelpMenu import ShowRemoteControl
 from Screens.Wizard import wizardManager
 from Screens.WizardLanguage import WizardLanguage
@@ -13,6 +12,7 @@
 
 config.misc.firstrun = ConfigBoolean(default=True)
 config.misc.videowizardenabled = ConfigBoolean(default=True)
+config.misc.networkenabled = ConfigBoolean(default=False)
 
 
 class StartWizard(WizardLanguage, ShowRemoteControl):