git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix getSubserviceIndex (not used anywhere anyway)
[enigma2.git]
/
lib
/
python
/
Screens
/
NetworkSetup.py
diff --git
a/lib/python/Screens/NetworkSetup.py
b/lib/python/Screens/NetworkSetup.py
index b4dbc639ac8e7b5c5fb3c4d7ad81aa9c30145e55..a2b15e935e7e6976dc8d564c5b5ebd1109abbf35 100644
(file)
--- a/
lib/python/Screens/NetworkSetup.py
+++ b/
lib/python/Screens/NetworkSetup.py
@@
-137,6
+137,7
@@
class AdapterSetup(Screen, ConfigListScreen):
self.list.append(getConfigListEntry(_('Gateway'), self.gatewayConfigEntry))
self.extended = None
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:
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.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
self.list.append(self.extendedSetup)
self["config"].list = self.list
@@
-178,8
+184,6
@@
class AdapterSetup(Screen, ConfigListScreen):
else:
iNetwork.removeAdapterAttribute(self.iface, "gateway")
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))
if self.extended is not None and self.configStrings is not None:
iNetwork.setAdapterAttribute(self.iface, "configStrings", self.configStrings(self.iface))