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

3 files changed, 6 insertions, 40 deletions

diff --git a/lib/python/Screens/ImageWizard.py b/lib/python/Screens/ImageWizard.py
deleted file mode 100644
index faf6120b..00000000
--- a/lib/python/Screens/ImageWizard.py
+++ /dev/null
@@ -1,38 +0,0 @@
-from Wizard import Wizard, wizardManager
-
-from Tools.Directories import fileExists
-
-import os
-
-backupfile = "backupenigma2settings.tar"
-
-def checkConfigBackup():
-	paths = ['/media/hdd/', '/media/cf/']
-	for x in paths:
-		if fileExists(x + backupfile):
-			return x
-	return None
-
-if checkConfigBackup() is None:
-	backupAvailable = 0
-else:
-	backupAvailable = 1
-
-class ImageWizard(Wizard):
-	def __init__(self, session):
-		self.xmlfile = "imagewizard.xml"
-		Wizard.__init__(self, session, showSteps=False, showStepSlider=False, showList=True, showConfig=True)
-
-	def markDone(self):
-		pass
-
-wizardManager.registerWizard(ImageWizard, backupAvailable, priority = 10)
-
-def doBackup(path):
-	os.system('tar cvpf ' + path + backupfile + ' /etc/enigma2')
-
-def doRestore(path):
-	os.system('cd / && /bin/tar xvpf ' + path + backupfile)
-	
-
-		
\ No newline at end of file
diff --git a/lib/python/Screens/Ipkg.py b/lib/python/Screens/Ipkg.py
index eac03479..96876336 100644..100755
--- a/lib/python/Screens/Ipkg.py
+++ b/lib/python/Screens/Ipkg.py
@@ -54,7 +54,7 @@ class Ipkg(Screen):
 			self.slider.setValue(len(self.cmdList))
 				
 			self.package.setText("")
-			self.status.setText(_("Done - Installed or upgraded %d packages with %d errors") % (self.packages, self.error))
+			self.status.setText(_("Done - Installed, upgraded or removed %d packages with %d errors") % (self.packages, self.error))
 			return False
 		else:
 			cmd = self.cmdList[self.runningCmd]
@@ -90,6 +90,10 @@ class Ipkg(Screen):
 			self.package.setText(param)
 			self.status.setText(_("Installing"))
 			self.packages += 1
+		elif event == IpkgComponent.EVENT_REMOVE:
+			self.package.setText(param)
+			self.status.setText(_("Removing"))
+			self.packages += 1
 		elif event == IpkgComponent.EVENT_CONFIGURING:
 			self.package.setText(param)
 			self.status.setText(_("Configuring"))
diff --git a/lib/python/Screens/Makefile.am b/lib/python/Screens/Makefile.am
index cde2d6c3..00204a94 100755
--- a/lib/python/Screens/Makefile.am
+++ b/lib/python/Screens/Makefile.am
@@ -9,7 +9,7 @@ install_PYTHON = \
 	InfoBarGenerics.py HelpMenu.py Wizard.py __init__.py \
 	Dish.py LanguageSelection.py StartWizard.py PiPSetup.py Subtitles.py \
 	TutorialWizard.py PluginBrowser.py MinuteInput.py Scart.py PVRState.py \
-	Console.py InputBox.py ChoiceBox.py SimpleSummary.py ImageWizard.py \
+	Console.py InputBox.py ChoiceBox.py SimpleSummary.py \
 	TimerSelection.py PictureInPicture.py TimeDateInput.py \
 	SubtitleDisplay.py SubservicesQuickzap.py ParentalControlSetup.py NumericalTextInputHelpDialog.py \
 	SleepTimerEdit.py Ipkg.py RdsDisplay.py Globals.py DefaultWizard.py \