diff options
Diffstat (limited to 'lib/python')
| -rwxr-xr-x | lib/python/Components/Network.py | 44 | ||||
| -rw-r--r-- | lib/python/Plugins/Extensions/DVDPlayer/plugin.py | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | lib/python/Plugins/Plugin.py | 3 | ||||
| -rw-r--r-- | lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py | 4 | ||||
| -rw-r--r-- | lib/python/Plugins/SystemPlugins/Videomode/videowizard.xml | 12 | ||||
| -rwxr-xr-x | lib/python/Screens/Wizard.py | 5 |
6 files changed, 50 insertions, 20 deletions
diff --git a/lib/python/Components/Network.py b/lib/python/Components/Network.py index f32a648c..c0b799ba 100755 --- a/lib/python/Components/Network.py +++ b/lib/python/Components/Network.py @@ -3,6 +3,8 @@ from re import compile as re_compile, search as re_search from socket import * from enigma import eConsoleAppContainer from Components.Console import Console +from Components.PluginComponent import plugins +from Plugins.Plugin import PluginDescriptor class Network: def __init__(self): @@ -22,6 +24,7 @@ class Network: self.activateConsole = Console() self.resetNetworkConsole = Console() self.DnsConsole = Console() + self.config_ready = None self.getInterfaces() def getInterfaces(self, callback = None): @@ -222,6 +225,8 @@ class Network: self.loadNameserverConfig() print "read configured interfac:", ifaces print "self.ifaces after loading:", self.ifaces + self.config_ready = True + self.msgPlugins() if callback is not None: callback(True) @@ -418,6 +423,8 @@ class Network: def restartNetwork(self,callback = None): self.restartConsole = Console() + self.config_ready = False + self.msgPlugins() self.commands = [] self.commands.append("/etc/init.d/avahi-daemon stop") for iface in self.ifaces.keys(): @@ -448,24 +455,34 @@ class Network: def stopLinkStateConsole(self): if self.LinkConsole is not None: - self.LinkConsole = None - + if len(self.LinkConsole.appContainers): + for name in self.LinkConsole.appContainers.keys(): + self.LinkConsole.kill(name) + def stopDNSConsole(self): if self.DnsConsole is not None: - self.DnsConsole = None - + if len(self.DnsConsole.appContainers): + for name in self.DnsConsole.appContainers.keys(): + self.DnsConsole.kill(name) + def stopRestartConsole(self): if self.restartConsole is not None: - self.restartConsole = None - + if len(self.restartConsole.appContainers): + for name in self.restartConsole.appContainers.keys(): + self.restartConsole.kill(name) + def stopGetInterfacesConsole(self): if self.Console is not None: - self.Console = None - + if len(self.Console.appContainers): + for name in self.Console.appContainers.keys(): + self.Console.kill(name) + def stopDeactivateInterfaceConsole(self): - if self.deactivateInterfaceConsole: - self.deactivateInterfaceConsole = None - + if self.deactivateInterfaceConsole is not None: + if len(self.deactivateInterfaceConsole.appContainers): + for name in self.deactivateInterfaceConsole.appContainers.keys(): + self.deactivateInterfaceConsole.kill(name) + def checkforInterface(self,iface): if self.getAdapterAttribute(iface, 'up') is True: return True @@ -547,6 +564,11 @@ class Network: netmask = str(inet_ntoa(pack('>L', nm))) return netmask + def msgPlugins(self): + if self.config_ready is not None: + for p in plugins.getPlugins(PluginDescriptor.WHERE_NETWORKCONFIG_READ): + p(reason=self.config_ready) + iNetwork = Network() def InitNetwork(): diff --git a/lib/python/Plugins/Extensions/DVDPlayer/plugin.py b/lib/python/Plugins/Extensions/DVDPlayer/plugin.py index 8e2a9f3a..6a8ffc6f 100644 --- a/lib/python/Plugins/Extensions/DVDPlayer/plugin.py +++ b/lib/python/Plugins/Extensions/DVDPlayer/plugin.py @@ -511,7 +511,7 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarP def askLeavePlayer(self): choices = [(_("Exit"), "exit"), (_("Continue playing"), "play")] - if not self.physicalDVD: + if True or not self.physicalDVD: choices.insert(1,(_("Return to file browser"), "browser")) self.session.openWithCallback(self.exitCB, ChoiceBox, title=_("Leave DVD Player?"), list = choices) diff --git a/lib/python/Plugins/Plugin.py b/lib/python/Plugins/Plugin.py index 53e7b0b8..d7fc6898 100644..100755 --- a/lib/python/Plugins/Plugin.py +++ b/lib/python/Plugins/Plugin.py @@ -49,6 +49,9 @@ class PluginDescriptor: # or return a function which is called with session and the interface name for extended setup of this interface WHERE_EVENTINFO = 11 + # reason (True: Networkconfig read finished, False: Networkconfig reload initiated ) + WHERE_NETWORKCONFIG_READ = 12 + def __init__(self, name = "Plugin", where = [ ], description = "", icon = None, fnc = None, wakeupfnc = None, internal = False): self.name = name self.internal = internal diff --git a/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py b/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py index 1d7ce7b5..095e94c0 100644 --- a/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py +++ b/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py @@ -13,8 +13,8 @@ config.misc.showtestcard = ConfigBoolean(default = False) class VideoWizardSummary(WizardSummary): skin = """ <screen position="0,0" size="132,64"> - <widget name="text" position="6,4" size="120,42" font="Regular;14" transparent="1" /> - <widget source="parent.list" render="Label" position="6,25" size="120,21" font="Regular;16"> + <widget name="text" position="6,4" size="120,40" font="Regular;12" transparent="1" /> + <widget source="parent.list" render="Label" position="6,40" size="120,21" font="Regular;14"> <convert type="StringListSelection" /> </widget> <!--widget name="pic" pixmap="%s" position="6,22" zPosition="10" size="64,64" transparent="1" alphatest="on"/--> diff --git a/lib/python/Plugins/SystemPlugins/Videomode/videowizard.xml b/lib/python/Plugins/SystemPlugins/Videomode/videowizard.xml index 2a592aae..29ac4297 100644 --- a/lib/python/Plugins/SystemPlugins/Videomode/videowizard.xml +++ b/lib/python/Plugins/SystemPlugins/Videomode/videowizard.xml @@ -1,7 +1,7 @@ <wizard> - <step id="inputselection" nextstep="modeselection" timeout="10" timeoutaction="selectnext"> + <step id="inputselection" nextstep="modeselection" timeout="20" timeoutaction="selectnext"> <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 input" /> + <displaytext value="Select video input with up/down buttons" /> <list type="dynamic" source="listInputChannels" evaluation="inputSelectionMade" onselect="inputSelectionMoved" /> <code> self["portpic"].show() @@ -9,7 +9,7 @@ self.clearSelectedKeys() self.selectKey("OK") </code> </step> - <step id="modeselection" nextstep="rateselection" timeout="10" timeoutaction="selectnext"> + <step id="modeselection" nextstep="rateselection" timeout="20" timeoutaction="selectnext"> <text value="Video mode selection." /> <displaytext value="Select video mode" /> <list type="dynamic" source="listModes" evaluation="modeSelectionMade" onselect="modeSelectionMoved" /> @@ -20,7 +20,7 @@ self.selectKey("DOWN") self["portpic"].hide() </code> </step> - <step id="rateselection" nextstep="dvirateintroduction" timeout="10" timeoutaction="selectnext"> + <step id="rateselection" nextstep="dvirateintroduction" timeout="20" timeoutaction="selectnext"> <condition> self.condition = (self.port != "DVI" or self.mode == "PC") </condition> @@ -46,7 +46,7 @@ self.selectKey("DOWN") self.rateSelect("60Hz") </code> </step> - <step id="dvirateselection" timeout="10" timeoutaction="changestep" timeoutstep="notworking50Hz"> + <step id="dvirateselection" timeout="20" timeoutaction="changestep" timeoutstep="notworking50Hz"> <condition> self.condition = (self.port == "DVI" and self.mode in ["720p", "1080i"]) </condition> @@ -77,7 +77,7 @@ self.selectKey("UP") self.selectKey("DOWN") </code> </step> - <step id="working50Hz" nextstep="end" timeout="10" timeoutaction="nextstep"> + <step id="working50Hz" nextstep="end" timeout="20" timeoutaction="nextstep"> <condition> self.condition = (self.port == "DVI" and self.mode in ["720p", "1080i"]) </condition> diff --git a/lib/python/Screens/Wizard.py b/lib/python/Screens/Wizard.py index 2326b915..7d454f43 100755 --- a/lib/python/Screens/Wizard.py +++ b/lib/python/Screens/Wizard.py @@ -475,6 +475,11 @@ class Wizard(Screen): self.currStep += 1 self.updateValues() else: + if self.wizard[self.currStep].has_key("displaytext"): + displaytext = self.wizard[self.currStep]["displaytext"] + print "set LCD text" + for x in self.lcdCallbacks: + x(displaytext) if len(self.stepHistory) == 0 or self.stepHistory[-1] != self.currStep: self.stepHistory.append(self.currStep) print "wizard step:", self.wizard[self.currStep] |