7 files changed, 31 insertions, 54 deletions
diff --git a/lib/python/Screens/FactoryReset.py b/lib/python/Screens/FactoryReset.py
new file mode 100644
index 00000000..ce5aaeb3
--- /dev/null
+++ b/lib/python/Screens/FactoryReset.py
@@ -0,0 +1,9 @@
+from Screens.MessageBox import MessageBox
+
+class FactoryReset(MessageBox):
+	def __init__(self, session):
+		MessageBox.__init__(self, session, _("When you do a factory reset, you will lose ALL your configuration data\n"
+			"(including bouquets, services, satellite data ...)\n"
+			"After completion of factory reset, your receiver will restart automatically!\n\n"
+			"Really do a factory reset?"), MessageBox.TYPE_YESNO)
+		self.skinName = "MessageBox"
+\ No newline at end of file
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/LocationBox.py b/lib/python/Screens/LocationBox.py
index 389d3624..fa47b1f2 100644
--- a/lib/python/Screens/LocationBox.py
+++ b/lib/python/Screens/LocationBox.py
@@ -409,7 +409,7 @@ class LocationBox(Screen, NumericalTextInput, HelpableScreen):
 					))
 			else:
 				menu = (
-					(_("switch to filelist"), self.switchToFileList)
+					(_("switch to filelist"), self.switchToFileList),
 					(_("remove bookmark"), self.addRemoveBookmark)
 				)
 
diff --git a/lib/python/Screens/Makefile.am b/lib/python/Screens/Makefile.am
index cde2d6c3..ca67f73d 100755
--- a/lib/python/Screens/Makefile.am
+++ b/lib/python/Screens/Makefile.am
@@ -9,10 +9,10 @@ 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 \
 	SessionGlobals.py LocationBox.py WizardLanguage.py TaskView.py Rc.py VirtualKeyBoard.py \
-	TextBox.py
+	TextBox.py FactoryReset.py
 
diff --git a/lib/python/Screens/TimerEdit.py b/lib/python/Screens/TimerEdit.py
index cdff4c5b..6499ef50 100644
--- a/lib/python/Screens/TimerEdit.py
+++ b/lib/python/Screens/TimerEdit.py
@@ -273,7 +273,7 @@ class TimerEditList(Screen):
 					else:
 						success = True
 			else:
-				succsess = True
+				success = True
 			if success:
 				print "Sanity check passed"
 				self.session.nav.RecordTimer.timeChanged(entry)
diff --git a/lib/python/Screens/VirtualKeyBoard.py b/lib/python/Screens/VirtualKeyBoard.py
index 53970ab8..5dc1a090 100755
--- a/lib/python/Screens/VirtualKeyBoard.py
+++ b/lib/python/Screens/VirtualKeyBoard.py
@@ -5,19 +5,10 @@ from Components.Label import Label
 from Components.Pixmap import Pixmap
 from Components.MenuList import MenuList
 from Components.MultiContent import MultiContentEntryText, MultiContentEntryPixmapAlphaTest
-from enigma import eListboxPythonMultiContent, gFont, loadPNG, RT_HALIGN_CENTER, RT_VALIGN_CENTER
+from enigma import eListboxPythonMultiContent, gFont, RT_HALIGN_CENTER, RT_VALIGN_CENTER
 from Screen import Screen
 from Tools.Directories import resolveFilename, SCOPE_SKIN_IMAGE
-
-key_backspace = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/vkey_backspace.png"))
-key_bg = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/vkey_bg.png"))
-key_clr = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/vkey_clr.png"))
-key_esc = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/vkey_esc.png"))
-key_ok = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/vkey_ok.png"))
-key_sel = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/vkey_sel.png"))
-key_shift = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/vkey_shift.png"))
-key_shift_sel = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/vkey_shift_sel.png"))
-key_space = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/vkey_space.png"))
+from Tools.LoadPixmap import LoadPixmap
 
 class VirtualKeyBoardList(MenuList):
 	def __init__(self, list, enableWrapAround=False):
@@ -26,6 +17,16 @@ class VirtualKeyBoardList(MenuList):
 		self.l.setItemHeight(45)
 
 def VirtualKeyBoardEntryComponent(keys, selectedKey,shiftMode=False):
+	key_backspace = LoadPixmap(cached=True, path=resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/vkey_backspace.png"))
+	key_bg = LoadPixmap(cached=True, path=resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/vkey_bg.png"))
+	key_clr = LoadPixmap(cached=True, path=resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/vkey_clr.png"))
+	key_esc = LoadPixmap(cached=True, path=resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/vkey_esc.png"))
+	key_ok = LoadPixmap(cached=True, path=resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/vkey_ok.png"))
+	key_sel = LoadPixmap(cached=True, path=resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/vkey_sel.png"))
+	key_shift = LoadPixmap(cached=True, path=resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/vkey_shift.png"))
+	key_shift_sel = LoadPixmap(cached=True, path=resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/vkey_shift_sel.png"))
+	key_space = LoadPixmap(cached=True, path=resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/vkey_space.png"))
+	
 	res = [ (keys) ]
 	
 	x = 0
@@ -116,6 +117,7 @@ class VirtualKeyBoard(Screen):
 				[u"Q", u"W", u"E", u"R", u"T", u"Z", u"U", u"I", u"O", u"P", u"�", u"*"],
 				[u"A", u"S", u"D", u"F", u"G", u"H", u"J", u"K", u"L", u"�", u"�", u"'"],
 				[u">", u"Y", u"X", u"C", u"V", u"B", u"N", u"M", u";", u":", u"_", u"CLEAR"],
+
 				[u"SHIFT", u"SPACE", u"?", u"\\", u"�", u"OK"]]
 		else:
 			self.keys_list = [