X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/e7b3db898270e6a6a252eee7697302fb0c1f7d38..39f705dd80ae8b9e30ff2a76e1089b3cf0d3b4c1:/lib/python/Screens/NetworkSetup.py diff --git a/lib/python/Screens/NetworkSetup.py b/lib/python/Screens/NetworkSetup.py index b4dbc639..9514e7fd 100644 --- a/lib/python/Screens/NetworkSetup.py +++ b/lib/python/Screens/NetworkSetup.py @@ -1,11 +1,11 @@ from Screen import Screen from Components.ActionMap import ActionMap -from Components.ConfigList import ConfigList, ConfigListScreen +from Components.ConfigList import ConfigListScreen from Components.config import config, getConfigListEntry from Components.Network import iNetwork from Components.Label import Label from Components.MenuList import MenuList -from Components.config import config, ConfigYesNo, ConfigIP, NoSave, ConfigSubsection, ConfigNothing +from Components.config import config, ConfigYesNo, ConfigIP, NoSave, ConfigNothing from Components.PluginComponent import plugins from Plugins.Plugin import PluginDescriptor @@ -137,6 +137,7 @@ class AdapterSetup(Screen, ConfigListScreen): self.list.append(getConfigListEntry(_('Gateway'), self.gatewayConfigEntry)) self.extended = None + self.extendedSetup = None for p in plugins.getPlugins(PluginDescriptor.WHERE_NETWORKSETUP): callFnc = p.__call__["ifaceSupported"](self.iface) if callFnc is not None: @@ -146,7 +147,12 @@ class AdapterSetup(Screen, ConfigListScreen): self.configStrings = p.__call__["configStrings"] else: self.configStrings = None - self.extendedSetup = getConfigListEntry(_('Extended Setup...'), NoSave(ConfigNothing())) + + if p.__call__.has_key("menuEntryName"): + menuEntryName = p.__call__["menuEntryName"](self.iface) + else: + menuEntryName = _('Extended Setup...') + self.extendedSetup = getConfigListEntry(menuEntryName, NoSave(ConfigNothing())) self.list.append(self.extendedSetup) self["config"].list = self.list @@ -178,8 +184,6 @@ class AdapterSetup(Screen, ConfigListScreen): else: iNetwork.removeAdapterAttribute(self.iface, "gateway") - print "self.extended:", self.extended - print "self.configStrings:", self.configStrings if self.extended is not None and self.configStrings is not None: iNetwork.setAdapterAttribute(self.iface, "configStrings", self.configStrings(self.iface))