X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/31fb73a15d12559b15f5506622c3902476d3ea0f..ddca4f01fa219240987d2b2ba15d04863ada879e:/lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py

diff --git a/lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py b/lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py
index c065c815..c0649b13 100644
--- a/lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py
@@ -8,6 +8,7 @@ from Components.MenuList import MenuList
 from Components.Input import Input
 from Screens.Console import Console
 from Plugins.Plugin import PluginDescriptor
+from Screens.ImageWizard import ImageWizard
 
 import os
 
@@ -25,7 +26,8 @@ class UpdatePluginMenu(Screen):
 		
 		list = []
 		if self.menu == 0:
-			list.append((_("Upgrade"), "upgrade"))
+			list.append((_("Image-Upgrade"), "image"))
+			list.append((_("Online-Upgrade"), "upgrade"))
 			list.append((_("Advanced"), "advanced"))
 		elif self.menu == 1:
 			list.append((_("Choose source"), "source"))
@@ -42,6 +44,8 @@ class UpdatePluginMenu(Screen):
 		
 	def go(self):
 		if self.menu == 0:
+			if (self["menu"].l.getCurrentSelection()[1] == "image"):
+				self.session.open(ImageWizard)
 			if (self["menu"].l.getCurrentSelection()[1] == "upgrade"):
 				self.session.openWithCallback(self.runUpgrade, MessageBox, _("Do you want to update your Dreambox?\nAfter pressing OK, please wait!"))
 			if (self["menu"].l.getCurrentSelection()[1] == "advanced"):
@@ -55,7 +59,7 @@ class UpdatePluginMenu(Screen):
 				self.session.open(MessageBox, _("Function not yet implemented"), MessageBox.TYPE_ERROR)
 	def runUpgrade(self, result):
 		if result:
-			self.session.open(Console, ["ipkg update", "ipkg upgrade -force-defaults -force-overwrite"])
+			self.session.open(Console, title = "Upgrade running...", cmdlist = ["ipkg update", "ipkg upgrade -force-defaults -force-overwrite"])
 
 class IPKGSource(Screen):
 	skin = """
@@ -215,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)