Merge branch 'master' of git.opendreambox.org:/git/enigma2

6 files changed, 20 insertions, 12 deletions

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
--- a/lib/python/Plugins/SystemPlugins/NFIFlash/meta/nfiflash.jpg
+++ /dev/null
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
--- /dev/null
+++ b/lib/python/Plugins/SystemPlugins/NFIFlash/meta/nfiflash_de.jpg
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
--- /dev/null
+++ b/lib/python/Plugins/SystemPlugins/NFIFlash/meta/nfiflash_en.jpg
diff --git a/lib/python/Plugins/SystemPlugins/NFIFlash/meta/plugin_nfiflash.xml b/lib/python/Plugins/SystemPlugins/NFIFlash/meta/plugin_nfiflash.xml
index 2de88f08..c81f4ca5 100644..100755
--- a/lib/python/Plugins/SystemPlugins/NFIFlash/meta/plugin_nfiflash.xml
+++ b/lib/python/Plugins/SystemPlugins/NFIFlash/meta/plugin_nfiflash.xml
@@ -12,7 +12,7 @@
                     <description>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.
                     </description>
-                    <screenshot src="http://www.dreamboxupdate.com/preview/nfiflash.jpg" />
+                    <screenshot src="http://www.dreamboxupdate.com/preview/plugin_nfiflash_en.jpg" />
           </info>
           <info language="de">
                     <author>Dream Multimedia</author>
@@ -22,7 +22,7 @@
                     <description>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.
                     </description>
-                    <screenshot src="http://www.dreamboxupdate.com/preview/nfiflash.jpg" />
+                    <screenshot src="http://www.dreamboxupdate.com/preview/plugin_nfiflash_de.jpg" />
           </info>
 	  <files type="package"> <!-- without version, without .ipk -->
 		<file type="package" name="enigma2-plugin-systemplugins-nfiflash" />
diff --git a/lib/python/Plugins/SystemPlugins/NFIFlash/plugin.py b/lib/python/Plugins/SystemPlugins/NFIFlash/plugin.py
index 40914e12..28b33305 100644..100755
--- 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)]