diff options
Diffstat (limited to 'lib')
11 files changed, 25 insertions, 26 deletions
diff --git a/lib/python/Plugins/DemoPlugins/TestPlugin/plugin.py b/lib/python/Plugins/DemoPlugins/TestPlugin/plugin.py index 1d21ea3d..e6d83bf5 100644 --- a/lib/python/Plugins/DemoPlugins/TestPlugin/plugin.py +++ b/lib/python/Plugins/DemoPlugins/TestPlugin/plugin.py @@ -68,13 +68,11 @@ class Test(Screen): print "pressed", number self["text"].number(number) -def main(session): +def main(session, **kwargs): session.openWithCallback(test, ChoiceBox, title="Delete everything on this Dreambox?", list=[(_("yes"), "yes"), (_("no"), "no"), (_("perhaps"), "perhaps"), (_("ask me tomorrow"), "ask me tomorrow"), (_("leave me alone with this!"), "yes")]) def test(returnValue): print "You entered", returnValue -def Plugins(): - return PluginDescriptor(name="Test", description="plugin to test some capabilities", where = PluginDescriptor.WHERE_PLUGINMENU, fnc=main) - -
\ No newline at end of file +def Plugins(**kwargs): + return PluginDescriptor(name="Test", description="plugin to test some capabilities", where = PluginDescriptor.WHERE_PLUGINMENU, fnc=main) diff --git a/lib/python/Plugins/Extensions/CutListEditor/plugin.py b/lib/python/Plugins/Extensions/CutListEditor/plugin.py index 25a5e742..16616cd2 100644 --- a/lib/python/Plugins/Extensions/CutListEditor/plugin.py +++ b/lib/python/Plugins/Extensions/CutListEditor/plugin.py @@ -338,8 +338,8 @@ Then seek to the end, press OK, select 'end cut'. That's it. self.cut_list.remove(self.context_nearest_mark) self.uploadCuesheet() -def main(session, service): +def main(session, service, **kwargs): session.open(CutListEditor, service) -def Plugins(): +def Plugins(**kwargs): return PluginDescriptor(name="Cutlist Editor", description=_("Cutlist editor..."), where = PluginDescriptor.WHERE_MOVIELIST, fnc=main) diff --git a/lib/python/Plugins/Extensions/FileManager/plugin.py b/lib/python/Plugins/Extensions/FileManager/plugin.py index 05a19fc2..a17e631c 100644 --- a/lib/python/Plugins/Extensions/FileManager/plugin.py +++ b/lib/python/Plugins/Extensions/FileManager/plugin.py @@ -62,8 +62,8 @@ class FileManager(Screen): print "pressed", number self["text"].number(number) -def main(session): +def main(session, **kwargs): session.open(FileManager) -def Plugins(): +def Plugins(**kwargs): return PluginDescriptor(name="File-Manager", description="Let's you view/edit files in your Dreambox", where = PluginDescriptor.WHERE_PLUGINMENU, fnc=main) diff --git a/lib/python/Plugins/Extensions/TuxboxPlugins/plugin.py b/lib/python/Plugins/Extensions/TuxboxPlugins/plugin.py index 7ab02da7..8d4e1581 100644 --- a/lib/python/Plugins/Extensions/TuxboxPlugins/plugin.py +++ b/lib/python/Plugins/Extensions/TuxboxPlugins/plugin.py @@ -38,9 +38,9 @@ def getPluginParams(file): return params -def main(session, plugin): +def main(session, plugin, **kwargs): print "Running plugin " + plugin[:-4] + ".so with config file", plugin print getPluginParams(plugin) -def Plugins(): - return getPlugins()
\ No newline at end of file +def Plugins(**kwargs): + return getPlugins() diff --git a/lib/python/Plugins/Extensions/WebInterface/plugin.py b/lib/python/Plugins/Extensions/WebInterface/plugin.py index f0be4e45..0f7e2bbd 100644 --- a/lib/python/Plugins/Extensions/WebInterface/plugin.py +++ b/lib/python/Plugins/Extensions/WebInterface/plugin.py @@ -8,12 +8,12 @@ def startWebserver(): reactor.listenTCP(80, http.HTTPFactory(site)) -def autostart(reason): +def autostart(reason, **kwargs): if reason == 0: try: startWebserver() except ImportError: print "twisted not available, not starting web services" -def Plugins(): +def Plugins(**kwargs): return PluginDescriptor(where = PluginDescriptor.WHERE_AUTOSTART, fnc = autostart) diff --git a/lib/python/Plugins/Extensions/ZappingAlternatives/plugin.py b/lib/python/Plugins/Extensions/ZappingAlternatives/plugin.py index dace8dd5..118f0cb6 100644 --- a/lib/python/Plugins/Extensions/ZappingAlternatives/plugin.py +++ b/lib/python/Plugins/Extensions/ZappingAlternatives/plugin.py @@ -294,9 +294,9 @@ def autostart(reason): NavigationInstance.instance.playService = type(NavigationInstance.instance.playService)(playService, NavigationInstance, Navigation) -def AlternativeZappingSetup(session): +def AlternativeZappingSetup(session, **kwargs): session.open(AlternativeZapping) -def Plugins(): +def Plugins(**kwargs): return [PluginDescriptor(where = PluginDescriptor.WHERE_AUTOSTART, fnc = autostart), PluginDescriptor(name="Alternative services setup" , description="Defines alternatives for services.", where = PluginDescriptor.WHERE_PLUGINMENU, fnc=AlternativeZappingSetup)] diff --git a/lib/python/Plugins/Plugin.py b/lib/python/Plugins/Plugin.py index 3db70397..2c8d9296 100644 --- a/lib/python/Plugins/Plugin.py +++ b/lib/python/Plugins/Plugin.py @@ -11,6 +11,8 @@ class PluginDescriptor: # servicereference # reason + # you have to ignore unknown kwargs! + # argument: session WHERE_BLUEMENU = 0 WHERE_MAINMENU = 1 @@ -44,7 +46,7 @@ class PluginDescriptor: def updateIcon(self, path): if type(self.iconstr) is str: - self.icon = loadPNG(path + self.iconstr) + self.icon = loadPNG(path + "/" + self.iconstr) else: self.icon = None diff --git a/lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/plugin.py b/lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/plugin.py index fea38424..94c81c05 100644 --- a/lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/plugin.py +++ b/lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/plugin.py @@ -44,7 +44,7 @@ class FPUpgrade(Screen): def ok(self): self.close(4) -def Plugins(): +def Plugins(**kwargs): from Tools.DreamboxHardware import getFPVersion version = getFPVersion() newversion = getUpgradeVersion() or 0 diff --git a/lib/python/Plugins/SystemPlugins/OldSoftwareUpdate/plugin.py b/lib/python/Plugins/SystemPlugins/OldSoftwareUpdate/plugin.py index 0dc53a6c..72279c1a 100644 --- a/lib/python/Plugins/SystemPlugins/OldSoftwareUpdate/plugin.py +++ b/lib/python/Plugins/SystemPlugins/OldSoftwareUpdate/plugin.py @@ -166,12 +166,12 @@ class Ipkg(Screen): else: self.close() -def UpgradeMain(session): +def UpgradeMain(session, **kwargs): session.open(Upgrade) -def IpkgMain(session): +def IpkgMain(session, **kwargs): session.open(Ipkg) -def Plugins(): +def Plugins(**kwargs): return [PluginDescriptor(name="Old Softwareupdate", description="Updates your receiver's software", icon="update.png", where = PluginDescriptor.WHERE_PLUGINMENU, fnc=UpgradeMain), PluginDescriptor(name="IPKG", description="IPKG frontend", icon="update.png", where = PluginDescriptor.WHERE_PLUGINMENU, fnc=IpkgMain)] diff --git a/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py b/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py index cd39fecf..579f6c99 100644 --- a/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py +++ b/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py @@ -129,9 +129,8 @@ class PositionerSetup(Screen): else: self.status.setText("not moving") -def PositionerMain(session): +def PositionerMain(session, **kwargs): session.open(PositionerSetup) -def Plugins(): +def Plugins(**kwargs): return PluginDescriptor(name="Positioner setup", description="Setup your positioner", where = PluginDescriptor.WHERE_PLUGINMENU, fnc=PositionerMain) - diff --git a/lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py b/lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py index 00f8e185..af4d8982 100644 --- a/lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py +++ b/lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py @@ -219,8 +219,8 @@ class Ipkg(Screen): else: self.close() -def UpgradeMain(session): +def UpgradeMain(session, **kwargs): session.open(UpdatePluginMenu) -def Plugins(): +def Plugins(**kwargs): return PluginDescriptor(name="Softwareupdate", description="Updates your receiver's software", icon="update.png", where = PluginDescriptor.WHERE_PLUGINMENU, fnc=UpgradeMain) |