X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/4c2cba9ccb6f754aac9378e2fc2c7b546e6d589c..15171632716c0734526eefc55e3d0601be177b45:/lib/python/Screens/NetworkSetup.py

diff --git a/lib/python/Screens/NetworkSetup.py b/lib/python/Screens/NetworkSetup.py
index 580673e4..ea2d17e6 100755
--- a/lib/python/Screens/NetworkSetup.py
+++ b/lib/python/Screens/NetworkSetup.py
@@ -88,9 +88,9 @@ class NetworkAdapterSelection(Screen,HelpableScreen):
 		if len(self.adapters) == 1:
 			self.onFirstExecBegin.append(self.okbuttonClick)
 		self.onClose.append(self.cleanup)
-		
+
+
 	def updateList(self):
-		iNetwork.getInterfaces()
 		self.list = []
 		default_gw = None
 		num_configured_if = len(iNetwork.getConfiguredAdapters())
@@ -175,6 +175,7 @@ class NetworkAdapterSelection(Screen,HelpableScreen):
 	def cleanup(self):
 		iNetwork.stopLinkStateConsole()
 		iNetwork.stopRestartConsole()
+		iNetwork.stopGetInterfacesConsole()
 
 	def restartLan(self):
 		iNetwork.restartNetwork(self.restartLanDataAvail)
@@ -220,6 +221,10 @@ class NameserverSetup(Screen, ConfigListScreen, HelpableScreen):
 			"yellow": (self.remove, _("remove a nameserver entry")),
 			})
 		
+		self["actions"] = NumberActionMap(["SetupActions"],
+		{
+			"ok": self.ok,
+		}, -2)		
 		
 		self.list = []
 		ConfigListScreen.__init__(self, self.list)
@@ -290,7 +295,7 @@ class AdapterSetup(Screen, ConfigListScreen, HelpableScreen):
 		self.finished_cb = None
 		self.oktext = _("Press OK on your remote control to continue.")
 		self.oldInterfaceState = iNetwork.getAdapterAttribute(self.iface, "up")
-		
+
 		self.createConfig()
 
 		self["OkCancelActions"] = HelpableActionMap(self, "OkCancelActions",
@@ -422,10 +427,10 @@ class AdapterSetup(Screen, ConfigListScreen, HelpableScreen):
 							if a['active']:
 								if a['essid'] == "":
 									a['essid'] = a['bssid']
-								self.nwlist.append( a['essid'])
+								self.nwlist.append((a['essid'],a['essid']))
 					self.nwlist.sort(key = lambda x: x[0])
 				except:
-					self.nwlist.append("No Networks found")
+					self.nwlist.append(("No Networks found",_("No Networks found")))
 
 			self.wsconfig = self.ws.loadConfig()
 			if self.essid is not None: # ssid from wlan scan
@@ -434,10 +439,9 @@ class AdapterSetup(Screen, ConfigListScreen, HelpableScreen):
 				self.default = self.wsconfig['ssid']
 				
 			if "hidden..." not in self.nwlist:
-				self.nwlist.append("hidden...")
+				self.nwlist.append(("hidden...",_("hidden network")))
 			if self.default not in self.nwlist:
-				self.nwlist.append(self.default)
-
+				self.nwlist.append((self.default,self.default))
 			config.plugins.wlan.essid = NoSave(ConfigSelection(self.nwlist, default = self.default ))
 			config.plugins.wlan.hiddenessid = NoSave(ConfigText(default = self.wsconfig['hiddenessid'], visible_width = 50, fixed_size = False))
 
@@ -647,15 +651,10 @@ class AdapterSetup(Screen, ConfigListScreen, HelpableScreen):
 
 	def cancel(self):
 		if self.oldInterfaceState is False:
-			iNetwork.deactivateInterface(self.iface,self.deactivateInterfaceCB)
+			iNetwork.deactivateInterface(self.iface,self.cancelCB)
 		else:
 			self.close('cancel')
 
-	def deactivateInterfaceCB(self,data):
-		if data is not None:
-			if data is True:
-				iNetwork.getInterfaces(self.cancelCB)
-	
 	def cancelCB(self,data):			
 		if data is not None:
 			if data is True:
@@ -675,8 +674,7 @@ class AdapterSetup(Screen, ConfigListScreen, HelpableScreen):
 		
 	def cleanup(self):
 		iNetwork.stopLinkStateConsole()
-		iNetwork.stopDeactivateInterfaceConsole()
-		
+	
 
 class AdapterSetupConfiguration(Screen, HelpableScreen):
 	def __init__(self, session,iface):
@@ -732,7 +730,7 @@ class AdapterSetupConfiguration(Screen, HelpableScreen):
 			"right": self.right,
 		}, -2)
 		
-		iNetwork.getInterfaces(self.updateStatusbar)
+		self.updateStatusbar()
 		self.onLayoutFinish.append(self.layoutFinished)
 		self.onClose.append(self.cleanup)
 
@@ -908,11 +906,11 @@ class AdapterSetupConfiguration(Screen, HelpableScreen):
 			else:
 				self.mainmenu = self.genMainMenu()
 				self["menulist"].l.setList(self.mainmenu)
-				iNetwork.getInterfaces(self.updateStatusbar)
+				self.updateStatusbar()
 		else:
 			self.mainmenu = self.genMainMenu()
 			self["menulist"].l.setList(self.mainmenu)
-			iNetwork.getInterfaces(self.updateStatusbar)
+			self.updateStatusbar()
 
 	def WlanStatusClosed(self, *ret):
 		if ret is not None and len(ret):
@@ -920,7 +918,7 @@ class AdapterSetupConfiguration(Screen, HelpableScreen):
 			iStatus.stopWlanConsole()
 			self.mainmenu = self.genMainMenu()
 			self["menulist"].l.setList(self.mainmenu)
-			iNetwork.getInterfaces(self.updateStatusbar)
+			self.updateStatusbar()
 
 	def WlanScanClosed(self,*ret):
 		if ret[0] is not None:
@@ -930,7 +928,7 @@ class AdapterSetupConfiguration(Screen, HelpableScreen):
 			iStatus.stopWlanConsole()
 			self.mainmenu = self.genMainMenu()
 			self["menulist"].l.setList(self.mainmenu)
-			iNetwork.getInterfaces(self.updateStatusbar)
+			self.updateStatusbar()
 			
 	def restartLan(self, ret = False):
 		if (ret == True):
@@ -955,9 +953,9 @@ class AdapterSetupConfiguration(Screen, HelpableScreen):
 		pattern = re_compile("Link detected: yes")
 		for item in result:
 			if re_search(pattern, item):
-				self["statuspic"].setPixmapNum(1)
-			else:
 				self["statuspic"].setPixmapNum(0)
+			else:
+				self["statuspic"].setPixmapNum(1)
 		self["statuspic"].show()
 
 	def showErrorMessage(self):
@@ -988,7 +986,6 @@ class NetworkAdapterTest(Screen):
 		Screen.__init__(self, session)
 		self.iface = iface
 		self.oldInterfaceState = iNetwork.getAdapterAttribute(self.iface, "up")
-		iNetwork.getInterfaces()
 		self.setLabels()
 		self.onClose.append(self.cleanup)
 		self.onHide.append(self.cleanup)