X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/db545998ecbe01bfd3fd13a8b274da869958e0f5..b92bc5134f26ded1a6c1de63b0ac6e403c8d7362:/lib/python/Screens/NetworkSetup.py

diff --git a/lib/python/Screens/NetworkSetup.py b/lib/python/Screens/NetworkSetup.py
index 6a8099eb..cf03f117 100644
--- a/lib/python/Screens/NetworkSetup.py
+++ b/lib/python/Screens/NetworkSetup.py
@@ -27,7 +27,6 @@ class NetworkAdapterSelection(Screen):
 
 	def okbuttonClick(self):
 		selection = self["adapterlist"].getCurrent()
-		print "SELECTION", selection
 		if selection is not None:
 			self.session.openWithCallback(self.AdapterSetupClosed, AdapterSetup, selection[1])
 
@@ -110,11 +109,11 @@ class AdapterSetup(Screen, ConfigListScreen):
 		self.iface = iface
 
 		print iNetwork.getAdapterAttribute(self.iface, "dhcp")
-		self.dhcpConfigEntry = NoSave(ConfigYesNo(default=iNetwork.getAdapterAttribute(self.iface, "dhcp")))
+		self.dhcpConfigEntry = NoSave(ConfigYesNo(default=iNetwork.getAdapterAttribute(self.iface, "dhcp") or False))
 		self.hasGatewayConfigEntry = NoSave(ConfigYesNo(default=True))
-		self.ipConfigEntry = NoSave(ConfigIP(default=iNetwork.getAdapterAttribute(self.iface, "ip")))
-		self.netmaskConfigEntry = NoSave(ConfigIP(default=iNetwork.getAdapterAttribute(self.iface, "netmask")))
-		self.gatewayConfigEntry = NoSave(ConfigIP(default=iNetwork.getAdapterAttribute(self.iface, "gateway")))
+		self.ipConfigEntry = NoSave(ConfigIP(default=iNetwork.getAdapterAttribute(self.iface, "ip")) or [0,0,0,0])
+		self.netmaskConfigEntry = NoSave(ConfigIP(default=iNetwork.getAdapterAttribute(self.iface, "netmask") or [255,0,0,0]))
+		self.gatewayConfigEntry = NoSave(ConfigIP(default=iNetwork.getAdapterAttribute(self.iface, "gateway") or [0,0,0,0]))
 	
 		self["iface"] = Label(iNetwork.getFriendlyAdapterName(self.iface))
 
@@ -129,6 +128,15 @@ class AdapterSetup(Screen, ConfigListScreen):
 		self.createSetup()
 
 		self["introduction"] = Label(_("Press OK to activate the settings."))
+		self["introduction2"] = Label(_("Current settings:"))
+		
+		self["IPtext"] = Label(_("IP Address"))
+		self["Netmasktext"] = Label(_("Netmask"))
+		self["Gatewaytext"] = Label(_("Gateway"))
+		
+		self["IP"] = Label(self.ipConfigEntry.getText())
+		self["Mask"] = Label(self.netmaskConfigEntry.getText())
+		self["Gateway"] = Label(self.gatewayConfigEntry.getText())
 
 	def createSetup(self):
 		self.list = []