From bc6d7d587ad101a8449537238b9703f3a5fbbacb Mon Sep 17 00:00:00 2001 From: acid-burn Date: Wed, 25 Nov 2009 20:18:50 +0100 Subject: Enigma2-Metainformations: - update all Meta Informations --- .../Plugins/SystemPlugins/NFIFlash/meta/Makefile.am | 2 +- .../Plugins/SystemPlugins/NFIFlash/meta/nfiflash.jpg | Bin 192129 -> 0 bytes .../SystemPlugins/NFIFlash/meta/nfiflash_de.jpg | Bin 0 -> 168093 bytes .../SystemPlugins/NFIFlash/meta/nfiflash_en.jpg | Bin 0 -> 161749 bytes .../SystemPlugins/NFIFlash/meta/plugin_nfiflash.xml | 4 ++-- 5 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 lib/python/Plugins/SystemPlugins/NFIFlash/meta/nfiflash.jpg create mode 100755 lib/python/Plugins/SystemPlugins/NFIFlash/meta/nfiflash_de.jpg create mode 100755 lib/python/Plugins/SystemPlugins/NFIFlash/meta/nfiflash_en.jpg mode change 100644 => 100755 lib/python/Plugins/SystemPlugins/NFIFlash/meta/plugin_nfiflash.xml (limited to 'lib/python/Plugins/SystemPlugins/NFIFlash') diff --git a/lib/python/Plugins/SystemPlugins/NFIFlash/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/NFIFlash/meta/Makefile.am index 686bded0..0633e7cf 100755 --- a/lib/python/Plugins/SystemPlugins/NFIFlash/meta/Makefile.am +++ b/lib/python/Plugins/SystemPlugins/NFIFlash/meta/Makefile.am @@ -2,4 +2,4 @@ installdir = $(datadir)/meta/ dist_install_DATA = plugin_nfiflash.xml -EXTRA_DIST = nfiflash.jpg +EXTRA_DIST = nfiflash_de.jpg nfiflash_en.jpg diff --git a/lib/python/Plugins/SystemPlugins/NFIFlash/meta/nfiflash.jpg b/lib/python/Plugins/SystemPlugins/NFIFlash/meta/nfiflash.jpg deleted file mode 100644 index 0a5fa469..00000000 Binary files a/lib/python/Plugins/SystemPlugins/NFIFlash/meta/nfiflash.jpg and /dev/null differ diff --git a/lib/python/Plugins/SystemPlugins/NFIFlash/meta/nfiflash_de.jpg b/lib/python/Plugins/SystemPlugins/NFIFlash/meta/nfiflash_de.jpg new file mode 100755 index 00000000..fec93f4b Binary files /dev/null and b/lib/python/Plugins/SystemPlugins/NFIFlash/meta/nfiflash_de.jpg differ diff --git a/lib/python/Plugins/SystemPlugins/NFIFlash/meta/nfiflash_en.jpg b/lib/python/Plugins/SystemPlugins/NFIFlash/meta/nfiflash_en.jpg new file mode 100755 index 00000000..32a9967b Binary files /dev/null and b/lib/python/Plugins/SystemPlugins/NFIFlash/meta/nfiflash_en.jpg differ diff --git a/lib/python/Plugins/SystemPlugins/NFIFlash/meta/plugin_nfiflash.xml b/lib/python/Plugins/SystemPlugins/NFIFlash/meta/plugin_nfiflash.xml old mode 100644 new mode 100755 index 2de88f08..c81f4ca5 --- a/lib/python/Plugins/SystemPlugins/NFIFlash/meta/plugin_nfiflash.xml +++ b/lib/python/Plugins/SystemPlugins/NFIFlash/meta/plugin_nfiflash.xml @@ -12,7 +12,7 @@ With the NFIFlash extension it is possible to prepare a USB stick with an Dreambox image.\n It is then possible to flash your Dreambox with the image on that stick. - + Dream Multimedia @@ -22,7 +22,7 @@ Mit der NFIFlash Erweiterung können Sie ein Dreambox Image auf einen USB-Stick laden.\ Mit diesem USB-Stick ist es dann möglich Ihre Dreambox zu flashen. - + -- cgit v1.2.3 From 3e4556706ac4c42b68594be8477fb204cd5ff0e9 Mon Sep 17 00:00:00 2001 From: Mladen Horvat Date: Mon, 7 Dec 2009 14:12:14 +0100 Subject: NFIFlash/plugin.py: move NFI Flash Utility inside Softwaremanager. This fixes #308 --- .../Plugins/SystemPlugins/NFIFlash/plugin.py | 26 ++++++++++++++-------- 1 file changed, 17 insertions(+), 9 deletions(-) mode change 100644 => 100755 lib/python/Plugins/SystemPlugins/NFIFlash/plugin.py (limited to 'lib/python/Plugins/SystemPlugins/NFIFlash') diff --git a/lib/python/Plugins/SystemPlugins/NFIFlash/plugin.py b/lib/python/Plugins/SystemPlugins/NFIFlash/plugin.py old mode 100644 new mode 100755 index 40914e12..28b33305 --- a/lib/python/Plugins/SystemPlugins/NFIFlash/plugin.py +++ b/lib/python/Plugins/SystemPlugins/NFIFlash/plugin.py @@ -1,20 +1,28 @@ +from Plugins.Plugin import PluginDescriptor +from Tools.HardwareInfo import HardwareInfo +from Tools.Directories import fileExists +from downloader import NFIDownload, filescan + +def NFIFlasherMain(session, tmp = None, **kwargs): + session.open(NFIDownload, "/home/root" ) + +def NFICallFnc(tmp = None): + return NFIFlasherMain + def Plugins(**kwargs): - from Plugins.Plugin import PluginDescriptor - from Tools.HardwareInfo import HardwareInfo # currently only available for DM8000 if HardwareInfo().get_device_name() != "dm8000": return [PluginDescriptor()] - from Tools.Directories import fileExists if fileExists("/usr/share/bootlogo-flasher.mvi"): import flasher # started from usb stick # don't try to be intelligent and trick this - it's not possible to rewrite the flash memory with a system currently booted from it return [PluginDescriptor(where = PluginDescriptor.WHERE_WIZARD, fnc = (9,flasher.NFIFlash))] else: # started on real enigma2 - import downloader - return [PluginDescriptor(name="NFI Image Flashing", - description = _("Download .NFI-Files for USB-Flasher"), + return [PluginDescriptor(name=_("NFI Image Flashing"), + description=_("Download .NFI-Files for USB-Flasher"), icon = "flash.png", - where = [PluginDescriptor.WHERE_PLUGINMENU], - fnc = downloader.main), PluginDescriptor(name="nfi", where = PluginDescriptor.WHERE_FILESCAN, fnc = downloader.filescan) - ] + where = PluginDescriptor.WHERE_SOFTWAREMANAGER, + fnc={"SoftwareSupported": NFICallFnc, "menuEntryName": lambda x: _("NFI Image Flashing"), + "menuEntryDescription": lambda x: _("Download .NFI-Files for USB-Flasher")}), + PluginDescriptor(name="nfi", where = PluginDescriptor.WHERE_FILESCAN, fnc = filescan)] -- cgit v1.2.3